Remove job stanza, bringing nodeSelector and tolerations up by one in…

…dent level
team-telnyx · Oct 14, 2022 · e5a5a6f · e5a5a6f
1 parent 4f9b49c
commit e5a5a6f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 33 deletions.
diff --git a/charts/consul/templates/server-acl-init-cleanup-job.yaml b/charts/consul/templates/server-acl-init-cleanup-job.yaml
@@ -62,13 +62,13 @@ spec:
             limits:
               memory: "50Mi"
               cpu: "50m"
-      {{- if .Values.global.acls.job.tolerations }}
+      {{- if .Values.global.acls.tolerations }}
       tolerations:
-        {{ tpl .Values.global.acls.job.tolerations . | indent 12 | trim }}
+        {{ tpl .Values.global.acls.tolerations . | indent 12 | trim }}
       {{- end }}
-      {{- if .Values.global.acls.job.nodeSelector }}
+      {{- if .Values.global.acls.nodeSelector }}
       nodeSelector:
-        {{ tpl .Values.global.acls.job.nodeSelector . | indent 12 | trim }}
+        {{ tpl .Values.global.acls.nodeSelector . | indent 12 | trim }}
       {{- end }}
   {{- end }}
   {{- end }}

diff --git a/charts/consul/templates/server-acl-init-job.yaml b/charts/consul/templates/server-acl-init-job.yaml
@@ -336,13 +336,13 @@ spec:
             limits:
               memory: "50Mi"
               cpu: "50m"
-      {{- if .Values.global.acls.job.tolerations }}
+      {{- if .Values.global.acls.tolerations }}
       tolerations:
-        {{ tpl .Values.global.acls.job.tolerations . | indent 12 | trim }}
+        {{ tpl .Values.global.acls.tolerations . | indent 12 | trim }}
       {{- end }}
-      {{- if .Values.global.acls.job.nodeSelector }}
+      {{- if .Values.global.acls.nodeSelector }}
       nodeSelector:
-        {{ tpl .Values.global.acls.job.nodeSelector . | indent 12 | trim }}
+        {{ tpl .Values.global.acls.nodeSelector . | indent 12 | trim }}
       {{- end }}
 {{- end }}
 {{- end }}

diff --git a/charts/consul/test/unit/server-acl-init-cleanup-job.bats b/charts/consul/test/unit/server-acl-init-cleanup-job.bats
@@ -72,7 +72,7 @@ load _helpers
 }
 
 #--------------------------------------------------------------------
-# global.acls.job
+# global.acls.tolerations and global.acls.nodeSelector
 
 @test "serverACLInitCleanup/Job: tolerations not set by default" {
   cd `chart_dir`
@@ -89,7 +89,7 @@ load _helpers
   local actual=$(helm template \
       -s templates/server-acl-init-job.yaml  \
       --set 'global.acls.manageSystemACLs=true' \
-      --set 'global.acls.job.tolerations=- key: value' \
+      --set 'global.acls.tolerations=- key: value' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.tolerations[0].key' | tee /dev/stderr)
   [ "${actual}" = "value" ]
@@ -110,7 +110,7 @@ load _helpers
   local actual=$(helm template \
       -s templates/server-acl-init-job.yaml  \
       --set 'global.acls.manageSystemACLs=true' \
-      --set 'global.acls.job.nodeSelector=- key: value' \
+      --set 'global.acls.nodeSelector=- key: value' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.nodeSelector[0].key' | tee /dev/stderr)
   [ "${actual}" = "value" ]

diff --git a/charts/consul/test/unit/server-acl-init-job.bats b/charts/consul/test/unit/server-acl-init-job.bats
@@ -1561,7 +1561,7 @@ load _helpers
 }
 
 #--------------------------------------------------------------------
-# global.acls.job
+# global.acls.tolerations and global.acls.nodeSelector
 
 @test "serverACLInit/Job: tolerations not set by default" {
   cd `chart_dir`
@@ -1578,7 +1578,7 @@ load _helpers
   local actual=$(helm template \
       -s templates/server-acl-init-job.yaml  \
       --set 'global.acls.manageSystemACLs=true' \
-      --set 'global.acls.job.tolerations=- key: value' \
+      --set 'global.acls.tolerations=- key: value' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.tolerations[0].key' | tee /dev/stderr)
   [ "${actual}" = "value" ]
@@ -1599,7 +1599,7 @@ load _helpers
   local actual=$(helm template \
       -s templates/server-acl-init-job.yaml  \
       --set 'global.acls.manageSystemACLs=true' \
-      --set 'global.acls.job.nodeSelector=- key: value' \
+      --set 'global.acls.nodeSelector=- key: value' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.nodeSelector[0].key' | tee /dev/stderr)
   [ "${actual}" = "value" ]

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
@@ -515,25 +515,23 @@ global:
       # @type: string
       secretKey: null
 
-    # job configures settings for the server-acl-init and server-acl-cleanup jobs
-    job:
-      # tolerations configures the taints and tolerations for the server-acl-init
-      # and server-acl-cleanup jobs. This should be a multi-line string matching the
-      # Tolerations (https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
-      tolerations: ""
-
-      # This value defines `nodeSelector` (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector)
-      # labels for the server-acl-init and server-acl-cleanup jobs pod assignment, formatted as a multi-line string.
-      #
-      # Example:
-      #
-      # ```yaml
-      # nodeSelector: |
-      #   beta.kubernetes.io/arch: amd64
-      # ```
-      #
-      # @type: string
-      nodeSelector: null
+    # tolerations configures the taints and tolerations for the server-acl-init
+    # and server-acl-cleanup jobs. This should be a multi-line string matching the
+    # Tolerations (https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) array in a Pod spec.
+    tolerations: ""
+
+    # This value defines `nodeSelector` (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector)
+    # labels for the server-acl-init and server-acl-cleanup jobs pod assignment, formatted as a multi-line string.
+    #
+    # Example:
+    #
+    # ```yaml
+    # nodeSelector: |
+    #   beta.kubernetes.io/arch: amd64
+    # ```
+    #
+    # @type: string
+    nodeSelector: null
 
   # [Enterprise Only] This value refers to a Kubernetes or Vault secret that you have created
   # that contains your enterprise license. It is required if you are using an