| From 9f293fef1eed2e6ef7aa372ad5a7c9293b11a15f Mon Sep 17 00:00:00 2001 |
| From: Dong Ma <dong.ma@vexxhost.com> |
| Date: Mon, 10 Feb 2025 14:58:50 +0000 |
| Subject: [PATCH] Enable {priority,runtime}ClassName for Keystone |
| |
| --- |
| keystone/templates/cron-job-credential-rotate.yaml | 6 ++++++ |
| keystone/templates/cron-job-fernet-rotate.yaml | 6 ++++++ |
| keystone/templates/deployment-api.yaml | 6 ++++++ |
| keystone/templates/pod-rally-test.yaml | 6 ++++++ |
| keystone/values.yaml | 12 ++++++++++++ |
| 5 files changed, 36 insertions(+) |
| |
| diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml |
| index 59060796..6fabd9dd 100644 |
| --- a/keystone/templates/cron-job-credential-rotate.yaml |
| +++ b/keystone/templates/cron-job-credential-rotate.yaml |
| @@ -70,6 +70,12 @@ spec: |
| labels: |
| {{ tuple $envAll "keystone" "credential-rotate" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }} |
| spec: |
| +{{ with .Values.pod.priorityClassName.keystone_credential_rotate }} |
| + priorityClassName: {{ . }} |
| +{{ end }} |
| +{{ with .Values.pod.runtimeClassName.keystone_credential_rotate }} |
| + runtimeClassName: {{ . }} |
| +{{ end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| initContainers: |
| {{ tuple $envAll "credential_rotate" $mounts_keystone_credential_rotate_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }} |
| diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml |
| index a059f929..e9118423 100644 |
| --- a/keystone/templates/cron-job-fernet-rotate.yaml |
| +++ b/keystone/templates/cron-job-fernet-rotate.yaml |
| @@ -71,6 +71,12 @@ spec: |
| labels: |
| {{ tuple $envAll "keystone" "fernet-rotate" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 12 }} |
| spec: |
| +{{ with .Values.pod.priorityClassName.keystone_fernet_rotate }} |
| + priorityClassName: {{ . }} |
| +{{ end }} |
| +{{ with .Values.pod.runtimeClassName.keystone_fernet_rotate }} |
| + runtimeClassName: {{ . }} |
| +{{ end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| {{ dict "envAll" $envAll "application" "fernet_rotate" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 10 }} |
| initContainers: |
| diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml |
| index ee4e13c9..36050a5c 100644 |
| --- a/keystone/templates/deployment-api.yaml |
| +++ b/keystone/templates/deployment-api.yaml |
| @@ -54,6 +54,12 @@ spec: |
| {{ dict "envAll" $envAll "podName" "keystone-api" "containerNames" (list "keystone-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} |
| spec: |
| {{ dict "envAll" $envAll "application" "keystone" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} |
| +{{ with .Values.pod.priorityClassName.keystone_api }} |
| + priorityClassName: {{ . }} |
| +{{ end }} |
| +{{ with .Values.pod.runtimeClassName.keystone_api }} |
| + runtimeClassName: {{ . }} |
| +{{ end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| affinity: |
| {{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} |
| diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml |
| index ad5b23a0..155dbae3 100644 |
| --- a/keystone/templates/pod-rally-test.yaml |
| +++ b/keystone/templates/pod-rally-test.yaml |
| @@ -42,6 +42,12 @@ spec: |
| {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }} |
| nodeSelector: |
| {{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }} |
| +{{ with .Values.pod.priorityClassName.keystone_tests }} |
| + priorityClassName: {{ . }} |
| +{{ end }} |
| +{{ with .Values.pod.runtimeClassName.keystone_tests }} |
| + runtimeClassName: {{ . }} |
| +{{ end }} |
| serviceAccountName: {{ $serviceAccountName }} |
| initContainers: |
| {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }} |
| diff --git a/keystone/values.yaml b/keystone/values.yaml |
| index 27e767cf..c23a4ac0 100644 |
| --- a/keystone/values.yaml |
| +++ b/keystone/values.yaml |
| @@ -158,6 +158,18 @@ dependencies: |
| service: local_image_registry |
| |
| pod: |
| + priorityClassName: |
| + keystone_api: null |
| + keystone_tests: null |
| + keystone_credential_rotate: null |
| + keystone_fernet_rotate: null |
| + db_sync: null |
| + runtimeClassName: |
| + keystone_api: null |
| + keystone_tests: null |
| + keystone_credential_rotate: null |
| + keystone_fernet_rotate: null |
| + db_sync: null |
| security_context: |
| keystone: |
| pod: |
| -- |
| 2.34.1 |
| |