From 20527cb57ceaa311a213795614e2ea005516bfa6 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Tue, 11 Jul 2017 13:02:23 -0500 Subject: [PATCH] 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 | 2 +- barbican/templates/job-db-init.yaml | 2 +- barbican/templates/job-db-sync.yaml | 2 +- barbican/templates/job-ks-endpoints.yaml | 2 +- barbican/templates/job-ks-service.yaml | 2 +- barbican/templates/job-ks-user.yaml | 2 +- barbican/templates/pdb-api.yaml | 2 +- barbican/values.yaml | 142 ++++----- ceph/templates/daemonset-osd.yaml | 10 +- ceph/templates/deployment-mds.yaml | 10 +- ceph/templates/deployment-moncheck.yaml | 10 +- ceph/templates/deployment-rgw.yaml | 10 +- ceph/templates/job-keyring.yaml | 10 +- ceph/templates/job-namespace-client-key.yaml | 10 +- ceph/templates/job-storage-admin-keys.yaml | 10 +- ceph/templates/pdb-mon.yaml | 2 +- ceph/templates/statefulset-mon.yaml | 10 +- ceph/values.yaml | 98 ++++--- cinder/templates/deployment-api.yaml | 4 +- cinder/templates/deployment-backup.yaml | 2 +- cinder/templates/deployment-scheduler.yaml | 2 +- cinder/templates/deployment-volume.yaml | 2 +- cinder/templates/job-bootstrap.yaml | 2 +- cinder/templates/job-db-init.yaml | 2 +- cinder/templates/job-db-sync.yaml | 2 +- cinder/templates/job-ks-endpoints.yaml | 2 +- cinder/templates/job-ks-service.yaml | 2 +- cinder/templates/job-ks-user.yaml | 2 +- cinder/templates/pdb-api.yaml | 2 +- cinder/templates/pod-rally-test.yaml | 2 +- cinder/values.yaml | 177 ++++++----- etcd/templates/deployment.yaml | 27 +- etcd/templates/service.yaml | 18 +- etcd/values.yaml | 43 ++- glance/templates/deployment-api.yaml | 6 +- glance/templates/deployment-registry.yaml | 4 +- glance/templates/job-bootstrap.yaml | 2 +- glance/templates/job-db-init.yaml | 2 +- glance/templates/job-db-sync.yaml | 2 +- glance/templates/job-ks-endpoints.yaml | 2 +- glance/templates/job-ks-service.yaml | 2 +- glance/templates/job-ks-user.yaml | 2 +- glance/templates/pdb-api.yaml | 2 +- glance/templates/pdb-registry.yaml | 2 +- glance/templates/pod-rally-test.yaml | 2 +- glance/values.yaml | 173 ++++++----- heat/templates/deployment-api.yaml | 4 +- heat/templates/deployment-cfn.yaml | 4 +- heat/templates/deployment-cloudwatch.yaml | 4 +- heat/templates/job-db-init.yaml | 2 +- heat/templates/job-db-sync.yaml | 2 +- heat/templates/job-ks-endpoints.yaml | 2 +- heat/templates/job-ks-service.yaml | 2 +- heat/templates/job-ks-user.yaml | 2 +- heat/templates/pdb-api.yaml | 2 +- heat/templates/pdb-cfn.yaml | 2 +- heat/templates/pdb-cloudwatch.yaml | 2 +- heat/templates/statefulset-engine.yaml | 2 +- heat/values.yaml | 159 +++++----- .../snippets/_kubernetes_resources.tpl | 2 +- .../_kubernetes_upgrades_daemonset.tpl | 2 +- .../_kubernetes_upgrades_deployment.tpl | 2 +- horizon/templates/deployment.yaml | 4 +- horizon/templates/job-db-init.yaml | 2 +- horizon/templates/job-db-sync.yaml | 2 +- horizon/templates/pdb.yaml | 2 +- horizon/values.yaml | 69 +++-- ingress/templates/deployment-error.yaml | 2 +- ingress/templates/deployment-ingress.yaml | 2 +- ingress/values.yaml | 49 ++-- keystone/templates/deployment-api.yaml | 4 +- keystone/templates/job-bootstrap.yaml | 2 +- keystone/templates/job-db-init.yaml | 2 +- keystone/templates/job-db-sync.yaml | 2 +- keystone/templates/pdb.yaml | 2 +- keystone/templates/pod-rally-test.yaml | 2 +- keystone/values.yaml | 95 +++--- magnum/templates/deployment-api.yaml | 4 +- magnum/templates/job-db-init.yaml | 2 +- magnum/templates/job-db-sync.yaml | 2 +- magnum/templates/job-ks-endpoints.yaml | 2 +- magnum/templates/job-ks-service.yaml | 2 +- magnum/templates/job-ks-user.yaml | 2 +- magnum/templates/pdb-api.yaml | 2 +- magnum/templates/statefulset-conductor.yaml | 2 +- magnum/values.yaml | 139 +++++---- mariadb/templates/pdb-mariadb.yaml | 2 +- mariadb/templates/statefulset.yaml | 2 +- mariadb/values.yaml | 27 +- memcached/templates/deployment.yaml | 22 +- memcached/values.yaml | 38 +-- mistral/templates/deployment-api.yaml | 4 +- mistral/templates/deployment-executor.yaml | 2 +- mistral/templates/job-db-init.yaml | 2 +- mistral/templates/job-db-sync.yaml | 2 +- mistral/templates/job-ks-endpoints.yaml | 2 +- mistral/templates/job-ks-service.yaml | 2 +- mistral/templates/job-ks-user.yaml | 2 +- mistral/templates/pdb-api.yaml | 2 +- mistral/templates/statefulset-engine.yaml | 2 +- .../templates/statefulset-event-engine.yaml | 2 +- mistral/values.yaml | 143 +++++---- neutron/templates/daemonset-dhcp-agent.yaml | 2 +- neutron/templates/daemonset-l3-agent.yaml | 2 +- .../templates/daemonset-metadata-agent.yaml | 2 +- neutron/templates/daemonset-ovs-agent.yaml | 4 +- neutron/templates/daemonset-ovs-db.yaml | 2 +- neutron/templates/daemonset-ovs-vswitchd.yaml | 2 +- neutron/templates/deployment-server.yaml | 4 +- neutron/templates/job-bootstrap.yaml | 2 +- neutron/templates/job-db-init.yaml | 2 +- neutron/templates/job-db-sync.yaml | 12 +- neutron/templates/job-ks-endpoints.yaml | 2 +- neutron/templates/job-ks-service.yaml | 2 +- neutron/templates/job-ks-user.yaml | 2 +- neutron/templates/pdb-server.yaml | 2 +- neutron/templates/pod-rally-test.yaml | 2 +- neutron/values.yaml | 275 +++++++++--------- nova/templates/daemonset-compute.yaml | 4 +- nova/templates/daemonset-libvirt.yaml | 2 +- nova/templates/deployment-api-metadata.yaml | 4 +- nova/templates/deployment-api-osapi.yaml | 4 +- nova/templates/deployment-conductor.yaml | 2 +- nova/templates/deployment-consoleauth.yaml | 2 +- nova/templates/deployment-novncproxy.yaml | 4 +- nova/templates/deployment-scheduler.yaml | 2 +- nova/templates/job-bootstrap.yaml | 2 +- nova/templates/job-db-init.yaml | 4 +- nova/templates/job-db-sync.yaml | 2 +- nova/templates/job-ks-endpoints.yaml | 2 +- nova/templates/job-ks-service.yaml | 2 +- nova/templates/job-ks-user.yaml | 2 +- nova/templates/pdb-metadata.yaml | 2 +- nova/templates/pdb-osapi.yaml | 2 +- nova/values.yaml | 192 ++++++------ rabbitmq/templates/deployment.yaml | 19 +- rabbitmq/values.yaml | 34 ++- senlin/templates/deployment-api.yaml | 4 +- senlin/templates/job-db-init.yaml | 2 +- senlin/templates/job-db-sync.yaml | 2 +- senlin/templates/job-ks-endpoints.yaml | 2 +- senlin/templates/job-ks-service.yaml | 2 +- senlin/templates/job-ks-user.yaml | 2 +- senlin/templates/pdb-api.yaml | 2 +- senlin/templates/statefulset-engine.yaml | 2 +- senlin/values.yaml | 139 +++++---- 146 files changed, 1232 insertions(+), 1208 deletions(-) diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml index 588559416f..4656dcaf4e 100644 --- a/barbican/templates/deployment-api.yaml +++ b/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 diff --git a/barbican/templates/job-db-init.yaml b/barbican/templates/job-db-init.yaml index 25ff06d3b0..ae92f300fd 100644 --- a/barbican/templates/job-db-init.yaml +++ b/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: diff --git a/barbican/templates/job-db-sync.yaml b/barbican/templates/job-db-sync.yaml index 29ba887970..b05d88dedc 100644 --- a/barbican/templates/job-db-sync.yaml +++ b/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: diff --git a/barbican/templates/job-ks-endpoints.yaml b/barbican/templates/job-ks-endpoints.yaml index 27a63dfcd0..6300bc5e32 100644 --- a/barbican/templates/job-ks-endpoints.yaml +++ b/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: diff --git a/barbican/templates/job-ks-service.yaml b/barbican/templates/job-ks-service.yaml index bc3c3d317a..c26a193337 100644 --- a/barbican/templates/job-ks-service.yaml +++ b/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: diff --git a/barbican/templates/job-ks-user.yaml b/barbican/templates/job-ks-user.yaml index 7401e467e4..6c0e2d4e5c 100644 --- a/barbican/templates/job-ks-user.yaml +++ b/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: diff --git a/barbican/templates/pdb-api.yaml b/barbican/templates/pdb-api.yaml index 61240de25b..f4e9bda587 100644 --- a/barbican/templates/pdb-api.yaml +++ b/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 }} diff --git a/barbican/values.yaml b/barbican/values.yaml index 0e0cc30654..9cf6dedbd2 100644 --- a/barbican/values.yaml +++ b/barbican/values.yaml @@ -26,17 +26,77 @@ images: api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3 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 +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 + 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 diff --git a/ceph/templates/daemonset-osd.yaml b/ceph/templates/daemonset-osd.yaml index 4f4197ff33..c52dfdcba5 100644 --- a/ceph/templates/daemonset-osd.yaml +++ b/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 }} - cpu: {{ .Values.resources.osd.requests.cpu | quote }} + memory: {{ .Values.pod.resources.osd.requests.memory | quote }} + cpu: {{ .Values.pod.resources.osd.requests.cpu | quote }} limits: - memory: {{ .Values.resources.osd.limits.memory | quote }} - cpu: {{ .Values.resources.osd.limits.cpu | quote }} + memory: {{ .Values.pod.resources.osd.limits.memory | quote }} + cpu: {{ .Values.pod.resources.osd.limits.cpu | quote }} {{- end }} securityContext: privileged: true diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml index a77ccff378..85716df212 100644 --- a/ceph/templates/deployment-mds.yaml +++ b/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 }} - cpu: {{ .Values.resources.mds.requests.cpu | quote }} + memory: {{ .Values.pod.resources.mds.requests.memory | quote }} + cpu: {{ .Values.pod.resources.mds.requests.cpu | quote }} limits: - memory: {{ .Values.resources.mds.limits.memory | quote }} - cpu: {{ .Values.resources.mds.limits.cpu | quote }} + memory: {{ .Values.pod.resources.mds.limits.memory | quote }} + cpu: {{ .Values.pod.resources.mds.limits.cpu | quote }} {{- end }} ports: - containerPort: 6800 diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml index 95a8923fdc..c321dd34d1 100644 --- a/ceph/templates/deployment-moncheck.yaml +++ b/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 }} - cpu: {{ .Values.resources.mon_check.requests.cpu | quote }} + memory: {{ .Values.pod.resources.mon_check.requests.memory | quote }} + cpu: {{ .Values.pod.resources.mon_check.requests.cpu | quote }} limits: - memory: {{ .Values.resources.mon_check.limits.memory | quote }} - cpu: {{ .Values.resources.mon_check.limits.cpu | quote }} + memory: {{ .Values.pod.resources.mon_check.limits.memory | quote }} + cpu: {{ .Values.pod.resources.mon_check.limits.cpu | quote }} {{- end }} ports: - containerPort: 6789 diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml index 76b20e863f..b0471a9290 100644 --- a/ceph/templates/deployment-rgw.yaml +++ b/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 }} - cpu: {{ .Values.resources.rgw.requests.cpu | quote }} + memory: {{ .Values.pod.resources.rgw.requests.memory | quote }} + cpu: {{ .Values.pod.resources.rgw.requests.cpu | quote }} limits: - memory: {{ .Values.resources.rgw.limits.memory | quote }} - cpu: {{ .Values.resources.rgw.limits.cpu | quote }} + memory: {{ .Values.pod.resources.rgw.limits.memory | quote }} + cpu: {{ .Values.pod.resources.rgw.limits.cpu | quote }} {{- end }} ports: - containerPort: {{ .Values.network.port.rgw_target }} diff --git a/ceph/templates/job-keyring.yaml b/ceph/templates/job-keyring.yaml index aa067605b6..4d4938f731 100644 --- a/ceph/templates/job-keyring.yaml +++ b/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 }} - cpu: {{ .Values.resources.jobs.secret_provisioning.requests.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }} limits: - memory: {{ .Values.resources.jobs.secret_provisioning.limits.memory | quote }} - cpu: {{ .Values.resources.jobs.secret_provisioning.limits.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }} {{- end }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph/templates/job-namespace-client-key.yaml b/ceph/templates/job-namespace-client-key.yaml index aa9a2f09ed..b8d03255b0 100644 --- a/ceph/templates/job-namespace-client-key.yaml +++ b/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 }} - cpu: {{ .Values.resources.jobs.secret_provisioning.requests.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }} limits: - memory: {{ .Values.resources.jobs.secret_provisioning.limits.memory | quote }} - cpu: {{ .Values.resources.jobs.secret_provisioning.limits.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }} {{- end }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph/templates/job-storage-admin-keys.yaml b/ceph/templates/job-storage-admin-keys.yaml index f2fbd4f00f..af05a0f433 100644 --- a/ceph/templates/job-storage-admin-keys.yaml +++ b/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 }} - cpu: {{ .Values.resources.jobs.secret_provisioning.requests.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.secret_provisioning.requests.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.secret_provisioning.requests.cpu | quote }} limits: - memory: {{ .Values.resources.jobs.secret_provisioning.limits.memory | quote }} - cpu: {{ .Values.resources.jobs.secret_provisioning.limits.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.secret_provisioning.limits.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.secret_provisioning.limits.cpu | quote }} {{- end }} env: - name: DEPLOYMENT_NAMESPACE diff --git a/ceph/templates/pdb-mon.yaml b/ceph/templates/pdb-mon.yaml index 71b5c9b199..4356b4468f 100644 --- a/ceph/templates/pdb-mon.yaml +++ b/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 diff --git a/ceph/templates/statefulset-mon.yaml b/ceph/templates/statefulset-mon.yaml index cd67f457a9..b6376d90eb 100644 --- a/ceph/templates/statefulset-mon.yaml +++ b/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 }} - cpu: {{ .Values.resources.mon.requests.cpu | quote }} + memory: {{ .Values.pod.resources.mon.requests.memory | quote }} + cpu: {{ .Values.pod.resources.mon.requests.cpu | quote }} limits: - memory: {{ .Values.resources.mon.limits.memory | quote }} - cpu: {{ .Values.resources.mon.limits.cpu | quote }} + memory: {{ .Values.pod.resources.mon.limits.memory | quote }} + cpu: {{ .Values.pod.resources.mon.limits.cpu | quote }} {{- end }} ports: - containerPort: 6789 diff --git a/ceph/values.yaml b/ceph/values.yaml index 9d36d3b5d1..61b37bedfe 100644 --- a/ceph/values.yaml +++ b/ceph/values.yaml @@ -36,9 +36,56 @@ labels: node_selector_key: ceph-storage node_selector_value: enabled -pod_disruption_budget: - mon: - min_available: 0 +pod: + lifecycle: + 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 diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml index b6a313232e..7e950d9bb2 100644 --- a/cinder/templates/deployment-api.yaml +++ b/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 diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml index 113e9a0f40..147a4ed99e 100644 --- a/cinder/templates/deployment-backup.yaml +++ b/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: diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml index 18a8bc0b67..0172e81187 100644 --- a/cinder/templates/deployment-scheduler.yaml +++ b/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: diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml index 770eadb497..2c7ff1b407 100644 --- a/cinder/templates/deployment-volume.yaml +++ b/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: diff --git a/cinder/templates/job-bootstrap.yaml b/cinder/templates/job-bootstrap.yaml index 0eaf625802..47137c0614 100644 --- a/cinder/templates/job-bootstrap.yaml +++ b/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: diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml index 54397b0d10..f7f06f25e2 100644 --- a/cinder/templates/job-db-init.yaml +++ b/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: diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml index 7a8eaa4c91..64c530849f 100644 --- a/cinder/templates/job-db-sync.yaml +++ b/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: diff --git a/cinder/templates/job-ks-endpoints.yaml b/cinder/templates/job-ks-endpoints.yaml index 9830f36196..7b0fd6a45f 100644 --- a/cinder/templates/job-ks-endpoints.yaml +++ b/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: diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml index 3278fd78b5..f36dfe337d 100644 --- a/cinder/templates/job-ks-service.yaml +++ b/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: diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml index 4b70078e79..ada19af626 100644 --- a/cinder/templates/job-ks-user.yaml +++ b/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: diff --git a/cinder/templates/pdb-api.yaml b/cinder/templates/pdb-api.yaml index aed09b4ab1..8e95208af1 100644 --- a/cinder/templates/pdb-api.yaml +++ b/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 }} diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml index 2549adbf2b..fa53a5fadf 100644 --- a/cinder/templates/pod-rally-test.yaml +++ b/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 }} diff --git a/cinder/values.yaml b/cinder/values.yaml index 518027c1c0..feeadc67cc 100644 --- a/cinder/values.yaml +++ b/cinder/values.yaml @@ -44,21 +44,94 @@ 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 +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 + termination_grace_period: + api: + 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 diff --git a/etcd/templates/deployment.yaml b/etcd/templates/deployment.yaml index 5898c6c487..e6071a4a96 100644 --- a/etcd/templates/deployment.yaml +++ b/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 }} - 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 }} +{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} 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 }} diff --git a/etcd/templates/service.yaml b/etcd/templates/service.yaml index 0ad00a0de3..5b676715de 100644 --- a/etcd/templates/service.yaml +++ b/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 }} diff --git a/etcd/values.yaml b/etcd/values.yaml index def8d36988..d89429aea1 100644 --- a/etcd/values.yaml +++ b/etcd/values.yaml @@ -1,23 +1,44 @@ -images: - etcd: gcr.io/google_containers/etcd-amd64:2.2.5 - pull_policy: "IfNotPresent" +# 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. -upgrades: - revision_history: 3 - pod_replacement_strategy: RollingUpdate - rolling_update: - max_unavailable: 1 - max_surge: 3 +# Default values for etcd. +# This is a YAML-formatted file. +# Declare name/value pairs to be passed into your templates. +# name: value + +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 diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml index c4d7f1e75c..1041102bb2 100644 --- a/glance/templates/deployment-api.yaml +++ b/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 diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml index 95494e6b34..334a8c47a7 100644 --- a/glance/templates/deployment-registry.yaml +++ b/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 diff --git a/glance/templates/job-bootstrap.yaml b/glance/templates/job-bootstrap.yaml index ea42a9c2e7..ba18a9ddb1 100644 --- a/glance/templates/job-bootstrap.yaml +++ b/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 }} diff --git a/glance/templates/job-db-init.yaml b/glance/templates/job-db-init.yaml index 84c7de1565..ba43b6b45e 100644 --- a/glance/templates/job-db-init.yaml +++ b/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: diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml index 7efa6a2932..55343f72dc 100644 --- a/glance/templates/job-db-sync.yaml +++ b/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: diff --git a/glance/templates/job-ks-endpoints.yaml b/glance/templates/job-ks-endpoints.yaml index e168a37b6e..971d4e836b 100644 --- a/glance/templates/job-ks-endpoints.yaml +++ b/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: diff --git a/glance/templates/job-ks-service.yaml b/glance/templates/job-ks-service.yaml index 140ac5be57..175f75161c 100644 --- a/glance/templates/job-ks-service.yaml +++ b/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: diff --git a/glance/templates/job-ks-user.yaml b/glance/templates/job-ks-user.yaml index 766ad6af8f..20ceacf566 100644 --- a/glance/templates/job-ks-user.yaml +++ b/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: diff --git a/glance/templates/pdb-api.yaml b/glance/templates/pdb-api.yaml index 784f0b9de0..1b45253956 100644 --- a/glance/templates/pdb-api.yaml +++ b/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 }} diff --git a/glance/templates/pdb-registry.yaml b/glance/templates/pdb-registry.yaml index 26d5f7778b..1c18d53671 100644 --- a/glance/templates/pdb-registry.yaml +++ b/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 }} diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml index d01139a32b..fc7de0a1ce 100644 --- a/glance/templates/pod-rally-test.yaml +++ b/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 }} diff --git a/glance/values.yaml b/glance/values.yaml index ca0f8c4431..8f5e74b989 100644 --- a/glance/values.yaml +++ b/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" diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml index 5fed9bdf42..97e1c86609 100644 --- a/heat/templates/deployment-api.yaml +++ b/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 diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml index a102ac911e..acd2f93f32 100644 --- a/heat/templates/deployment-cfn.yaml +++ b/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 diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml index 267c7dc975..8975ba916e 100644 --- a/heat/templates/deployment-cloudwatch.yaml +++ b/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 diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml index dc082e70aa..16ea8d5e2c 100644 --- a/heat/templates/job-db-init.yaml +++ b/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: diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml index 54780fb495..31e024e410 100644 --- a/heat/templates/job-db-sync.yaml +++ b/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: diff --git a/heat/templates/job-ks-endpoints.yaml b/heat/templates/job-ks-endpoints.yaml index 03fced795f..9d406be046 100644 --- a/heat/templates/job-ks-endpoints.yaml +++ b/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: diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml index c8b1670368..762778d4cd 100644 --- a/heat/templates/job-ks-service.yaml +++ b/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: diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml index 8e9e97fa1e..202f22abc6 100644 --- a/heat/templates/job-ks-user.yaml +++ b/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: diff --git a/heat/templates/pdb-api.yaml b/heat/templates/pdb-api.yaml index f103416cef..c05eaba9c7 100644 --- a/heat/templates/pdb-api.yaml +++ b/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 }} diff --git a/heat/templates/pdb-cfn.yaml b/heat/templates/pdb-cfn.yaml index e72bb106d0..33c5f245d9 100644 --- a/heat/templates/pdb-cfn.yaml +++ b/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 }} diff --git a/heat/templates/pdb-cloudwatch.yaml b/heat/templates/pdb-cloudwatch.yaml index c5ca967f64..80b1038038 100644 --- a/heat/templates/pdb-cloudwatch.yaml +++ b/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 }} diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml index f3eb51deab..7b6e22c255 100644 --- a/heat/templates/statefulset-engine.yaml +++ b/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: diff --git a/heat/values.yaml b/heat/values.yaml index c6b38bc44b..2c36e75e8d 100644 --- a/heat/values.yaml +++ b/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: - enabled: false - api: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - cfn: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - cloudwatch: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - engine: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - bootstrap: +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 + cfn: + min_available: 0 + cloudwatch: + min_available: 0 + termination_grace_period: + api: + timeout: 30 + cfn: + timeout: 30 + cloudwatch: + timeout: 30 + resources: + enabled: false + api: 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: - 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: + engine: 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: diff --git a/helm-toolkit/templates/snippets/_kubernetes_resources.tpl b/helm-toolkit/templates/snippets/_kubernetes_resources.tpl index e0fde71f8b..5dfaf5f250 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_resources.tpl +++ b/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 }} diff --git a/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl b/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl index 682e1584ae..29f287d19b 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_upgrades_daemonset.tpl +++ b/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 }} diff --git a/helm-toolkit/templates/snippets/_kubernetes_upgrades_deployment.tpl b/helm-toolkit/templates/snippets/_kubernetes_upgrades_deployment.tpl index fc6c3e6545..0fa383f62d 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_upgrades_deployment.tpl +++ b/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 }} diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml index 64745166f3..66f550e70e 100644 --- a/horizon/templates/deployment.yaml +++ b/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 diff --git a/horizon/templates/job-db-init.yaml b/horizon/templates/job-db-init.yaml index 8d9a09a73b..905101a515 100644 --- a/horizon/templates/job-db-init.yaml +++ b/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: diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml index ffb15dd4b1..e4cf026d62 100644 --- a/horizon/templates/job-db-sync.yaml +++ b/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: diff --git a/horizon/templates/pdb.yaml b/horizon/templates/pdb.yaml index baf12a4df0..ccb624c80b 100644 --- a/horizon/templates/pdb.yaml +++ b/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 }} diff --git a/horizon/values.yaml b/horizon/values.yaml index dff08d6718..2ec4b7619d 100644 --- a/horizon/values.yaml +++ b/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: - enabled: false - server: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1204Mi" - cpu: "2000m" - jobs: - db_init: +pod: + lifecycle: + upgrades: + deployments: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 + disruption_budget: + horizon: + min_available: 0 + termination_grace_period: + horizon: + timeout: 30 + resources: + enabled: false + server: requests: memory: "128Mi" cpu: "100m" limits: - memory: "1024Mi" - cpu: "2000m" - db_sync: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" + memory: "1204Mi" 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: diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml index 4cfab7e529..ca16c2866b 100644 --- a/ingress/templates/deployment-error.yaml +++ b/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 diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index dd51e7404a..3567d4b233 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/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 diff --git a/ingress/values.yaml b/ingress/values.yaml index 73b4335c75..724038a3e4 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -28,13 +28,31 @@ images: error_pages: gcr.io/google_containers/defaultbackend:1.0 pull_policy: "IfNotPresent" -upgrades: - deployments: - revision_history: 3 - pod_replacement_strategy: RollingUpdate - rolling_update: - max_unavailable: 1 - max_surge: 3 +pod: + lifecycle: + upgrades: + deployments: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + 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" diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml index d1622e8dc1..574364bf10 100644 --- a/keystone/templates/deployment-api.yaml +++ b/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 diff --git a/keystone/templates/job-bootstrap.yaml b/keystone/templates/job-bootstrap.yaml index a4cc0ac316..67fdcac18b 100644 --- a/keystone/templates/job-bootstrap.yaml +++ b/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 }} diff --git a/keystone/templates/job-db-init.yaml b/keystone/templates/job-db-init.yaml index 195c91d713..d5c967032d 100644 --- a/keystone/templates/job-db-init.yaml +++ b/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: diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml index 50af2a8c72..8d97aaaf06 100644 --- a/keystone/templates/job-db-sync.yaml +++ b/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" }} diff --git a/keystone/templates/pdb.yaml b/keystone/templates/pdb.yaml index 722521ee40..1b67fcc506 100644 --- a/keystone/templates/pdb.yaml +++ b/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 }} diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml index 543ce19556..51e5c82f8c 100644 --- a/keystone/templates/pod-rally-test.yaml +++ b/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 }} diff --git a/keystone/values.yaml b/keystone/values.yaml index 53da11ddc7..e8dd6801bf 100644 --- a/keystone/values.yaml +++ b/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: - 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" - 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 + termination_grace_period: + api: + timeout: 30 + 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" + tests: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" mounts: keystone_db_init: diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml index 039e23ad0f..c4bee66aec 100644 --- a/magnum/templates/deployment-api.yaml +++ b/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 diff --git a/magnum/templates/job-db-init.yaml b/magnum/templates/job-db-init.yaml index ed86f05b59..85ad8be4b3 100644 --- a/magnum/templates/job-db-init.yaml +++ b/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: diff --git a/magnum/templates/job-db-sync.yaml b/magnum/templates/job-db-sync.yaml index 9a80aee329..551fc1ba44 100644 --- a/magnum/templates/job-db-sync.yaml +++ b/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: diff --git a/magnum/templates/job-ks-endpoints.yaml b/magnum/templates/job-ks-endpoints.yaml index af254a9e47..ee4ea59de6 100644 --- a/magnum/templates/job-ks-endpoints.yaml +++ b/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: diff --git a/magnum/templates/job-ks-service.yaml b/magnum/templates/job-ks-service.yaml index 731a9c9ffc..d43c516e14 100644 --- a/magnum/templates/job-ks-service.yaml +++ b/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: diff --git a/magnum/templates/job-ks-user.yaml b/magnum/templates/job-ks-user.yaml index 17b026e692..0519ad6568 100644 --- a/magnum/templates/job-ks-user.yaml +++ b/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: diff --git a/magnum/templates/pdb-api.yaml b/magnum/templates/pdb-api.yaml index 8cf956be50..9d83eb9d9e 100644 --- a/magnum/templates/pdb-api.yaml +++ b/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 }} diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml index fa1b781246..a563015e0f 100644 --- a/magnum/templates/statefulset-conductor.yaml +++ b/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: diff --git a/magnum/values.yaml b/magnum/values.yaml index 858cc88cf7..e5f803c078 100644 --- a/magnum/values.yaml +++ b/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: - enabled: false - api: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - conductor: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - bootstrap: +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 + termination_grace_period: + api: + timeout: 30 + resources: + enabled: false + api: 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: + conductor: 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: diff --git a/mariadb/templates/pdb-mariadb.yaml b/mariadb/templates/pdb-mariadb.yaml index 409e6f92f2..123ae72fe2 100644 --- a/mariadb/templates/pdb-mariadb.yaml +++ b/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 }} diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml index fd117a5fd6..045e46ad63 100644 --- a/mariadb/templates/statefulset.yaml +++ b/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: diff --git a/mariadb/values.yaml b/mariadb/values.yaml index 3f8647fcba..e9c701831a 100644 --- a/mariadb/values.yaml +++ b/mariadb/values.yaml @@ -16,19 +16,20 @@ replicas: 3 force_bootstrap: false -pod_disruption_budget: - mariadb: - min_available: 0 - -resources: - enabled: false - api: - limits: - memory: "128Mi" - cpu: "500m" - requests: - memory: "128Mi" - cpu: "500m" +pod: + lifecycle: + disruption_budget: + mariadb: + min_available: 0 + resources: + enabled: false + api: + limits: + memory: "128Mi" + cpu: "500m" + requests: + memory: "128Mi" + cpu: "500m" images: mariadb: docker.io/mariadb:10.1.23 diff --git a/memcached/templates/deployment.yaml b/memcached/templates/deployment.yaml index a090b3f5a0..3d740dee30 100644 --- a/memcached/templates/deployment.yaml +++ b/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 }} - revisionHistoryLimit: {{ .Values.upgrades.revision_history }} - 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 }} + replicas: {{ .Values.pod.resources.memcached.replicas }} +{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} template: metadata: labels: @@ -40,15 +34,7 @@ spec: - name: memcached image: {{ .Values.images.memcached }} imagePullPolicy: {{ .Values.images.pull_policy }} - {{- if .Values.resources.enabled }} - 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 }} +{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: ["sh", "-xec"] args: - | diff --git a/memcached/values.yaml b/memcached/values.yaml index 4063109af8..8f42d5c87b 100644 --- a/memcached/values.yaml +++ b/memcached/values.yaml @@ -21,12 +21,26 @@ images: memcached: docker.io/memcached:1.4 pull_policy: "IfNotPresent" -upgrades: - revision_history: 3 - pod_replacement_strategy: RollingUpdate - rolling_update: - max_unavailable: 1 - max_surge: 3 +pod: + lifecycle: + upgrades: + deployments: + revision_history: 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" diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml index 0bffe51f24..aa1953eda0 100644 --- a/mistral/templates/deployment-api.yaml +++ b/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 diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml index adfc3e4316..45d5a10f0e 100644 --- a/mistral/templates/deployment-executor.yaml +++ b/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: diff --git a/mistral/templates/job-db-init.yaml b/mistral/templates/job-db-init.yaml index cbfbfbb268..2e70f71242 100644 --- a/mistral/templates/job-db-init.yaml +++ b/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: diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml index 25b45ef24c..a222d3d070 100644 --- a/mistral/templates/job-db-sync.yaml +++ b/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: diff --git a/mistral/templates/job-ks-endpoints.yaml b/mistral/templates/job-ks-endpoints.yaml index 80cb353398..ffbca4c396 100644 --- a/mistral/templates/job-ks-endpoints.yaml +++ b/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: diff --git a/mistral/templates/job-ks-service.yaml b/mistral/templates/job-ks-service.yaml index cd6a32de1a..1cbd211a2a 100644 --- a/mistral/templates/job-ks-service.yaml +++ b/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: diff --git a/mistral/templates/job-ks-user.yaml b/mistral/templates/job-ks-user.yaml index 8723ee51f2..0286f568de 100644 --- a/mistral/templates/job-ks-user.yaml +++ b/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: diff --git a/mistral/templates/pdb-api.yaml b/mistral/templates/pdb-api.yaml index 475e0daca9..d398fb7eaa 100644 --- a/mistral/templates/pdb-api.yaml +++ b/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 }} diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml index b5eceac7e0..6888c1a31e 100644 --- a/mistral/templates/statefulset-engine.yaml +++ b/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: diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml index 33e0c74320..e8f22cc7c7 100644 --- a/mistral/templates/statefulset-event-engine.yaml +++ b/mistral/templates/statefulset-event-engine.yaml @@ -39,7 +39,7 @@ spec: - name: mistral-event-engine image: {{ .Values.images.event_engine }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.event_engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.event_engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/mistral-event-engine.sh volumeMounts: diff --git a/mistral/values.yaml b/mistral/values.yaml index dea9091c96..004a9a263d 100644 --- a/mistral/values.yaml +++ b/mistral/values.yaml @@ -40,22 +40,6 @@ images: executor: docker.io/kolla/ubuntu-source-mistral-executor:3.0.3 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 - network: api: ingress: @@ -266,83 +250,98 @@ conf: auth_type: password auth_version: v3 -resources: - enabled: false - api: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - engine: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - event_engine: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - executor: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - bootstrap: +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 + termination_grace_period: + api: + timeout: 30 + resources: + enabled: false + api: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - db_init: + engine: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - db_sync: + event_engine: 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: + executor: 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" diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml index 372cd7c90f..fa0b1117b5 100644 --- a/neutron/templates/daemonset-dhcp-agent.yaml +++ b/neutron/templates/daemonset-dhcp-agent.yaml @@ -43,7 +43,7 @@ spec: - name: neutron-dhcp-agent image: {{ .Values.images.dhcp }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.agent.dhcp | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.dhcp | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml index fba00ec2d7..74f50531b8 100644 --- a/neutron/templates/daemonset-l3-agent.yaml +++ b/neutron/templates/daemonset-l3-agent.yaml @@ -43,7 +43,7 @@ spec: - name: neutron-l3-agent image: {{ .Values.images.l3 }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml index 2445041711..c05e804b11 100644 --- a/neutron/templates/daemonset-metadata-agent.yaml +++ b/neutron/templates/daemonset-metadata-agent.yaml @@ -43,7 +43,7 @@ spec: - name: neutron-metadata-agent image: {{ .Values.images.metadata }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true ports: diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml index 54eaf5f429..9d974b8a03 100644 --- a/neutron/templates/daemonset-ovs-agent.yaml +++ b/neutron/templates/daemonset-ovs-agent.yaml @@ -40,7 +40,7 @@ spec: - name: ovs-agent-init image: {{ .Values.images.neutron_openvswitch_agent }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true runAsUser: 0 @@ -78,7 +78,7 @@ spec: - name: ovs-agent image: {{ .Values.images.neutron_openvswitch_agent }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: diff --git a/neutron/templates/daemonset-ovs-db.yaml b/neutron/templates/daemonset-ovs-db.yaml index d337dce647..7a21f99f92 100644 --- a/neutron/templates/daemonset-ovs-db.yaml +++ b/neutron/templates/daemonset-ovs-db.yaml @@ -38,7 +38,7 @@ spec: - name: ovs-db image: {{ .Values.images.openvswitch_db_server }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.ovs.db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.ovs.db | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: diff --git a/neutron/templates/daemonset-ovs-vswitchd.yaml b/neutron/templates/daemonset-ovs-vswitchd.yaml index 0adb097c86..014b0efed7 100644 --- a/neutron/templates/daemonset-ovs-vswitchd.yaml +++ b/neutron/templates/daemonset-ovs-vswitchd.yaml @@ -38,7 +38,7 @@ spec: - name: ovs-vswitchd image: {{ .Values.images.openvswitch_vswitchd }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.ovs.vswitchd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.ovs.vswitchd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true # ensures this container can speak to the ovs database diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml index 6109c9b946..3c45042e14 100644 --- a/neutron/templates/deployment-server.yaml +++ b/neutron/templates/deployment-server.yaml @@ -36,14 +36,14 @@ spec: {{ tuple $envAll "neutron" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }} - terminationGracePeriodSeconds: {{ .Values.termination_grace_period.server.timeout | default "30" }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.server.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: neutron-server image: {{ .Values.images.server }} 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/neutron-server.sh - start diff --git a/neutron/templates/job-bootstrap.yaml b/neutron/templates/job-bootstrap.yaml index b59ae866f7..6466f77702 100644 --- a/neutron/templates/job-bootstrap.yaml +++ b/neutron/templates/job-bootstrap.yaml @@ -34,7 +34,7 @@ spec: - name: neutron-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 }} diff --git a/neutron/templates/job-db-init.yaml b/neutron/templates/job-db-init.yaml index e8e97e6db3..398c4831d6 100644 --- a/neutron/templates/job-db-init.yaml +++ b/neutron/templates/job-db-init.yaml @@ -31,7 +31,7 @@ spec: - name: neutron-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: diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml index 8b30f16be5..27b21e2052 100644 --- a/neutron/templates/job-db-sync.yaml +++ b/neutron/templates/job-db-sync.yaml @@ -31,15 +31,15 @@ spec: - name: neutron-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 }} - {{- if .Values.resources.enabled }} +{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} + {{- if .Values.pod.resources.enabled }} resources: limits: - cpu: {{ .Values.resources.jobs.db_sync.limits.cpu | quote }} - memory: {{ .Values.resources.jobs.db_sync.limits.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.db_sync.limits.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.db_sync.limits.memory | quote }} requests: - cpu: {{ .Values.resources.jobs.db_sync.requests.cpu | quote }} - memory: {{ .Values.resources.jobs.db_sync.requests.memory | quote }} + cpu: {{ .Values.pod.resources.jobs.db_sync.requests.cpu | quote }} + memory: {{ .Values.pod.resources.jobs.db_sync.requests.memory | quote }} {{- end }} command: - /tmp/db-sync.sh diff --git a/neutron/templates/job-ks-endpoints.yaml b/neutron/templates/job-ks-endpoints.yaml index 78cd8ed988..32c44ec1b8 100644 --- a/neutron/templates/job-ks-endpoints.yaml +++ b/neutron/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: diff --git a/neutron/templates/job-ks-service.yaml b/neutron/templates/job-ks-service.yaml index e507b76019..bcc4fc970a 100644 --- a/neutron/templates/job-ks-service.yaml +++ b/neutron/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: diff --git a/neutron/templates/job-ks-user.yaml b/neutron/templates/job-ks-user.yaml index 713fbd15a2..32211c20fa 100644 --- a/neutron/templates/job-ks-user.yaml +++ b/neutron/templates/job-ks-user.yaml @@ -31,7 +31,7 @@ spec: - name: neutron-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: diff --git a/neutron/templates/pdb-server.yaml b/neutron/templates/pdb-server.yaml index ce8e75e5ee..202e03b4f5 100644 --- a/neutron/templates/pdb-server.yaml +++ b/neutron/templates/pdb-server.yaml @@ -19,7 +19,7 @@ kind: PodDisruptionBudget metadata: name: neutron-server spec: - minAvailable: {{ .Values.pod_disruption_budget.server.min_available }} + minAvailable: {{ .Values.pod.lifecycle.disruption_budget.server.min_available }} selector: matchLabels: {{ tuple $envAll "neutron" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml index 7990a11d32..55d1f00a46 100644 --- a/neutron/templates/pod-rally-test.yaml +++ b/neutron/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 }} diff --git a/neutron/values.yaml b/neutron/values.yaml index 566f98b096..6a3de5c55f 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -38,48 +38,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 - daemonsets: - pod_replacement_strategy: RollingUpdate - dhcp_agent: - enabled: false - min_ready_seconds: 0 - max_unavailable: 1 - l3_agent: - enabled: false - min_ready_seconds: 0 - max_unavailable: 1 - metadata_agent: - enabled: true - min_ready_seconds: 0 - max_unavailable: 1 - ovs_agent: - enabled: true - min_ready_seconds: 0 - max_unavailable: 1 - ovs_db: - enabled: false - min_ready_seconds: 0 - max_unavailable: 1 - ovs_vswitchd: - enabled: false - min_ready_seconds: 0 - max_unavailable: 1 - -pod_disruption_budget: - server: - min_available: 0 - -termination_grace_period: - server: - timeout: 30 - labels: # ovs is a special case, requiring a special # label that can apply to both control hosts @@ -231,109 +189,150 @@ dependencies: - service: compute endpoint: internal -resources: - enabled: false - agent: - dhcp: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - l3: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - metadata: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" +pod: + lifecycle: + upgrades: + deployments: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 + daemonsets: + pod_replacement_strategy: RollingUpdate + dhcp_agent: + enabled: false + min_ready_seconds: 0 + max_unavailable: 1 + l3_agent: + enabled: false + min_ready_seconds: 0 + max_unavailable: 1 + metadata_agent: + enabled: true + min_ready_seconds: 0 + max_unavailable: 1 + ovs_agent: + enabled: true + min_ready_seconds: 0 + max_unavailable: 1 + ovs_db: + enabled: false + min_ready_seconds: 0 + max_unavailable: 1 + ovs_vswitchd: + enabled: false + min_ready_seconds: 0 + max_unavailable: 1 + disruption_budget: + server: + min_available: 0 + termination_grace_period: + server: + timeout: 30 + resources: + enabled: false + agent: + dhcp: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + l3: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + metadata: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + ovs: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" ovs: + db: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + vswitchd: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" + server: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - ovs: - db: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - vswitchd: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - server: - 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" + 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" conf: paste: diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml index cdb5a6bb2b..c644b7865b 100644 --- a/nova/templates/daemonset-compute.yaml +++ b/nova/templates/daemonset-compute.yaml @@ -60,7 +60,7 @@ spec: - name: nova-compute-init image: {{ .Values.images.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: @@ -107,7 +107,7 @@ spec: - name: nova-compute image: {{ .Values.images.compute }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml index 2f32359395..57ba27ba65 100644 --- a/nova/templates/daemonset-libvirt.yaml +++ b/nova/templates/daemonset-libvirt.yaml @@ -69,7 +69,7 @@ spec: command: - /tmp/ceph-secret-define.sh {{- end }} -{{ tuple $envAll $envAll.Values.resources.libvirt | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.libvirt | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} securityContext: privileged: true command: diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml index ba9f9055f4..315a947d27 100644 --- a/nova/templates/deployment-api-metadata.yaml +++ b/nova/templates/deployment-api-metadata.yaml @@ -36,14 +36,14 @@ spec: {{ tuple $envAll "nova" "metadata" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: {{ .Values.labels.api_metadata.node_selector_key }}: {{ .Values.labels.api_metadata.node_selector_value }} - terminationGracePeriodSeconds: {{ .Values.termination_grace_period.metadata.timeout | default "30" }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.metadata.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_nova_api_metadata_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-api image: {{ .Values.images.api }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.api_metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-api-metadata.sh - start diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml index 6a9df39398..e1bb31e737 100644 --- a/nova/templates/deployment-api-osapi.yaml +++ b/nova/templates/deployment-api-osapi.yaml @@ -36,14 +36,14 @@ spec: {{ tuple $envAll "nova" "os-api" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} nodeSelector: {{ .Values.labels.osapi.node_selector_key }}: {{ .Values.labels.osapi.node_selector_value }} - terminationGracePeriodSeconds: {{ .Values.termination_grace_period.osapi.timeout | default "30" }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.osapi.timeout | default "30" }} initContainers: {{ tuple $envAll $dependencies $mounts_nova_api_osapi_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: nova-osapi 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/nova-api.sh - start diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml index 99c596c98c..c750af73cb 100644 --- a/nova/templates/deployment-conductor.yaml +++ b/nova/templates/deployment-conductor.yaml @@ -42,7 +42,7 @@ spec: - name: nova-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/nova-conductor.sh volumeMounts: diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml index c2b8ff2a0f..1572785d23 100644 --- a/nova/templates/deployment-consoleauth.yaml +++ b/nova/templates/deployment-consoleauth.yaml @@ -42,7 +42,7 @@ spec: - name: nova-consoleauth image: {{ .Values.images.consoleauth }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.consoleauth | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-consoleauth.sh volumeMounts: diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml index 2cfa23c7c1..f159cd42a4 100644 --- a/nova/templates/deployment-novncproxy.yaml +++ b/nova/templates/deployment-novncproxy.yaml @@ -44,7 +44,7 @@ spec: - name: nova-novncproxy-init image: {{ .Values.images.novncproxy }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-vnc-proxy-init.sh volumeMounts: @@ -62,7 +62,7 @@ spec: - name: nova-novncproxy image: {{ .Values.images.novncproxy }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.novncproxy | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/nova-novncproxy.sh volumeMounts: diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml index 82faabf62f..bdba7137f3 100644 --- a/nova/templates/deployment-scheduler.yaml +++ b/nova/templates/deployment-scheduler.yaml @@ -42,7 +42,7 @@ spec: - name: nova-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/nova-scheduler.sh volumeMounts: diff --git a/nova/templates/job-bootstrap.yaml b/nova/templates/job-bootstrap.yaml index 5b44e9054a..754990642a 100644 --- a/nova/templates/job-bootstrap.yaml +++ b/nova/templates/job-bootstrap.yaml @@ -33,7 +33,7 @@ spec: - name: nova-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: diff --git a/nova/templates/job-db-init.yaml b/nova/templates/job-db-init.yaml index d53e7efe6a..27bb170fb4 100644 --- a/nova/templates/job-db-init.yaml +++ b/nova/templates/job-db-init.yaml @@ -31,7 +31,7 @@ spec: - name: nova-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: @@ -60,7 +60,7 @@ spec: - name: nova-db-init-api 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: diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml index 5f86f7c427..493eb799c9 100644 --- a/nova/templates/job-db-sync.yaml +++ b/nova/templates/job-db-sync.yaml @@ -31,7 +31,7 @@ spec: - name: nova-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: diff --git a/nova/templates/job-ks-endpoints.yaml b/nova/templates/job-ks-endpoints.yaml index 88821e6043..02bdbb4403 100644 --- a/nova/templates/job-ks-endpoints.yaml +++ b/nova/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: diff --git a/nova/templates/job-ks-service.yaml b/nova/templates/job-ks-service.yaml index 35a676f3f0..00f2322c7b 100644 --- a/nova/templates/job-ks-service.yaml +++ b/nova/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_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-service.sh volumeMounts: diff --git a/nova/templates/job-ks-user.yaml b/nova/templates/job-ks-user.yaml index 6fa8231fc7..90b5f9157e 100644 --- a/nova/templates/job-ks-user.yaml +++ b/nova/templates/job-ks-user.yaml @@ -31,7 +31,7 @@ spec: - name: nova-ks-user image: {{ .Values.images.ks_user }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple $envAll $envAll.Values.resources.jobs.db_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-user.sh volumeMounts: diff --git a/nova/templates/pdb-metadata.yaml b/nova/templates/pdb-metadata.yaml index 1a6035d178..0870677763 100644 --- a/nova/templates/pdb-metadata.yaml +++ b/nova/templates/pdb-metadata.yaml @@ -18,7 +18,7 @@ kind: PodDisruptionBudget metadata: name: nova-api-metadata spec: - minAvailable: {{ .Values.pod_disruption_budget.metadata.min_available }} + minAvailable: {{ .Values.pod.lifecycle.disruption_budget.metadata.min_available }} selector: matchLabels: {{ tuple $envAll "nova" "metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} diff --git a/nova/templates/pdb-osapi.yaml b/nova/templates/pdb-osapi.yaml index 8aae192e9d..12879785dd 100644 --- a/nova/templates/pdb-osapi.yaml +++ b/nova/templates/pdb-osapi.yaml @@ -18,7 +18,7 @@ kind: PodDisruptionBudget metadata: name: nova-api-osapi spec: - minAvailable: {{ .Values.pod_disruption_budget.osapi.min_available }} + minAvailable: {{ .Values.pod.lifecycle.disruption_budget.osapi.min_available }} selector: matchLabels: {{ tuple $envAll "nova" "os-api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} diff --git a/nova/values.yaml b/nova/values.yaml index 45cbde680b..056c558593 100644 --- a/nova/values.yaml +++ b/nova/values.yaml @@ -73,36 +73,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 - daemonsets: - pod_replacement_strategy: RollingUpdate - compute: - enabled: true - min_ready_seconds: 0 - max_unavailable: 1 - libvirt: - enabled: true - min_ready_seconds: 0 - max_unavailable: 1 - -pod_disruption_budget: - metadata: - min_available: 0 - osapi: - min_available: 0 - -termination_grace_period: - metadata: - timeout: 30 - osapi: - timeout: 30 - bootstrap: enabled: true flavors: @@ -585,112 +555,140 @@ endpoints: default: 9696 public: 80 - -resources: - enabled: false - compute: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - libvirt: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - api_metadata: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - api: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - conductor: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - consoleauth: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - scheduler: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - novncproxy: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - bootstrap: +pod: + lifecycle: + upgrades: + deployments: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 + daemonsets: + pod_replacement_strategy: RollingUpdate + compute: + enabled: true + min_ready_seconds: 0 + max_unavailable: 1 + libvirt: + enabled: true + min_ready_seconds: 0 + max_unavailable: 1 + disruption_budget: + metadata: + min_available: 0 + osapi: + min_available: 0 + termination_grace_period: + metadata: + timeout: 30 + osapi: + timeout: 30 + resources: + enabled: false + compute: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - db_init: + libvirt: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - db_sync: + api_metadata: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - ks_endpoints: + api: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - ks_service: + conductor: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - ks_user: + consoleauth: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" - tests: + scheduler: requests: memory: "128Mi" cpu: "100m" limits: memory: "1024Mi" cpu: "2000m" + novncproxy: + 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" diff --git a/rabbitmq/templates/deployment.yaml b/rabbitmq/templates/deployment.yaml index 1b67d794bb..ec70cf839a 100644 --- a/rabbitmq/templates/deployment.yaml +++ b/rabbitmq/templates/deployment.yaml @@ -20,14 +20,7 @@ metadata: name: rabbitmq spec: replicas: {{ .Values.replicas }} - revisionHistoryLimit: {{ .Values.upgrades.revision_history }} - 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 }} +{{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }} template: metadata: labels: @@ -45,14 +38,14 @@ spec: containers: - name: rabbitmq image: {{ .Values.images.rabbitmq }} - {{- if .Values.resources.enabled }} + {{- if .Values.pod.resources.enabled }} resources: limits: - cpu: {{ .Values.resources.api.limits.cpu | quote }} - memory: {{ .Values.resources.api.limits.memory | quote }} + cpu: {{ .Values.pod.resources.api.limits.cpu | quote }} + memory: {{ .Values.pod.resources.api.limits.memory | quote }} requests: - cpu: {{ .Values.resources.api.requests.cpu | quote }} - memory: {{ .Values.resources.api.requests.memory | quote }} + cpu: {{ .Values.pod.resources.api.requests.cpu | quote }} + memory: {{ .Values.pod.resources.api.requests.memory | quote }} {{- end }} command: - bash diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index a1054b4b72..c974698985 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -19,26 +19,30 @@ replicas: 3 -resources: - enabled: false - api: - limits: - memory: "128Mi" - cpu: "500m" - requests: - memory: "128Mi" - cpu: "500m" + labels: node_selector_key: openstack-control-plane node_selector_value: enabled -upgrades: - revision_history: 3 - pod_replacement_strategy: RollingUpdate - rolling_update: - max_unavailable: 1 - max_surge: 3 +pod: + lifecycle: + upgrades: + revision_history: 3 + pod_replacement_strategy: RollingUpdate + rolling_update: + max_unavailable: 1 + max_surge: 3 + resources: + enabled: false + api: + limits: + memory: "128Mi" + cpu: "500m" + requests: + memory: "128Mi" + cpu: "500m" + auth: default_user: rabbitmq default_pass: password diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml index e778534992..1a45c54d19 100644 --- a/senlin/templates/deployment-api.yaml +++ b/senlin/templates/deployment-api.yaml @@ -36,14 +36,14 @@ spec: {{ tuple $envAll "senlin" "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_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: senlin-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/senlin-api.sh - start diff --git a/senlin/templates/job-db-init.yaml b/senlin/templates/job-db-init.yaml index 5f9c882d2e..fa30ab09aa 100644 --- a/senlin/templates/job-db-init.yaml +++ b/senlin/templates/job-db-init.yaml @@ -31,7 +31,7 @@ spec: - name: senlin-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: diff --git a/senlin/templates/job-db-sync.yaml b/senlin/templates/job-db-sync.yaml index 49b2b7f647..a989702906 100644 --- a/senlin/templates/job-db-sync.yaml +++ b/senlin/templates/job-db-sync.yaml @@ -31,7 +31,7 @@ spec: - name: senlin-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: diff --git a/senlin/templates/job-ks-endpoints.yaml b/senlin/templates/job-ks-endpoints.yaml index cb7f681997..2b68160137 100644 --- a/senlin/templates/job-ks-endpoints.yaml +++ b/senlin/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: diff --git a/senlin/templates/job-ks-service.yaml b/senlin/templates/job-ks-service.yaml index aac6ea8984..3a9be26387 100644 --- a/senlin/templates/job-ks-service.yaml +++ b/senlin/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: diff --git a/senlin/templates/job-ks-user.yaml b/senlin/templates/job-ks-user.yaml index c925f347f8..81fea81f6a 100644 --- a/senlin/templates/job-ks-user.yaml +++ b/senlin/templates/job-ks-user.yaml @@ -31,7 +31,7 @@ spec: - name: senlin-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: diff --git a/senlin/templates/pdb-api.yaml b/senlin/templates/pdb-api.yaml index 6b2c8708d0..29ec1ecaf8 100644 --- a/senlin/templates/pdb-api.yaml +++ b/senlin/templates/pdb-api.yaml @@ -19,7 +19,7 @@ kind: PodDisruptionBudget metadata: name: senlin-api spec: - minAvailable: {{ .Values.pod_disruption_budget.api.min_available }} + minAvailable: {{ .Values.pod.lifecycle.disruption_budget.api.min_available }} selector: matchLabels: {{ tuple $envAll "senlin" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} diff --git a/senlin/templates/statefulset-engine.yaml b/senlin/templates/statefulset-engine.yaml index f1d5def7c0..7505831037 100644 --- a/senlin/templates/statefulset-engine.yaml +++ b/senlin/templates/statefulset-engine.yaml @@ -39,7 +39,7 @@ spec: - name: senlin-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/senlin-engine.sh volumeMounts: diff --git a/senlin/values.yaml b/senlin/values.yaml index 6995d1e301..1e6ddc6699 100644 --- a/senlin/values.yaml +++ b/senlin/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: - enabled: false - api: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - engine: - requests: - memory: "128Mi" - cpu: "100m" - limits: - memory: "1024Mi" - cpu: "2000m" - jobs: - bootstrap: +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 + termination_grace_period: + api: + timeout: 30 + resources: + enabled: false + api: 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: + engine: 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: senlin_api: