[CLOUDOPS-344] fix: bump cinder chart and add bootstrap fix (#1806)
Ref: https://review.opendev.org/c/openstack/openstack-helm/+/926699
relate to #1804
diff --git a/.charts.yml b/.charts.yml
index ee1b799..6135b8d 100644
--- a/.charts.yml
+++ b/.charts.yml
@@ -34,13 +34,13 @@
repository:
url: https://luisico.github.io/cert-manager-webhook-infoblox-wapi
- name: cinder
- version: 0.3.15
+ version: 0.3.23
repository: *openstack_helm_repository
dependencies: *openstack_helm_dependencies
patches:
gerrit:
review.opendev.org:
- - 899814
+ - 926699
- name: coredns
version: 1.31.0
repository:
diff --git a/charts/cinder/Chart.yaml b/charts/cinder/Chart.yaml
index dc63593..9988b78 100644
--- a/charts/cinder/Chart.yaml
+++ b/charts/cinder/Chart.yaml
@@ -9,4 +9,4 @@
sources:
- https://opendev.org/openstack/cinder
- https://opendev.org/openstack/openstack-helm
-version: 0.3.15
+version: 0.3.23
diff --git a/charts/cinder/templates/bin/_bootstrap.sh.tpl b/charts/cinder/templates/bin/_bootstrap.sh.tpl
index 49d99c5..9d117c8 100644
--- a/charts/cinder/templates/bin/_bootstrap.sh.tpl
+++ b/charts/cinder/templates/bin/_bootstrap.sh.tpl
@@ -38,6 +38,11 @@
openstack volume type show {{ $name }} || \
openstack volume type create \
--{{ $access_type }} \
+ {{- range $key, $value := $properties }}
+ {{- if or (eq $key "encryption-provider") (eq $key "encryption-cipher") (eq $key "encryption-key-size") (eq $key "encryption-control-location") }}
+ --{{ $key }} {{ $value}} \
+ {{- end }}
+ {{- end }}
{{ $name }}
{{/*
We will try to set or update volume type properties.
@@ -64,7 +69,7 @@
{{- end }}
{{- range $key, $value := $properties }}
- {{- if and (ne $key "access_type") (ne $key "grant_access") $value }}
+ {{- if and (ne $key "access_type") (ne $key "grant_access") (ne $key "encryption-provider") (ne $key "encryption-cipher") (ne $key "encryption-key-size") (ne $key "encryption-control-location") $value }}
openstack volume type set --property {{ $key }}={{ $value }} {{ $name }}
{{- end }}
{{- end }}
diff --git a/charts/cinder/templates/deployment-api.yaml b/charts/cinder/templates/deployment-api.yaml
index feab3ef..641ed3b 100644
--- a/charts/cinder/templates/deployment-api.yaml
+++ b/charts/cinder/templates/deployment-api.yaml
@@ -43,6 +43,7 @@
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "cinder_api" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
{{ dict "envAll" $envAll "podName" "cinder-api" "containerNames" (list "cinder-api" "ceph-coordination-volume-perms" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
@@ -99,6 +100,7 @@
scheme: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
path: /
port: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+ initialDelaySeconds: 30
livenessProbe:
httpGet:
scheme: {{ tuple "volume" "service" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_scheme_lookup" | upper }}
diff --git a/charts/cinder/templates/deployment-backup.yaml b/charts/cinder/templates/deployment-backup.yaml
index 47fac40..3657446 100644
--- a/charts/cinder/templates/deployment-backup.yaml
+++ b/charts/cinder/templates/deployment-backup.yaml
@@ -45,6 +45,7 @@
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "cinder_backup" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
{{ dict "envAll" $envAll "podName" "cinder-backup" "containerNames" (list "cinder-backup" "ceph-coordination-volume-perms" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
diff --git a/charts/cinder/templates/deployment-scheduler.yaml b/charts/cinder/templates/deployment-scheduler.yaml
index cf69dd1..03206a8 100644
--- a/charts/cinder/templates/deployment-scheduler.yaml
+++ b/charts/cinder/templates/deployment-scheduler.yaml
@@ -43,6 +43,7 @@
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "cinder_scheduler" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
{{ dict "envAll" $envAll "podName" "cinder-scheduler" "containerNames" (list "cinder-scheduler" "ceph-coordination-volume-perms" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
diff --git a/charts/cinder/templates/deployment-volume.yaml b/charts/cinder/templates/deployment-volume.yaml
index 01aea23..9362553 100644
--- a/charts/cinder/templates/deployment-volume.yaml
+++ b/charts/cinder/templates/deployment-volume.yaml
@@ -45,6 +45,7 @@
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
+{{ tuple "cinder_volume" . | include "helm-toolkit.snippets.custom_pod_annotations" | indent 8 }}
{{ dict "envAll" $envAll "podName" "cinder-volume" "containerNames" (list "cinder-volume" "ceph-coordination-volume-perms" "init-cinder-conf" "init" ) | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
diff --git a/charts/cinder/templates/secret-db.yaml b/charts/cinder/templates/secret-db.yaml
index a5cee90..ce8cfbc 100644
--- a/charts/cinder/templates/secret-db.yaml
+++ b/charts/cinder/templates/secret-db.yaml
@@ -22,6 +22,8 @@
kind: Secret
metadata:
name: {{ $secretName }}
+ annotations:
+{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
type: Opaque
data:
{{- if $envAll.Values.manifests.certificates }}
diff --git a/charts/cinder/templates/secret-external-ceph-keyring.yaml b/charts/cinder/templates/secret-external-ceph-keyring.yaml
index 9cdd4af..d7be686 100644
--- a/charts/cinder/templates/secret-external-ceph-keyring.yaml
+++ b/charts/cinder/templates/secret-external-ceph-keyring.yaml
@@ -13,6 +13,8 @@
kind: Secret
metadata:
name: {{ $secretName }}
+ annotations:
+{{ tuple "rbd" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
type: Opaque
data:
key: {{ $envAll.Values.ceph_client.external_ceph.rbd_user_keyring | b64enc }}
diff --git a/charts/cinder/templates/secret-keystone.yaml b/charts/cinder/templates/secret-keystone.yaml
index 90be568..de355d0 100644
--- a/charts/cinder/templates/secret-keystone.yaml
+++ b/charts/cinder/templates/secret-keystone.yaml
@@ -21,6 +21,8 @@
kind: Secret
metadata:
name: {{ $secretName }}
+ annotations:
+{{ tuple "identity" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
type: Opaque
data:
{{- tuple $userClass "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}}
diff --git a/charts/cinder/templates/secret_rabbitmq.yaml b/charts/cinder/templates/secret-rabbitmq.yaml
similarity index 89%
rename from charts/cinder/templates/secret_rabbitmq.yaml
rename to charts/cinder/templates/secret-rabbitmq.yaml
index 2c4403e..776e019 100644
--- a/charts/cinder/templates/secret_rabbitmq.yaml
+++ b/charts/cinder/templates/secret-rabbitmq.yaml
@@ -25,6 +25,8 @@
kind: Secret
metadata:
name: {{ $secretName }}
+ annotations:
+{{ tuple "oslo_messaging" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
type: Opaque
data:
RABBITMQ_CONNECTION: {{ tuple "oslo_messaging" "internal" $userClass $rabbitmqProtocol $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }}
diff --git a/charts/cinder/values.yaml b/charts/cinder/values.yaml
index 12351a6..6f1d32a 100644
--- a/charts/cinder/values.yaml
+++ b/charts/cinder/values.yaml
@@ -43,22 +43,22 @@
images:
tags:
test: docker.io/xrally/xrally-openstack:2.0.0
- db_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
- cinder_db_sync: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal
- db_drop: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
- rabbit_init: docker.io/rabbitmq:3.7-management
- ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
- ks_service: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
- ks_endpoints: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
- cinder_api: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal
- bootstrap: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
- cinder_scheduler: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal
- cinder_volume: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal
- cinder_volume_usage_audit: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal
- cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal
- cinder_backup: docker.io/openstackhelm/cinder:wallaby-ubuntu_focal
- cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_focal
- dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
+ db_init: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+ cinder_db_sync: docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy
+ db_drop: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+ rabbit_init: docker.io/rabbitmq:3.13-management
+ ks_user: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+ ks_service: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+ ks_endpoints: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+ cinder_api: docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy
+ bootstrap: docker.io/openstackhelm/heat:2024.1-ubuntu_jammy
+ cinder_scheduler: docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy
+ cinder_volume: docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy
+ cinder_volume_usage_audit: docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy
+ cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy
+ cinder_backup: docker.io/openstackhelm/cinder:2024.1-ubuntu_jammy
+ cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy
+ dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent"
local_registry: