Move k8s pod params under common key

This PS moves K8s pod params under a common key.

Change-Id: Ib4e72e82a4f1540fa800c39d0dcc91b286d96c93

barbican/templates/deployment-api.yaml

@@ -42,7 +42,7 @@ spec:
         - name: barbican-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/barbican.sh
             - start

barbican/templates/job-db-init.yaml

@@ -29,7 +29,7 @@ spec:
         - name: barbican-db-init
           image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

barbican/templates/job-db-sync.yaml

@@ -29,7 +29,7 @@ spec:
         - name: barbican-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

barbican/templates/job-ks-endpoints.yaml

@@ -31,7 +31,7 @@ spec:
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
           image: {{ $envAll.Values.images.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
           volumeMounts:

barbican/templates/job-ks-service.yaml

@@ -30,7 +30,7 @@ spec:
         - name: {{ $osServiceType }}-ks-service-registration
           image: {{ $envAll.Values.images.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
           volumeMounts:

barbican/templates/job-ks-user.yaml

@@ -29,7 +29,7 @@ spec:
         - name: barbican-ks-user
           image: {{ .Values.images.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
           volumeMounts:

barbican/templates/pdb-api.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: barbican-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

barbican/values.yaml

@@ -26,17 +26,77 @@ images:
   api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
   pull_policy: "IfNotPresent"
 
-upgrades:
+pod:
-  deployments:
+  lifecycle:
-    revision_history: 3
+    upgrades:
-    pod_replacement_strategy: RollingUpdate
+      deployments:
-    rolling_update:
+        revision_history: 3
-      max_unavailable: 1
+        pod_replacement_strategy: RollingUpdate
-      max_surge: 3
+        rolling_update:
-
+          max_unavailable: 1
-pod_disruption_budget:
+          max_surge: 3
-  api:
+    disruption_budget:
-    min_available: 0
+      api:
+        min_available: 0
+  resources:
+    enabled: false
+    api:
+    requests:
+      memory: "128Mi"
+      cpu: "100m"
+    limits:
+      memory: "1024Mi"
+      cpu: "2000m"
+    jobs:
+      bootstrap:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_endpoints:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_service:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_user:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 network:
   api:
@@ -199,66 +259,6 @@ endpoints:
       memcache:
         default: 11211
 
-resources:
-  enabled: false
-  api:
-  requests:
-    memory: "128Mi"
-    cpu: "100m"
-  limits:
-    memory: "1024Mi"
-    cpu: "2000m"
-  jobs:
-    bootstrap:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_init:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_sync:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_endpoints:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_service:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_user:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    tests:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-
 mounts:
   barbican_api:
     init_container: null

ceph/templates/daemonset-osd.yaml

@@ -38,14 +38,14 @@ spec:
         - name: osd-pod
           image: {{ .Values.images.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.osd.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.osd.requests.memory | quote }}
-              cpu: {{ .Values.resources.osd.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.osd.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.osd.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.osd.limits.memory | quote }}
-              cpu: {{ .Values.resources.osd.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.osd.limits.cpu | quote }}
           {{- end }}
           securityContext:
             privileged: true

ceph/templates/deployment-mds.yaml

@@ -41,14 +41,14 @@ spec:
         - name: ceph-mds
           image: {{ .Values.images.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.mds.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.mds.requests.memory | quote }}
-              cpu: {{ .Values.resources.mds.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.mds.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.mds.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.mds.limits.memory | quote }}
-              cpu: {{ .Values.resources.mds.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.mds.limits.cpu | quote }}
           {{- end }}
           ports:
             - containerPort: 6800

ceph/templates/deployment-moncheck.yaml

@@ -41,14 +41,14 @@ spec:
         - name: ceph-mon
           image: {{ .Values.images.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.mon_check.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.mon_check.requests.memory | quote }}
-              cpu: {{ .Values.resources.mon_check.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.mon_check.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.mon_check.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.mon_check.limits.memory | quote }}
-              cpu: {{ .Values.resources.mon_check.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.mon_check.limits.cpu | quote }}
           {{- end }}
           ports:
             - containerPort: 6789

ceph/templates/deployment-rgw.yaml

@@ -42,14 +42,14 @@ spec:
         - name: ceph-rgw
           image: {{ .Values.images.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.rgw.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.rgw.requests.memory | quote }}
-              cpu: {{ .Values.resources.rgw.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.rgw.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.rgw.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.rgw.limits.memory | quote }}
-              cpu: {{ .Values.resources.rgw.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.rgw.limits.cpu | quote }}
           {{- end }}
           ports:
             - containerPort: {{ .Values.network.port.rgw_target }}

ceph/templates/job-keyring.yaml

@@ -28,14 +28,14 @@ spec:
         - name:  ceph-secret-generator
           image: {{ $envAll.Values.images.ceph_config_helper }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-          {{- if $envAll.Values.resources.enabled }}
+          {{- if $envAll.Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.jobs.secret_provisioning.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }}
-              cpu: {{ .Values.resources.jobs.secret_provisioning.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.jobs.secret_provisioning.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }}
-              cpu: {{ .Values.resources.jobs.secret_provisioning.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }}
           {{- end }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph/templates/job-namespace-client-key.yaml

@@ -26,14 +26,14 @@ spec:
         - name:  ceph-storage-keys-generator
           image: {{ .Values.images.ceph_config_helper }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.jobs.secret_provisioning.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }}
-              cpu: {{ .Values.resources.jobs.secret_provisioning.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.jobs.secret_provisioning.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }}
-              cpu: {{ .Values.resources.jobs.secret_provisioning.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }}
           {{- end }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph/templates/job-storage-admin-keys.yaml

@@ -26,14 +26,14 @@ spec:
         - name:  ceph-storage-keys-generator
           image: {{ .Values.images.ceph_config_helper }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.jobs.secret_provisioning.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }}
-              cpu: {{ .Values.resources.jobs.secret_provisioning.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.jobs.secret_provisioning.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }}
-              cpu: {{ .Values.resources.jobs.secret_provisioning.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }}
           {{- end }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph/templates/pdb-mon.yaml

@@ -18,7 +18,7 @@ kind: PodDisruptionBudget
 metadata:
   name: ceph-mon
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.mon.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.mon.min_available }}
   selector:
     matchLabels:
       app: ceph

ceph/templates/statefulset-mon.yaml

@@ -61,14 +61,14 @@ spec:
         - name: ceph-mon
           image: {{ .Values.images.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+          {{- if .Values.pod.resources.enabled }}
           resources:
             requests:
-              memory: {{ .Values.resources.mon.requests.memory | quote }}
+              memory: {{ .Values.pod.resources.mon.requests.memory | quote }}
-              cpu: {{ .Values.resources.mon.requests.cpu | quote }}
+              cpu: {{ .Values.pod.resources.mon.requests.cpu | quote }}
             limits:
-              memory: {{ .Values.resources.mon.limits.memory | quote }}
+              memory: {{ .Values.pod.resources.mon.limits.memory | quote }}
-              cpu: {{ .Values.resources.mon.limits.cpu | quote }}
+              cpu: {{ .Values.pod.resources.mon.limits.cpu | quote }}
           {{- end }}
           ports:
             - containerPort: 6789

ceph/values.yaml

@@ -36,9 +36,56 @@ labels:
   node_selector_key: ceph-storage
   node_selector_value: enabled
 
-pod_disruption_budget:
+pod:
-  mon:
+  lifecycle:
-    min_available: 0
+    disruption_budget:
+      mon:
+        min_available: 0
+  resources:
+    enabled: false
+    osd:
+      requests:
+        memory: "512Mi"
+        cpu: "500m"
+      limits:
+        memory: "1024Mi"
+        cpu: "1000m"
+    mds:
+      requests:
+        memory: "10Mi"
+        cpu: "250m"
+      limits:
+        memory: "50Mi"
+        cpu: "500m"
+    mon:
+      requests:
+        memory: "50Mi"
+        cpu: "250m"
+      limits:
+        memory: "100Mi"
+        cpu: "500m"
+    mon_check:
+      requests:
+        memory: "5Mi"
+        cpu: "250m"
+      limits:
+        memory: "50Mi"
+        cpu: "500m"
+    rgw:
+      requests:
+        memory: "5Mi"
+        cpu: "250m"
+      limits:
+        memory: "50Mi"
+        cpu: "500m"
+    jobs:
+      secret_provisioning:
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+        requests:
+          memory: "128Mi"
+          cpu: "500m"
 
 secrets:
   keyrings:
@@ -157,51 +204,6 @@ ceph:
 rgw:
   enabled: false
 
-resources:
-  enabled: false
-  osd:
-    requests:
-      memory: "512Mi"
-      cpu: "500m"
-    limits:
-      memory: "1024Mi"
-      cpu: "1000m"
-  mds:
-    requests:
-      memory: "10Mi"
-      cpu: "250m"
-    limits:
-      memory: "50Mi"
-      cpu: "500m"
-  mon:
-    requests:
-      memory: "50Mi"
-      cpu: "250m"
-    limits:
-      memory: "100Mi"
-      cpu: "500m"
-  mon_check:
-    requests:
-      memory: "5Mi"
-      cpu: "250m"
-    limits:
-      memory: "50Mi"
-      cpu: "500m"
-  rgw:
-    requests:
-      memory: "5Mi"
-      cpu: "250m"
-    limits:
-      memory: "50Mi"
-      cpu: "500m"
-  jobs:
-    secret_provisioning:
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-      requests:
-        memory: "128Mi"
-        cpu: "500m"
 # if you change provision_storage_class to false
 # it is presumed you manage your own storage
 # class definition externally

cinder/templates/deployment-api.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "cinder" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/cinder-api.sh
             - start

cinder/templates/deployment-backup.yaml

@@ -59,7 +59,7 @@ spec:
         - name: cinder-backup
           image: {{ .Values.images.backup }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/cinder-backup.sh
           volumeMounts:

cinder/templates/deployment-scheduler.yaml

@@ -42,7 +42,7 @@ spec:
         - name: cinder-scheduler
           image: {{ .Values.images.scheduler }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/cinder-scheduler.sh
           volumeMounts:

cinder/templates/deployment-volume.yaml

@@ -59,7 +59,7 @@ spec:
         - name: cinder-volume
           image: {{ .Values.images.volume }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/cinder-volume.sh
           volumeMounts:

cinder/templates/job-bootstrap.yaml

@@ -32,7 +32,7 @@ spec:
         - name: cinder-bootstrap
           image: {{ .Values.images.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/bootstrap.sh
           env:

cinder/templates/job-db-init.yaml

@@ -31,7 +31,7 @@ spec:
         - name: cinder-db-init
           image: {{ .Values.images.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

cinder/templates/job-db-sync.yaml

@@ -31,7 +31,7 @@ spec:
         - name: cinder-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

cinder/templates/job-ks-endpoints.yaml

@@ -33,7 +33,7 @@ spec:
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
           image: {{ $envAll.Values.images.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
           volumeMounts:

cinder/templates/job-ks-service.yaml

@@ -32,7 +32,7 @@ spec:
         - name: {{ $osServiceType }}-ks-service-registration
           image: {{ $envAll.Values.images.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
           volumeMounts:

cinder/templates/job-ks-user.yaml

@@ -31,7 +31,7 @@ spec:
         - name: cinder-ks-user
           image: {{ .Values.images.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
           volumeMounts:

cinder/templates/pdb-api.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: cinder-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "cinder" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

cinder/templates/pod-rally-test.yaml

@@ -31,7 +31,7 @@ spec:
     - name: {{.Release.Name}}-token-issue-test
       image: {{ .Values.images.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}

cinder/values.yaml

@@ -44,21 +44,94 @@ images:
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   pull_policy: "IfNotPresent"
 
-upgrades:
+pod:
-  deployments:
+  lifecycle:
-    revision_history: 3
+    upgrades:
-    pod_replacement_strategy: RollingUpdate
+      deployments:
-    rolling_update:
+        revision_history: 3
-      max_unavailable: 1
+        pod_replacement_strategy: RollingUpdate
-      max_surge: 3
+        rolling_update:
-
+          max_unavailable: 1
-pod_disruption_budget:
+          max_surge: 3
-  api:
+    disruption_budget:
-    min_available: 0
+      api:
-
+        min_available: 0
-termination_grace_period:
+    termination_grace_period:
-  api:
+      api:
-    timeout: 30
+        timeout: 30
+  resources:
+    enabled: false
+    api:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    scheduler:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    volume:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    jobs:
+      bootstrap:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_endpoints:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_service:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_user:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 bootstrap:
   enabled: true
@@ -366,80 +439,6 @@ endpoints:
       memcache:
         default: 11211
 
-resources:
-  enabled: false
-  api:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  scheduler:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  volume:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  jobs:
-    bootstrap:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_init:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_sync:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_endpoints:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_service:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_user:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    tests:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-
 mounts:
   cinder_api:
     init_container: null

etcd/templates/deployment.yaml

@@ -1,21 +1,30 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- $envAll := . }}
+---
 apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
   name: etcd
 spec:
   replicas: {{ .Values.resources.etcd.replicas }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
-  strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
-    rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
-    {{ end }}
   template:
     metadata:
       labels:
-        app: etcd
+{{ tuple $envAll "etcd" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}

etcd/templates/service.yaml

@@ -1,3 +1,19 @@
+# Copyright 2017 The Openstack-Helm Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- $envAll := . }}
+---
 apiVersion: v1
 kind: Service
 metadata:
@@ -7,4 +23,4 @@ spec:
   ports:
     - port: {{ .Values.network.port }}
   selector:
-    app: etcd
+{{ tuple $envAll "etcd" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}

etcd/values.yaml

@@ -1,23 +1,44 @@
-images:
+# Copyright 2017 The Openstack-Helm Authors.
-  etcd: gcr.io/google_containers/etcd-amd64:2.2.5
+#
-  pull_policy: "IfNotPresent"
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-upgrades:
+# Default values for etcd.
-  revision_history: 3
+# This is a YAML-formatted file.
-  pod_replacement_strategy: RollingUpdate
+# Declare name/value pairs to be passed into your templates.
-  rolling_update:
+# name: value
-    max_unavailable: 1
+
-    max_surge: 3
+images:
+  etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5'
+  pull_policy: IfNotPresent
 
 labels:
   node_selector_key: openstack-control-plane
   node_selector_value: enabled
 
 network:
-  port: 2379
   host: etcd
+  port: 2379
+
+pod:
+  lifecycle:
+    upgrades:
+      deployments:
+        pod_replacement_strategy: RollingUpdate
+        revision_history: 3
+        rolling_update:
+          max_surge: 3
+          max_unavailable: 1
 
 resources:
   etcd:
-# No HA support, don't change this.
     replicas: 1

glance/templates/deployment-api.yaml

@@ -36,7 +36,7 @@ spec:
 {{ tuple $envAll "glance" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "600" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "600" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if eq .Values.storage "pvc" }}
@@ -45,7 +45,7 @@ spec:
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - chown
             - -R
@@ -77,7 +77,7 @@ spec:
         - name: glance-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/glance-api.sh
             - start

glance/templates/deployment-registry.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.registry.timeout | default "600" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.registry.timeout | default "600" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-registry
           image: {{ .Values.images.registry }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/glance-registry.sh
             - start

glance/templates/job-bootstrap.yaml

@@ -31,7 +31,7 @@ spec:
         - name: glance-bootstrap
           image: {{ .Values.images.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}

glance/templates/job-db-init.yaml

@@ -31,7 +31,7 @@ spec:
         - name: glance-db-init
           image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

glance/templates/job-db-sync.yaml

@@ -31,7 +31,7 @@ spec:
         - name: glance-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

glance/templates/job-ks-endpoints.yaml

@@ -33,7 +33,7 @@ spec:
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
           image: {{ $envAll.Values.images.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
           volumeMounts:

glance/templates/job-ks-service.yaml

@@ -32,7 +32,7 @@ spec:
         - name: {{ $osServiceType }}-ks-service-registration
           image: {{ $envAll.Values.images.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
           volumeMounts:

glance/templates/job-ks-user.yaml

@@ -31,7 +31,7 @@ spec:
         - name: glance-ks-user
           image: {{ .Values.images.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
           volumeMounts:

glance/templates/pdb-api.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: glance-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "glance" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

glance/templates/pdb-registry.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: glance-registry
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.registry.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.registry.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

glance/templates/pod-rally-test.yaml

@@ -31,7 +31,7 @@ spec:
     - name: {{.Release.Name}}-token-issue-test
       image: {{ .Values.images.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}

glance/values.yaml

@@ -41,26 +41,6 @@ images:
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   pull_policy: "IfNotPresent"
 
-upgrades:
-  deployments:
-    revision_history: 3
-    pod_replacement_strategy: RollingUpdate
-    rolling_update:
-      max_unavailable: 1
-      max_surge: 3
-
-pod_disruption_budget:
-  api:
-    min_available: 0
-  registry:
-    min_available: 0
-
-termination_grace_period:
-  api:
-    timeout: 600
-  registry:
-    timeout: 600
-
 bootstrap:
   enabled: true
   images:
@@ -156,73 +136,6 @@ volume:
   class_name: general
   size: 2Gi
 
-resources:
-  enabled: false
-  api:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  registry:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  jobs:
-    db_sync:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_init:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_user:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_service:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_endpoints:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    bootstrap:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    tests:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-
 dependencies:
   db_init:
     services:
@@ -405,3 +318,89 @@ mounts:
   glance_tests:
     init_container: null
     glance_tests:
+
+pod:
+  lifecycle:
+    upgrades:
+      deployments:
+        revision_history: 3
+        pod_replacement_strategy: RollingUpdate
+        rolling_update:
+          max_unavailable: 1
+          max_surge: 3
+    disruption_budget:
+      api:
+        min_available: 0
+      registry:
+        min_available: 0
+    termination_grace_period:
+      api:
+        timeout: 600
+      registry:
+        timeout: 600
+  resources:
+    enabled: false
+    api:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    registry:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    jobs:
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_user:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_service:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_endpoints:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      bootstrap:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"

heat/templates/deployment-api.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "heat" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/heat-api.sh
             - start

heat/templates/deployment-cfn.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "heat" "cfn" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.cfn.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.cfn.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-cfn
           image: {{ .Values.images.cfn }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/heat-cfn.sh
             - start

heat/templates/deployment-cloudwatch.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.cloudwatch.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.cloudwatch.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-cloudwatch
           image: {{ .Values.images.cloudwatch }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/heat-cloudwatch.sh
             - start

heat/templates/job-db-init.yaml

@@ -31,7 +31,7 @@ spec:
         - name: heat-db-init
           image: {{ .Values.images.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

heat/templates/job-db-sync.yaml

@@ -31,7 +31,7 @@ spec:
         - name: heat-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

heat/templates/job-ks-endpoints.yaml

@@ -33,7 +33,7 @@ spec:
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
           image: {{ $envAll.Values.images.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
           volumeMounts:

heat/templates/job-ks-service.yaml

@@ -32,7 +32,7 @@ spec:
         - name: {{ $osServiceType }}-ks-service-registration
           image: {{ $envAll.Values.images.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
           volumeMounts:

heat/templates/job-ks-user.yaml

@@ -31,7 +31,7 @@ spec:
         - name: heat-ks-user
           image: {{ .Values.images.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
           volumeMounts:

heat/templates/pdb-api.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: heat-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "heat" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

heat/templates/pdb-cfn.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: heat-cfn
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.cfn.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.cfn.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "heat" "cfn" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

heat/templates/pdb-cloudwatch.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: heat-cloudwatch
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.cloudwatch.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.cloudwatch.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "heat" "cloudwatch" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

heat/templates/statefulset-engine.yaml

@@ -39,7 +39,7 @@ spec:
         - name: heat-engine
           image: {{ .Values.images.engine }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/heat-engine.sh
           volumeMounts:

heat/values.yaml

@@ -41,30 +41,6 @@ images:
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   pull_policy: "IfNotPresent"
 
-upgrades:
-  deployments:
-    revision_history: 3
-    pod_replacement_strategy: RollingUpdate
-    rolling_update:
-      max_unavailable: 1
-      max_surge: 3
-
-pod_disruption_budget:
-  api:
-    min_available: 0
-  cfn:
-    min_available: 0
-  cloudwatch:
-    min_available: 0
-
-termination_grace_period:
-  api:
-    timeout: 30
-  cfn:
-    timeout: 30
-  cloudwatch:
-    timeout: 30
-
 conf:
   paste:
     override:
@@ -349,86 +325,109 @@ endpoints:
       amqp:
         default: 5672
 
-resources:
+pod:
-  enabled: false
+  lifecycle:
-  api:
+    upgrades:
-    requests:
+      deployments:
-      memory: "128Mi"
+        revision_history: 3
-      cpu: "100m"
+        pod_replacement_strategy: RollingUpdate
-    limits:
+        rolling_update:
-      memory: "1024Mi"
+          max_unavailable: 1
-      cpu: "2000m"
+          max_surge: 3
-  cfn:
+    disruption_budget:
-    requests:
+      api:
-      memory: "128Mi"
+        min_available: 0
-      cpu: "100m"
+      cfn:
-    limits:
+        min_available: 0
-      memory: "1024Mi"
+      cloudwatch:
-      cpu: "2000m"
+        min_available: 0
-  cloudwatch:
+    termination_grace_period:
-    requests:
+      api:
-      memory: "128Mi"
+        timeout: 30
-      cpu: "100m"
+      cfn:
-    limits:
+        timeout: 30
-      memory: "1024Mi"
+      cloudwatch:
-      cpu: "2000m"
+        timeout: 30
-  engine:
+  resources:
-    requests:
+    enabled: false
-      memory: "128Mi"
+    api:
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  jobs:
-    bootstrap:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-    db_init:
+    cfn:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-    db_sync:
+    cloudwatch:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-    ks_endpoints:
+    engine:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_service:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_user:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    tests:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
+    jobs:
+      bootstrap:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_endpoints:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_service:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_user:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 mounts:
   heat_api:

helm-toolkit/templates/snippets/_kubernetes_resources.tpl

@@ -15,7 +15,7 @@
 {{- define "helm-toolkit.snippets.kubernetes_resources" -}}
 {{- $envAll := index . 0 -}}
 {{- $component := index . 1 -}}
-{{- if $envAll.Values.resources.enabled -}}
+{{- if $envAll.Values.pod.resources.enabled -}}
 resources:
   limits:
     cpu: {{ $component.limits.cpu | quote }}

helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl

@@ -15,7 +15,7 @@
 {{- define "helm-toolkit.snippets.kubernetes_upgrades_daemonset" -}}
 {{- $envAll := index . 0 -}}
 {{- $component := index . 1 -}}
-{{- $upgradeMap := index $envAll.Values.upgrades.daemonsets $component }}
+{{- $upgradeMap := index $envAll.Values.pod.lifecycle.upgrades.daemonsets $component }}
 {{- with $upgradeMap -}}
 {{- if .enabled }}
 minReadySeconds: {{ .min_ready_seconds }}

helm-toolkit/templates/snippets/_kubernetes_upgrades_deployment.tpl

@@ -14,7 +14,7 @@
 
 {{- define "helm-toolkit.snippets.kubernetes_upgrades_deployment" -}}
 {{- $envAll := index . 0 -}}
-{{- with $envAll.Values.upgrades.deployments -}}
+{{- with $envAll.Values.pod.lifecycle.upgrades.deployments -}}
 revisionHistoryLimit: {{ .revision_history }}
 strategy:
   type: {{ .pod_replacement_strategy }}

horizon/templates/deployment.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.horizon.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.horizon.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: horizon
           image: {{ .Values.images.horizon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/horizon.sh
             - start

horizon/templates/job-db-init.yaml

@@ -34,7 +34,7 @@ spec:
         - name: horizon-db-init
           image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

horizon/templates/job-db-sync.yaml

@@ -35,7 +35,7 @@ spec:
         - name: horizon-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

horizon/templates/pdb.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: horizon
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.horizon.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.horizon.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

horizon/values.yaml

@@ -26,22 +26,6 @@ images:
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   pull_policy: "IfNotPresent"
 
-upgrades:
-  deployments:
-    revision_history: 3
-    pod_replacement_strategy: RollingUpdate
-    rolling_update:
-      max_unavailable: 1
-      max_surge: 3
-
-pod_disruption_budget:
-  horizon:
-    min_available: 0
-
-termination_grace_period:
-  horizon:
-    timeout: 30
-
 labels:
   node_selector_key: openstack-control-plane
   node_selector_value: enabled
@@ -77,30 +61,45 @@ dependencies:
     - service: oslo_db
       endpoint: internal
 
-resources:
+pod:
-  enabled: false
+  lifecycle:
-  server:
+    upgrades:
-    requests:
+      deployments:
-      memory: "128Mi"
+        revision_history: 3
-      cpu: "100m"
+        pod_replacement_strategy: RollingUpdate
-    limits:
+        rolling_update:
-      memory: "1204Mi"
+          max_unavailable: 1
-      cpu: "2000m"
+          max_surge: 3
-  jobs:
+    disruption_budget:
-    db_init:
+      horizon:
+        min_available: 0
+    termination_grace_period:
+      horizon:
+        timeout: 30
+  resources:
+    enabled: false
+    server:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
-        memory: "1024Mi"
+        memory: "1204Mi"
-        cpu: "2000m"
-    db_sync:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
         cpu: "2000m"
+    jobs:
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 # Names of secrets used by bootstrap and environmental checks
 secrets:

ingress/templates/deployment-error.yaml

@@ -35,7 +35,7 @@ spec:
         - name: ingress-error-pages
           image: {{ .Values.images.error_pages }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           livenessProbe:
             httpGet:
               path: /healthz

ingress/templates/deployment-ingress.yaml

@@ -39,7 +39,7 @@ spec:
         - name: ingress-api
           image: {{ .Values.images.ingress }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           readinessProbe:
             httpGet:
               path: /healthz

ingress/values.yaml

@@ -28,13 +28,31 @@ images:
   error_pages: gcr.io/google_containers/defaultbackend:1.0
   pull_policy: "IfNotPresent"
 
-upgrades:
+pod:
-  deployments:
+  lifecycle:
-    revision_history: 3
+    upgrades:
-    pod_replacement_strategy: RollingUpdate
+      deployments:
-    rolling_update:
+        revision_history: 3
-      max_unavailable: 1
+        pod_replacement_strategy: RollingUpdate
-      max_surge: 3
+        rolling_update:
+          max_unavailable: 1
+          max_surge: 3
+  resources:
+    enabled: true
+    ingress:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
+    error_pages:
+      requests:
+        memory: "128Mi"
+        cpu: "100m"
+      limits:
+        memory: "1024Mi"
+        cpu: "2000m"
 
 labels:
   node_selector_key: openstack-control-plane
@@ -58,20 +76,3 @@ endpoints:
       https: 443
 
 deployment_type: Deployment
-
-resources:
-  enabled: true
-  ingress:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"
-  error_pages:
-    requests:
-      memory: "128Mi"
-      cpu: "100m"
-    limits:
-      memory: "1024Mi"
-      cpu: "2000m"

keystone/templates/deployment-api.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_keystone_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: keystone-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/keystone-api.sh
             - start

keystone/templates/job-bootstrap.yaml

@@ -34,7 +34,7 @@ spec:
         - name: keystone-bootstrap
           image: {{ .Values.images.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 12 }}

keystone/templates/job-db-init.yaml

@@ -34,7 +34,7 @@ spec:
         - name: keystone-db-init
           image: {{ .Values.images.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

keystone/templates/job-db-sync.yaml

@@ -35,7 +35,7 @@ spec:
         - name: keystone-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: OS_BOOTSTRAP_ADMIN_URL
               value: {{ tuple "identity" "admin" "admin" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}

keystone/templates/pdb.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: keystone-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

keystone/templates/pod-rally-test.yaml

@@ -31,7 +31,7 @@ spec:
     - name: {{.Release.Name}}-token-issue-test
       image: {{ .Values.images.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}

keystone/values.yaml

@@ -33,22 +33,6 @@ images:
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   pull_policy: "IfNotPresent"
 
-upgrades:
-  deployments:
-    revision_history: 3
-    pod_replacement_strategy: RollingUpdate
-    rolling_update:
-      max_unavailable: 1
-      max_surge: 3
-
-pod_disruption_budget:
-  api:
-    min_available: 0
-
-termination_grace_period:
-  api:
-    timeout: 30
-
 bootstrap:
   enabled: true
   script: |
@@ -101,44 +85,59 @@ dependencies:
     - service: identity
       endpoint: internal
 
-resources:
+pod:
-  enabled: false
+  lifecycle:
-  api:
+    upgrades:
-    requests:
+      deployments:
-      memory: "128Mi"
+        revision_history: 3
-      cpu: "100m"
+        pod_replacement_strategy: RollingUpdate
-    limits:
+        rolling_update:
-      memory: "1024Mi"
+          max_unavailable: 1
-      cpu: "2000m"
+          max_surge: 3
-  jobs:
+    disruption_budget:
-    bootstrap:
+      api:
-      requests:
+        min_available: 0
-        memory: "128Mi"
+    termination_grace_period:
-        cpu: "100m"
+      api:
-      limits:
+        timeout: 30
-        memory: "1024Mi"
+  resources:
-        cpu: "2000m"
+    enabled: false
-    db_init:
+    api:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_sync:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    tests:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
+    jobs:
+      bootstrap:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 mounts:
   keystone_db_init:

magnum/templates/deployment-api.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "magnum" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: magnum-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/magnum-api.sh
             - start

magnum/templates/job-db-init.yaml

@@ -31,7 +31,7 @@ spec:
         - name: magnum-db-init
           image: {{ .Values.images.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

magnum/templates/job-db-sync.yaml

@@ -31,7 +31,7 @@ spec:
         - name: magnum-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

magnum/templates/job-ks-endpoints.yaml

@@ -33,7 +33,7 @@ spec:
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
           image: {{ $envAll.Values.images.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
           volumeMounts:

magnum/templates/job-ks-service.yaml

@@ -32,7 +32,7 @@ spec:
         - name: {{ $osServiceType }}-ks-service-registration
           image: {{ $envAll.Values.images.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
           volumeMounts:

magnum/templates/job-ks-user.yaml

@@ -31,7 +31,7 @@ spec:
         - name: magnum-ks-user
           image: {{ .Values.images.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
           volumeMounts:

magnum/templates/pdb-api.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: magnum-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "magnum" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

magnum/templates/statefulset-conductor.yaml

@@ -39,7 +39,7 @@ spec:
         - name: magnum-conductor
           image: {{ .Values.images.conductor }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/magnum-conductor.sh
           volumeMounts:

magnum/values.yaml

@@ -36,22 +36,6 @@ images:
   dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
   pull_policy: "IfNotPresent"
 
-upgrades:
-  deployments:
-    revision_history: 3
-    pod_replacement_strategy: RollingUpdate
-    rolling_update:
-      max_unavailable: 1
-      max_surge: 3
-
-pod_disruption_budget:
-  api:
-    min_available: 0
-
-termination_grace_period:
-  api:
-    timeout: 30
-
 conf:
   paste:
     override:
@@ -219,72 +203,87 @@ endpoints:
       amqp:
         default: 5672
 
-resources:
+pod:
-  enabled: false
+  lifecycle:
-  api:
+    upgrades:
-    requests:
+      deployments:
-      memory: "128Mi"
+        revision_history: 3
-      cpu: "100m"
+        pod_replacement_strategy: RollingUpdate
-    limits:
+        rolling_update:
-      memory: "1024Mi"
+          max_unavailable: 1
-      cpu: "2000m"
+          max_surge: 3
-  conductor:
+    disruption_budget:
-    requests:
+      api:
-      memory: "128Mi"
+        min_available: 0
-      cpu: "100m"
+    termination_grace_period:
-    limits:
+      api:
-      memory: "1024Mi"
+        timeout: 30
-      cpu: "2000m"
+  resources:
-  jobs:
+    enabled: false
-    bootstrap:
+    api:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
-    db_init:
+    conductor:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    db_sync:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_endpoints:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_service:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    ks_user:
-      requests:
-        memory: "128Mi"
-        cpu: "100m"
-      limits:
-        memory: "1024Mi"
-        cpu: "2000m"
-    tests:
       requests:
         memory: "128Mi"
         cpu: "100m"
       limits:
         memory: "1024Mi"
         cpu: "2000m"
+    jobs:
+      bootstrap:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_init:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      db_sync:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_endpoints:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_service:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      ks_user:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
+      tests:
+        requests:
+          memory: "128Mi"
+          cpu: "100m"
+        limits:
+          memory: "1024Mi"
+          cpu: "2000m"
 
 mounts:
   magnum_api:

mariadb/templates/pdb-mariadb.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: {{ tuple "oslo_db" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.mariadb.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.mariadb.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "mariadb" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

mariadb/templates/statefulset.yaml

@@ -34,7 +34,7 @@ spec:
         - name: mariadb
           image: {{ .Values.images.mariadb }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/start.sh
           env:

mariadb/values.yaml

@@ -16,19 +16,20 @@ replicas: 3
 
 force_bootstrap: false
 
-pod_disruption_budget:
+pod:
-  mariadb:
+  lifecycle:
-    min_available: 0
+    disruption_budget:
-
+      mariadb:
-resources:
+        min_available: 0
-  enabled: false
+  resources:
-  api:
+    enabled: false
-    limits:
+    api:
-      memory: "128Mi"
+      limits:
-      cpu: "500m"
+        memory: "128Mi"
-    requests:
+        cpu: "500m"
-      memory: "128Mi"
+      requests:
-      cpu: "500m"
+        memory: "128Mi"
+        cpu: "500m"
 
 images:
   mariadb: docker.io/mariadb:10.1.23

memcached/templates/deployment.yaml

@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 {{- $envAll := . }}
 ---
 apiVersion: apps/v1beta1
@@ -18,15 +19,8 @@ kind: Deployment
 metadata:
   name: memcached
 spec:
-  replicas: {{ .Values.resources.memcached.replicas }}
+  replicas: {{ .Values.pod.resources.memcached.replicas }}
-  revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
+{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
-  strategy:
-    type: {{ .Values.upgrades.pod_replacement_strategy }}
-    {{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
-    rollingUpdate:
-      maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
-      maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
-    {{ end }}
   template:
     metadata:
       labels:
@@ -40,15 +34,7 @@ spec:
         - name: memcached
           image: {{ .Values.images.memcached }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-          {{- if .Values.resources.enabled }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-          resources:
-            limits:
-              cpu: {{ .Values.resources.api.limits.cpu | quote }}
-              memory: {{ .Values.resources.api.limits.memory | quote }}
-            requests:
-              cpu: {{ .Values.resources.api.requests.cpu | quote }}
-              memory: {{ .Values.resources.api.requests.memory | quote }}
-          {{- end }}
           command: ["sh", "-xec"]
           args:
             - |

memcached/values.yaml

@@ -21,12 +21,26 @@ images:
   memcached: docker.io/memcached:1.4
   pull_policy: "IfNotPresent"
 
-upgrades:
+pod:
-  revision_history: 3
+  lifecycle:
-  pod_replacement_strategy: RollingUpdate
+    upgrades:
-  rolling_update:
+      deployments:
-    max_unavailable: 1
+        revision_history: 3
-    max_surge: 3
+        pod_replacement_strategy: RollingUpdate
+        rolling_update:
+          max_unavailable: 1
+          max_surge: 3
+  resources:
+    enabled: false
+    memcached:
+      replicas: 1
+    api:
+      limits:
+        memory: "128Mi"
+        cpu: "500m"
+      requests:
+        memory: "128Mi"
+        cpu: "500m"
 
 labels:
   node_selector_key: openstack-control-plane
@@ -38,15 +52,3 @@ network:
 memcached:
   memory: 1024
   max_connections: 8192
-
-resources:
-  enabled: false
-  memcached:
-    replicas: 1
-  api:
-    limits:
-      memory: "128Mi"
-      cpu: "500m"
-    requests:
-      memory: "128Mi"
-      cpu: "500m"

mistral/templates/deployment-api.yaml

@@ -36,14 +36,14 @@ spec:
 {{ tuple $envAll "mistral" "api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
-      terminationGracePeriodSeconds: {{ .Values.termination_grace_period.api.timeout | default "30" }}
+      terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.api.timeout | default "30" }}
       initContainers:
 {{ tuple $envAll $dependencies $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-api
           image: {{ .Values.images.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/mistral-api.sh
             - start

mistral/templates/deployment-executor.yaml

@@ -42,7 +42,7 @@ spec:
         - name: mistral-executor
           image: {{ .Values.images.executor }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.executor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.executor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/mistral-executor.sh
           volumeMounts:

mistral/templates/job-db-init.yaml

@@ -31,7 +31,7 @@ spec:
         - name: mistral-db-init
           image: {{ .Values.images.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
               valueFrom:

mistral/templates/job-db-sync.yaml

@@ -31,7 +31,7 @@ spec:
         - name: mistral-db-sync
           image: {{ .Values.images.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh
           volumeMounts:

mistral/templates/job-ks-endpoints.yaml

@@ -33,7 +33,7 @@ spec:
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
           image: {{ $envAll.Values.images.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
           volumeMounts:

mistral/templates/job-ks-service.yaml

@@ -32,7 +32,7 @@ spec:
         - name: {{ $osServiceType }}-ks-service-registration
           image: {{ $envAll.Values.images.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
           volumeMounts:

mistral/templates/job-ks-user.yaml

@@ -31,7 +31,7 @@ spec:
         - name: mistral-ks-user
           image: {{ .Values.images.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
           volumeMounts:

mistral/templates/pdb-api.yaml

@@ -19,7 +19,7 @@ kind: PodDisruptionBudget
 metadata:
   name: mistral-api
 spec:
-  minAvailable: {{ .Values.pod_disruption_budget.api.min_available }}
+  minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }}
   selector:
     matchLabels:
 {{ tuple $envAll "mistral" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }}

mistral/templates/statefulset-engine.yaml

@@ -37,7 +37,7 @@ spec:
         - name: mistral-engine
           image: {{ .Values.images.engine }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
-{{ tuple $envAll $envAll.Values.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
+{{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/mistral-engine.sh
           volumeMounts: