diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml index 6a497a35a6..2fc7412d17 100644 --- a/aodh/Chart.yaml +++ b/aodh/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: Openstack-Helm Aodh name: aodh -version: 0.2.9 +version: 0.2.10 home: https://docs.openstack.org/aodh/latest/ sources: - https://opendev.org/openstack/aodh diff --git a/aodh/templates/secret-db.yaml b/aodh/templates/secret-db.yaml index 1478663371..2b88234934 100644 --- a/aodh/templates/secret-db.yaml +++ b/aodh/templates/secret-db.yaml @@ -23,6 +23,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/aodh/templates/secret-keystone.yaml b/aodh/templates/secret-keystone.yaml index 76664be58b..d9a68e6a59 100644 --- a/aodh/templates/secret-keystone.yaml +++ b/aodh/templates/secret-keystone.yaml @@ -23,6 +23,8 @@ apiVersion: v1 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/aodh/templates/secret-rabbitmq.yaml b/aodh/templates/secret-rabbitmq.yaml index 19b6474a48..40cd17ec3d 100644 --- a/aodh/templates/secret-rabbitmq.yaml +++ b/aodh/templates/secret-rabbitmq.yaml @@ -23,6 +23,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/aodh/values_overrides/annotations.yaml b/aodh/values_overrides/annotations.yaml index 0740c87a68..20b6d50c3b 100644 --- a/aodh/values_overrides/annotations.yaml +++ b/aodh/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" aodh_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + aodh: + custom.tld/key: "value" + tls: + alarming_api_public: + custom.tld/key: "value" ... diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml index 66958c6466..feb5fb13e6 100644 --- a/barbican/Chart.yaml +++ b/barbican/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Barbican name: barbican -version: 0.3.10 +version: 0.3.11 home: https://docs.openstack.org/barbican/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png sources: diff --git a/barbican/templates/secret-db.yaml b/barbican/templates/secret-db.yaml index a2ac53b59f..5f68adba50 100644 --- a/barbican/templates/secret-db.yaml +++ b/barbican/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/barbican/templates/secret-keystone.yaml b/barbican/templates/secret-keystone.yaml index 845b476e57..8b360bd076 100644 --- a/barbican/templates/secret-keystone.yaml +++ b/barbican/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/barbican/templates/secret-rabbitmq.yaml b/barbican/templates/secret-rabbitmq.yaml index b66c828cc3..67403abc71 100644 --- a/barbican/templates/secret-rabbitmq.yaml +++ b/barbican/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/barbican/values_overrides/annotations.yaml b/barbican/values_overrides/annotations.yaml index dd5754abf1..332546cff8 100644 --- a/barbican/values_overrides/annotations.yaml +++ b/barbican/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" barbican_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + barbican: + custom.tld/key: "value" + tls: + key_manager_api_public: + custom.tld/key: "value" ... diff --git a/ceilometer/Chart.yaml b/ceilometer/Chart.yaml index 5d3e6e60da..9ed312deaa 100644 --- a/ceilometer/Chart.yaml +++ b/ceilometer/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceilometer name: ceilometer -version: 0.2.9 +version: 0.2.10 home: https://docs.openstack.org/ceilometer/latest/ sources: - https://opendev.org/openstack/ceilometer diff --git a/ceilometer/templates/secret-db.yaml b/ceilometer/templates/secret-db.yaml index 7d0f40c597..43300155fa 100644 --- a/ceilometer/templates/secret-db.yaml +++ b/ceilometer/templates/secret-db.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/ceilometer/templates/secret-keystone.yaml b/ceilometer/templates/secret-keystone.yaml index f4e2f0c7e8..a4ec1d0c32 100644 --- a/ceilometer/templates/secret-keystone.yaml +++ b/ceilometer/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/ceilometer/templates/secret-mongodb.yaml b/ceilometer/templates/secret-mongodb.yaml index 1c3a220122..e7433131f4 100644 --- a/ceilometer/templates/secret-mongodb.yaml +++ b/ceilometer/templates/secret-mongodb.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "mongodb" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "mongodb" "internal" $userClass "mongodb" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/ceilometer/templates/secret-rabbitmq.yaml b/ceilometer/templates/secret-rabbitmq.yaml index e71a8a7f07..5f95d1fa06 100644 --- a/ceilometer/templates/secret-rabbitmq.yaml +++ b/ceilometer/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/ceilometer/values_overrides/annotations.yaml b/ceilometer/values_overrides/annotations.yaml index 588699efac..b4a2a16a09 100644 --- a/ceilometer/values_overrides/annotations.yaml +++ b/ceilometer/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" ceilometer_compute: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + ceilometer: + custom.tld/key: "value" ... diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml index 8056455c9e..67d7486d79 100644 --- a/cinder/Chart.yaml +++ b/cinder/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cinder name: cinder -version: 0.3.20 +version: 0.3.21 home: https://docs.openstack.org/cinder/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png sources: diff --git a/cinder/templates/secret-db.yaml b/cinder/templates/secret-db.yaml index a5cee90b31..ce8cfbc877 100644 --- a/cinder/templates/secret-db.yaml +++ b/cinder/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/cinder/templates/secret-external-ceph-keyring.yaml b/cinder/templates/secret-external-ceph-keyring.yaml index 9cdd4af81c..d7be686cc1 100644 --- a/cinder/templates/secret-external-ceph-keyring.yaml +++ b/cinder/templates/secret-external-ceph-keyring.yaml @@ -13,6 +13,8 @@ apiVersion: v1 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/cinder/templates/secret-keystone.yaml b/cinder/templates/secret-keystone.yaml index 90be5689ac..de355d0dcf 100644 --- a/cinder/templates/secret-keystone.yaml +++ b/cinder/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/cinder/templates/secret-rabbitmq.yaml b/cinder/templates/secret-rabbitmq.yaml index 2c4403e205..776e019358 100644 --- a/cinder/templates/secret-rabbitmq.yaml +++ b/cinder/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/cinder/values_overrides/annotations.yaml b/cinder/values_overrides/annotations.yaml index 13c9aa68cd..aea483e82d 100644 --- a/cinder/values_overrides/annotations.yaml +++ b/cinder/values_overrides/annotations.yaml @@ -6,4 +6,20 @@ annotations: custom.tld/key2: "value2" cinder_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + cinder: + custom.tld/key: "value" + rbd: + volume_external: + custom.tld/key: "value" + tls: + volume_api_public: + custom.tld/key: "value" ... diff --git a/cyborg/Chart.yaml b/cyborg/Chart.yaml index 7f988be863..ed365cfdff 100644 --- a/cyborg/Chart.yaml +++ b/cyborg/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Cyborg name: cyborg -version: 0.1.4 +version: 0.1.5 home: https://docs.openstack.org/cyborg icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cyborg/OpenStack_Project_Cyborg_vertical.png sources: diff --git a/cyborg/templates/secret-db.yaml b/cyborg/templates/secret-db.yaml index 408939e82f..0d0334842b 100644 --- a/cyborg/templates/secret-db.yaml +++ b/cyborg/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/cyborg/templates/secret-keystone.yaml b/cyborg/templates/secret-keystone.yaml index b2e121ebc1..69fdc0147e 100644 --- a/cyborg/templates/secret-keystone.yaml +++ b/cyborg/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/cyborg/templates/secret-rabbitmq.yaml b/cyborg/templates/secret-rabbitmq.yaml index 1ff1e389ac..75229af578 100644 --- a/cyborg/templates/secret-rabbitmq.yaml +++ b/cyborg/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/cyborg/values_overrides/annotations.yaml b/cyborg/values_overrides/annotations.yaml index 351ed7ae03..9632b186ec 100644 --- a/cyborg/values_overrides/annotations.yaml +++ b/cyborg/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" cyborg_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + cyborg: + custom.tld/key: "value" ... diff --git a/designate/Chart.yaml b/designate/Chart.yaml index d5bdd6c2bd..8524c69851 100644 --- a/designate/Chart.yaml +++ b/designate/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Designate name: designate -version: 0.2.11 +version: 0.2.12 home: https://docs.openstack.org/designate/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Designate/OpenStack_Project_Designate_vertical.jpg sources: diff --git a/designate/templates/secret-db.yaml b/designate/templates/secret-db.yaml index c37b96e688..01183ae7c6 100644 --- a/designate/templates/secret-db.yaml +++ b/designate/templates/secret-db.yaml @@ -19,6 +19,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/designate/templates/secret-keystone.yaml b/designate/templates/secret-keystone.yaml index 5c3d956b3e..1ce64867b3 100644 --- a/designate/templates/secret-keystone.yaml +++ b/designate/templates/secret-keystone.yaml @@ -19,6 +19,8 @@ apiVersion: v1 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/designate/templates/secret-rabbitmq.yaml b/designate/templates/secret-rabbitmq.yaml index 01c8362416..faa040a50e 100644 --- a/designate/templates/secret-rabbitmq.yaml +++ b/designate/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/designate/values_overrides/annotations.yaml b/designate/values_overrides/annotations.yaml index 46c5d881d3..e0759bf23e 100644 --- a/designate/values_overrides/annotations.yaml +++ b/designate/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" designate_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + designate: + custom.tld/key: "value" + tls: + dns_api_public: + custom.tld/key: "value" ... diff --git a/glance/Chart.yaml b/glance/Chart.yaml index 6ba0bb66ee..0bf1440787 100644 --- a/glance/Chart.yaml +++ b/glance/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Glance name: glance -version: 0.4.21 +version: 0.4.22 home: https://docs.openstack.org/glance/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png sources: diff --git a/glance/templates/secret-db.yaml b/glance/templates/secret-db.yaml index 0a1085d3c4..f8962ea9b8 100644 --- a/glance/templates/secret-db.yaml +++ b/glance/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/glance/templates/secret-keystone.yaml b/glance/templates/secret-keystone.yaml index fc6cc6a67d..14f63526ed 100644 --- a/glance/templates/secret-keystone.yaml +++ b/glance/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/glance/templates/secret-rabbitmq.yaml b/glance/templates/secret-rabbitmq.yaml index aba76397ac..ae34930ada 100644 --- a/glance/templates/secret-rabbitmq.yaml +++ b/glance/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/glance/values_overrides/annotations.yaml b/glance/values_overrides/annotations.yaml index f7bd672769..9f0864ee9a 100644 --- a/glance/values_overrides/annotations.yaml +++ b/glance/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" glance_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + glance: + custom.tld/key: "value" + tls: + image_api_public: + custom.tld/key: "value" ... diff --git a/heat/Chart.yaml b/heat/Chart.yaml index c7ca592201..4f56689480 100644 --- a/heat/Chart.yaml +++ b/heat/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Heat name: heat -version: 0.3.12 +version: 0.3.13 home: https://docs.openstack.org/heat/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png sources: diff --git a/heat/templates/secret-db.yaml b/heat/templates/secret-db.yaml index ef020d167e..2a89ab8c20 100644 --- a/heat/templates/secret-db.yaml +++ b/heat/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/heat/templates/secret-keystone.yaml b/heat/templates/secret-keystone.yaml index d6758ce1d5..0ad56959db 100644 --- a/heat/templates/secret-keystone.yaml +++ b/heat/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 -}} @@ -30,6 +32,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $envAll.Values.secrets.identity.heat_stack_user }} + annotations: +{{ tuple "identity" "heat_stack_user" $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: OS_AUTH_URL: {{ tuple "identity" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc }} diff --git a/heat/templates/secret-rabbitmq.yaml b/heat/templates/secret-rabbitmq.yaml index ca1ea8c345..7aa123716b 100644 --- a/heat/templates/secret-rabbitmq.yaml +++ b/heat/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/heat/values_overrides/annotations.yaml b/heat/values_overrides/annotations.yaml index 17efeb1de4..7059f05db2 100644 --- a/heat/values_overrides/annotations.yaml +++ b/heat/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" heat_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + heat: + custom.tld/key: "value" + tls: + orchestration_api_public: + custom.tld/key: "value" ... diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml index 54ab762275..a646c1cd4a 100644 --- a/horizon/Chart.yaml +++ b/horizon/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Horizon name: horizon -version: 0.3.19 +version: 0.3.20 home: https://docs.openstack.org/horizon/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png sources: diff --git a/horizon/templates/secret-db.yaml b/horizon/templates/secret-db.yaml index cfc7dac0fc..cd4d310710 100644 --- a/horizon/templates/secret-db.yaml +++ b/horizon/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/horizon/templates/secret-keystone.yaml b/horizon/templates/secret-keystone.yaml index 7286f3fa75..b9ea25a835 100644 --- a/horizon/templates/secret-keystone.yaml +++ b/horizon/templates/secret-keystone.yaml @@ -20,6 +20,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "identity" "admin" $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: {{- tuple "admin" "internal" $envAll | include "helm-toolkit.snippets.keystone_secret_openrc" | indent 2 -}} diff --git a/horizon/values_overrides/annotations.yaml b/horizon/values_overrides/annotations.yaml index 2ef9fbd000..200d05aa26 100644 --- a/horizon/values_overrides/annotations.yaml +++ b/horizon/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" horizon: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + horizon: + custom.tld/key: "value" + tls: + dashboard_dashboard_public: + custom.tld/key: "value" ... diff --git a/ironic/Chart.yaml b/ironic/Chart.yaml index fadfc29dc1..92791a4706 100644 --- a/ironic/Chart.yaml +++ b/ironic/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ironic name: ironic -version: 0.2.12 +version: 0.2.13 home: https://docs.openstack.org/ironic/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Ironic/OpenStack_Project_Ironic_vertical.png sources: diff --git a/ironic/templates/secret-db.yaml b/ironic/templates/secret-db.yaml index ab8fb94845..6d7705e6ce 100644 --- a/ironic/templates/secret-db.yaml +++ b/ironic/templates/secret-db.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/ironic/templates/secret-keystone.yaml b/ironic/templates/secret-keystone.yaml index 6fe73ddc8f..16fa526c77 100644 --- a/ironic/templates/secret-keystone.yaml +++ b/ironic/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/ironic/templates/secret-rabbitmq.yaml b/ironic/templates/secret-rabbitmq.yaml index 42820dba15..c6f1b771b6 100644 --- a/ironic/templates/secret-rabbitmq.yaml +++ b/ironic/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/ironic/values_overrides/annotations.yaml b/ironic/values_overrides/annotations.yaml index 01d8867904..a18d0debba 100644 --- a/ironic/values_overrides/annotations.yaml +++ b/ironic/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" ironic_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + ironic: + custom.tld/key: "value" ... diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index 449d906a33..cb5db9edba 100644 --- a/keystone/Chart.yaml +++ b/keystone/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Keystone name: keystone -version: 0.3.11 +version: 0.3.12 home: https://docs.openstack.org/keystone/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png sources: diff --git a/keystone/templates/secret-db.yaml b/keystone/templates/secret-db.yaml index 55ff593715..3a11383ab7 100644 --- a/keystone/templates/secret-db.yaml +++ b/keystone/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/keystone/templates/secret-keystone.yaml b/keystone/templates/secret-keystone.yaml index 5aa87ab596..093a4b0581 100644 --- a/keystone/templates/secret-keystone.yaml +++ b/keystone/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/keystone/templates/secret-ldap-tls.yaml b/keystone/templates/secret-ldap-tls.yaml index 05ed7249f9..261c3ca53e 100644 --- a/keystone/templates/secret-ldap-tls.yaml +++ b/keystone/templates/secret-ldap-tls.yaml @@ -18,6 +18,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ .Values.secrets.ldap.tls }} + annotations: +{{ tuple "ldap" "tls" . | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: tls.ca: {{ .Values.endpoints.ldap.auth.client.tls.ca | default "" | b64enc }} diff --git a/keystone/templates/secret-rabbitmq.yaml b/keystone/templates/secret-rabbitmq.yaml index fb7c7041a9..fe5cad4b37 100644 --- a/keystone/templates/secret-rabbitmq.yaml +++ b/keystone/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/keystone/values_overrides/annotations.yaml b/keystone/values_overrides/annotations.yaml index 55982b0feb..99da0b3b08 100644 --- a/keystone/values_overrides/annotations.yaml +++ b/keystone/values_overrides/annotations.yaml @@ -12,4 +12,20 @@ annotations: custom.tld/key2: "value2" keystone_credential_setup: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + keystone: + custom.tld/key: "value" + tls: + identity_api_public: + custom.tld/key: "value" + ldap: + tls: + custom.tld/key: "value" ... diff --git a/magnum/Chart.yaml b/magnum/Chart.yaml index f8e13554c1..baf4abc00e 100644 --- a/magnum/Chart.yaml +++ b/magnum/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Magnum name: magnum -version: 0.2.11 +version: 0.2.12 home: https://docs.openstack.org/magnum/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Magnum/OpenStack_Project_Magnum_vertical.png sources: diff --git a/magnum/templates/secret-db.yaml b/magnum/templates/secret-db.yaml index bb8ef381ff..5f1385d28a 100644 --- a/magnum/templates/secret-db.yaml +++ b/magnum/templates/secret-db.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/magnum/templates/secret-keystone.yaml b/magnum/templates/secret-keystone.yaml index 3bbc5e6fa5..22143df7f1 100644 --- a/magnum/templates/secret-keystone.yaml +++ b/magnum/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 -}} @@ -30,6 +32,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $envAll.Values.secrets.identity.magnum_stack_user }} + annotations: +{{ tuple "identity" "magnum_stack_user" $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: OS_AUTH_URL: {{ tuple "identity" "internal" "api" $envAll | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | b64enc }} diff --git a/magnum/templates/secret-rabbitmq.yaml b/magnum/templates/secret-rabbitmq.yaml index 2f267be3ad..38256f61ab 100644 --- a/magnum/templates/secret-rabbitmq.yaml +++ b/magnum/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/magnum/values_overrides/annotations.yaml b/magnum/values_overrides/annotations.yaml index 313524e874..23ac52e94d 100644 --- a/magnum/values_overrides/annotations.yaml +++ b/magnum/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" magnum_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + magnum: + custom.tld/key: "value" ... diff --git a/manila/Chart.yaml b/manila/Chart.yaml index 19f7cdb022..db7e6109f9 100644 --- a/manila/Chart.yaml +++ b/manila/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Manila name: manila -version: 0.1.10 +version: 0.1.11 home: https://docs.openstack.org/manila/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Manila/OpenStack_Project_Manila_vertical.png sources: diff --git a/manila/templates/secret-db.yaml b/manila/templates/secret-db.yaml index 0a9178f2a4..77b4496f6f 100644 --- a/manila/templates/secret-db.yaml +++ b/manila/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/manila/templates/secret-keystone.yaml b/manila/templates/secret-keystone.yaml index 173138785b..b8289a8804 100644 --- a/manila/templates/secret-keystone.yaml +++ b/manila/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/manila/templates/secret-rabbitmq.yaml b/manila/templates/secret-rabbitmq.yaml index 048cf8d8b3..b797d79c3e 100644 --- a/manila/templates/secret-rabbitmq.yaml +++ b/manila/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/manila/values_overrides/annotations.yaml b/manila/values_overrides/annotations.yaml index 35fc52d6ac..6781175ee9 100644 --- a/manila/values_overrides/annotations.yaml +++ b/manila/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" manila_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + manila: + custom.tld/key: "value" + tls: + share_api_public: + custom.tld/key: "value" ... diff --git a/masakari/Chart.yaml b/masakari/Chart.yaml index b3a34be884..0b478163d9 100644 --- a/masakari/Chart.yaml +++ b/masakari/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Masakari name: masakari -version: 0.1.9 +version: 0.1.10 home: https://docs.openstack.org/developer/masakari icon: https://www.openstack.org/themes/openstack/images/project-mascots/Masakari/OpenStack_Project_masakari_vertical.png sources: diff --git a/masakari/templates/secret-db.yaml b/masakari/templates/secret-db.yaml index 0ef238f1d9..a8f66c85f6 100644 --- a/masakari/templates/secret-db.yaml +++ b/masakari/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/masakari/templates/secret-keystone.yaml b/masakari/templates/secret-keystone.yaml index 0307f29e60..a33ad89c89 100644 --- a/masakari/templates/secret-keystone.yaml +++ b/masakari/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/masakari/templates/secret-rabbitmq.yaml b/masakari/templates/secret-rabbitmq.yaml index cef2b0245b..da906348d2 100644 --- a/masakari/templates/secret-rabbitmq.yaml +++ b/masakari/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/masakari/values_overrides/annotations.yaml b/masakari/values_overrides/annotations.yaml index d422aba932..321a3a2c34 100644 --- a/masakari/values_overrides/annotations.yaml +++ b/masakari/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" masakari_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + masakari: + custom.tld/key: "value" ... diff --git a/mistral/Chart.yaml b/mistral/Chart.yaml index bf910a3ec8..50f704073a 100644 --- a/mistral/Chart.yaml +++ b/mistral/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Mistral name: mistral -version: 0.2.8 +version: 0.2.9 home: https://docs.openstack.org/mistral/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Mistral/OpenStack_Project_Mistral_vertical.png sources: diff --git a/mistral/templates/secret-db.yaml b/mistral/templates/secret-db.yaml index 1659aeb720..db14ca8b7f 100644 --- a/mistral/templates/secret-db.yaml +++ b/mistral/templates/secret-db.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/mistral/templates/secret-keystone.yaml b/mistral/templates/secret-keystone.yaml index e3a7a4283f..917920d0a2 100644 --- a/mistral/templates/secret-keystone.yaml +++ b/mistral/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/mistral/templates/secret-rabbitmq.yaml b/mistral/templates/secret-rabbitmq.yaml index 61fddae4b4..23454689a4 100644 --- a/mistral/templates/secret-rabbitmq.yaml +++ b/mistral/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/mistral/values_overrides/annotations.yaml b/mistral/values_overrides/annotations.yaml index 3256d842bb..4811408be7 100644 --- a/mistral/values_overrides/annotations.yaml +++ b/mistral/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" mistral_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + mistral: + custom.tld/key: "value" ... diff --git a/monasca/Chart.yaml b/monasca/Chart.yaml index f1d0362dc0..b788393f53 100644 --- a/monasca/Chart.yaml +++ b/monasca/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Monasca API name: monasca -version: 0.1.2 +version: 0.1.3 home: https://docs.openstack.org/monasca/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Monasca/OpenStack_Project_Monasca_vertical.png sources: diff --git a/monasca/templates/secret-db.yaml b/monasca/templates/secret-db.yaml index fd64b69575..459d22c889 100644 --- a/monasca/templates/secret-db.yaml +++ b/monasca/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/monasca/templates/secret-influxdb-secret.yaml b/monasca/templates/secret-influxdb-secret.yaml index f106f6479c..27bfb8c9bf 100644 --- a/monasca/templates/secret-influxdb-secret.yaml +++ b/monasca/templates/secret-influxdb-secret.yaml @@ -20,6 +20,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "metrics_db" "influxdb" $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: influxdb-admin-user: {{ .Values.endpoints.metrics_db.auth.admin.username | b64enc }} diff --git a/monasca/templates/secret-keystone.yaml b/monasca/templates/secret-keystone.yaml index ccd6d257c5..9e63634dd7 100644 --- a/monasca/templates/secret-keystone.yaml +++ b/monasca/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/monasca/values_overrides/annotations.yaml b/monasca/values_overrides/annotations.yaml index 9f408be62d..fc49ae5fc0 100644 --- a/monasca/values_overrides/annotations.yaml +++ b/monasca/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" monasca_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + tls: + monitoring_api_public: + custom.tld/key: "value" + metrics_db: + influxdb: + custom.tld/key: "value" ... diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml index b1d88659bd..b29aa8702b 100644 --- a/neutron/Chart.yaml +++ b/neutron/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Neutron name: neutron -version: 0.3.40 +version: 0.3.41 home: https://docs.openstack.org/neutron/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png sources: diff --git a/neutron/templates/secret-db.yaml b/neutron/templates/secret-db.yaml index 47d956fa41..59d6d9c5ca 100644 --- a/neutron/templates/secret-db.yaml +++ b/neutron/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/neutron/templates/secret-keystone.yaml b/neutron/templates/secret-keystone.yaml index 3ce68652b1..c285bdd1e7 100644 --- a/neutron/templates/secret-keystone.yaml +++ b/neutron/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/neutron/templates/secret-rabbitmq.yaml b/neutron/templates/secret-rabbitmq.yaml index 16c70e4bdb..fd3e24fbf1 100644 --- a/neutron/templates/secret-rabbitmq.yaml +++ b/neutron/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/neutron/values_overrides/annotations.yaml b/neutron/values_overrides/annotations.yaml index 6ae7246e45..9a6e092cd7 100644 --- a/neutron/values_overrides/annotations.yaml +++ b/neutron/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" neutron_server: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + neutron: + custom.tld/key: "value" + tls: + network_server_public: + custom.tld/key: "value" ... diff --git a/nova/Chart.yaml b/nova/Chart.yaml index bd91d8a5ad..c58f9fda90 100644 --- a/nova/Chart.yaml +++ b/nova/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Nova name: nova -version: 0.3.40 +version: 0.3.41 home: https://docs.openstack.org/nova/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png sources: diff --git a/nova/templates/secret-db-api.yaml b/nova/templates/secret-db-api.yaml index baf75b1e0f..de537031f1 100644 --- a/nova/templates/secret-db-api.yaml +++ b/nova/templates/secret-db-api.yaml @@ -22,6 +22,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db_api" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: {{- if $envAll.Values.manifests.certificates }} diff --git a/nova/templates/secret-db-cell0.yaml b/nova/templates/secret-db-cell0.yaml index 100b57fc80..ac74bf9422 100644 --- a/nova/templates/secret-db-cell0.yaml +++ b/nova/templates/secret-db-cell0.yaml @@ -22,6 +22,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db_cell0" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: {{- if $envAll.Values.manifests.certificates }} diff --git a/nova/templates/secret-db.yaml b/nova/templates/secret-db.yaml index d9cbf8f4bb..885cae199a 100644 --- a/nova/templates/secret-db.yaml +++ b/nova/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 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/nova/templates/secret-keystone.yaml b/nova/templates/secret-keystone.yaml index beddb305c3..2d6560c53e 100644 --- a/nova/templates/secret-keystone.yaml +++ b/nova/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/nova/templates/secret-rabbitmq.yaml b/nova/templates/secret-rabbitmq.yaml index b49f84ea76..32f216902f 100644 --- a/nova/templates/secret-rabbitmq.yaml +++ b/nova/templates/secret-rabbitmq.yaml @@ -25,6 +25,8 @@ apiVersion: v1 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/nova/templates/secret-ssh.yaml b/nova/templates/secret-ssh.yaml index 4811b2e28b..9654c8bec9 100644 --- a/nova/templates/secret-ssh.yaml +++ b/nova/templates/secret-ssh.yaml @@ -20,6 +20,8 @@ apiVersion: v1 kind: Secret metadata: name: nova-ssh + annotations: +{{ tuple "ssh" "keys" . | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: private-key: {{ .Values.network.ssh.private_key | b64enc }} diff --git a/nova/values_overrides/annotations.yaml b/nova/values_overrides/annotations.yaml index 9d0510505f..eec7a2584e 100644 --- a/nova/values_overrides/annotations.yaml +++ b/nova/values_overrides/annotations.yaml @@ -6,4 +6,20 @@ annotations: custom.tld/key2: "value2" nova_api_osapi: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + nova: + custom.tld/key: "value" + tls: + compute_osapi_public: + custom.tld/key: "value" + ssh: + keys: + custom.tld/key: "value" ... diff --git a/octavia/Chart.yaml b/octavia/Chart.yaml index 7c20f644da..ff8f476530 100644 --- a/octavia/Chart.yaml +++ b/octavia/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Octavia name: octavia -version: 0.2.12 +version: 0.2.13 home: https://docs.openstack.org/octavia/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Octavia/OpenStack_Project_Octavia_vertical.png sources: diff --git a/octavia/templates/secret-db.yaml b/octavia/templates/secret-db.yaml index b2c319969e..25c0ef77d9 100644 --- a/octavia/templates/secret-db.yaml +++ b/octavia/templates/secret-db.yaml @@ -23,6 +23,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/octavia/templates/secret-keystone.yaml b/octavia/templates/secret-keystone.yaml index f2883e0375..e059c51ef4 100644 --- a/octavia/templates/secret-keystone.yaml +++ b/octavia/templates/secret-keystone.yaml @@ -23,6 +23,8 @@ apiVersion: v1 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/octavia/templates/secret-rabbitmq.yaml b/octavia/templates/secret-rabbitmq.yaml index 4ebd44d624..766f1dcc1b 100644 --- a/octavia/templates/secret-rabbitmq.yaml +++ b/octavia/templates/secret-rabbitmq.yaml @@ -23,6 +23,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/octavia/values_overrides/annotations.yaml b/octavia/values_overrides/annotations.yaml index 8cd37d633f..47762affb1 100644 --- a/octavia/values_overrides/annotations.yaml +++ b/octavia/values_overrides/annotations.yaml @@ -6,4 +6,17 @@ annotations: custom.tld/key2: "value2" octavia_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + octavia: + custom.tld/key: "value" + tls: + load_balancer_api_public: + custom.tld/key: "value" ... diff --git a/placement/Chart.yaml b/placement/Chart.yaml index e892f3791c..c7e40b53df 100644 --- a/placement/Chart.yaml +++ b/placement/Chart.yaml @@ -16,7 +16,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Placement name: placement -version: 0.3.12 +version: 0.3.13 home: https://docs.openstack.org/placement/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png sources: diff --git a/placement/templates/secret-db.yaml b/placement/templates/secret-db.yaml index 91beb970ae..0e9214c457 100644 --- a/placement/templates/secret-db.yaml +++ b/placement/templates/secret-db.yaml @@ -24,6 +24,8 @@ apiVersion: v1 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/placement/templates/secret-keystone.yaml b/placement/templates/secret-keystone.yaml index ce24aa2da1..53a51f1060 100644 --- a/placement/templates/secret-keystone.yaml +++ b/placement/templates/secret-keystone.yaml @@ -23,6 +23,8 @@ apiVersion: v1 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/placement/values_overrides/annotations.yaml b/placement/values_overrides/annotations.yaml index 46c5d881d3..ab8cae8da7 100644 --- a/placement/values_overrides/annotations.yaml +++ b/placement/values_overrides/annotations.yaml @@ -4,6 +4,19 @@ annotations: default: custom.tld/key: "value" custom.tld/key2: "value2" - designate_api: + placement: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + placement: + custom.tld/key: "value" + tls: + placement_api_public: + custom.tld/key: "value" ... diff --git a/rally/Chart.yaml b/rally/Chart.yaml index 778b33d34a..990b5bc01d 100644 --- a/rally/Chart.yaml +++ b/rally/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm rally name: rally -version: 0.2.8 +version: 0.2.9 home: https://docs.openstack.org/developer/rally icon: https://www.openstack.org/themes/openstack/images/project-mascots/rally/OpenStack_Project_rally_vertical.png sources: diff --git a/rally/templates/secret-db.yaml b/rally/templates/secret-db.yaml index d6f44580a2..aff33e5c8c 100644 --- a/rally/templates/secret-db.yaml +++ b/rally/templates/secret-db.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/rally/templates/secret-keystone.yaml b/rally/templates/secret-keystone.yaml index a8f1b65e77..7984fd0f39 100644 --- a/rally/templates/secret-keystone.yaml +++ b/rally/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/rally/values_overrides/annotations.yaml b/rally/values_overrides/annotations.yaml new file mode 100644 index 0000000000..f44fe26f02 --- /dev/null +++ b/rally/values_overrides/annotations.yaml @@ -0,0 +1,13 @@ +--- +annotations: + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + rally: + custom.tld/key: "value" +... diff --git a/releasenotes/notes/aodh.yaml b/releasenotes/notes/aodh.yaml index ac93f539d8..1c0d905935 100644 --- a/releasenotes/notes/aodh.yaml +++ b/releasenotes/notes/aodh.yaml @@ -12,4 +12,5 @@ aodh: - 0.2.7 Replace node-role.kubernetes.io/master with control-plane - 0.2.8 Define service_type in keystone_authtoken to support application credentials with access rules - 0.2.9 Enable custom annotations for Openstack pods + - 0.2.10 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml index 2b26999827..83ca5f31ea 100644 --- a/releasenotes/notes/barbican.yaml +++ b/releasenotes/notes/barbican.yaml @@ -34,4 +34,5 @@ barbican: - 0.3.8 Make barbican TLS configuration granular - 0.3.9 Enable custom annotations for Openstack pods - 0.3.10 Add 2024.1 overrides + - 0.3.11 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/ceilometer.yaml b/releasenotes/notes/ceilometer.yaml index a09117e516..516534a1ed 100644 --- a/releasenotes/notes/ceilometer.yaml +++ b/releasenotes/notes/ceilometer.yaml @@ -12,4 +12,5 @@ ceilometer: - 0.2.7 Remove default policy rules - 0.2.8 Replace node-role.kubernetes.io/master with control-plane - 0.2.9 Enable custom annotations for Openstack pods + - 0.2.10 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml index 249889a1bc..71d1570cc7 100644 --- a/releasenotes/notes/cinder.yaml +++ b/releasenotes/notes/cinder.yaml @@ -70,4 +70,5 @@ cinder: - 0.3.18 Enable custom annotations for Openstack pods - 0.3.19 Add 2024.1 overrides - 0.3.20 Add readiness probe initial delay + - 0.3.21 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/cyborg.yaml b/releasenotes/notes/cyborg.yaml index e556c94884..9c41a051ae 100644 --- a/releasenotes/notes/cyborg.yaml +++ b/releasenotes/notes/cyborg.yaml @@ -5,4 +5,5 @@ cyborg: - 0.1.2 Added OCI registry authentication - 0.1.3 Define service_type in keystone_authtoken to support application credentials with access rules - 0.1.4 Enable custom annotations for Openstack pods + - 0.1.5 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/designate.yaml b/releasenotes/notes/designate.yaml index 09ff1dbf51..b497f16d8a 100644 --- a/releasenotes/notes/designate.yaml +++ b/releasenotes/notes/designate.yaml @@ -15,4 +15,5 @@ designate: - 0.2.9 Define service_type in keystone_authtoken to support application credentials with access rules - 0.2.10 Uses uWSGI for API service - 0.2.11 Enable custom annotations for Openstack pods + - 0.2.12 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml index 3a36199b7e..1610ab7278 100644 --- a/releasenotes/notes/glance.yaml +++ b/releasenotes/notes/glance.yaml @@ -55,4 +55,5 @@ glance: - 0.4.19 Add 2024.1 overrides - 0.4.20 Add readiness probe initial delay - 0.4.21 Use uWSGI + - 0.4.22 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml index 4d3a78e6ba..b5f24ce966 100644 --- a/releasenotes/notes/heat.yaml +++ b/releasenotes/notes/heat.yaml @@ -38,4 +38,5 @@ heat: - 0.3.10 Enable custom annotations for Openstack pods - 0.3.11 Add 2024.1 overrides - 0.3.12 Add readiness probe initial delay + - 0.3.13 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/horizon.yaml b/releasenotes/notes/horizon.yaml index 0bf99d680b..6d4c8cdf7d 100644 --- a/releasenotes/notes/horizon.yaml +++ b/releasenotes/notes/horizon.yaml @@ -56,4 +56,5 @@ horizon: - 0.3.17 Set ingress annotation proxy-body-size=300m by default - 0.3.18 Enable custom annotations for Openstack pods - 0.3.19 Add 2024.1 overrides + - 0.3.20 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/ironic.yaml b/releasenotes/notes/ironic.yaml index 1974750ff4..2a1c665a9a 100644 --- a/releasenotes/notes/ironic.yaml +++ b/releasenotes/notes/ironic.yaml @@ -16,4 +16,5 @@ ironic: - 0.2.10 Add standalone overrides - 0.2.11 Enable custom annotations for Openstack pods - 0.2.12 allow custom annotations on jobs + - 0.2.13 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml index d5ec5aee68..0a11972048 100644 --- a/releasenotes/notes/keystone.yaml +++ b/releasenotes/notes/keystone.yaml @@ -58,4 +58,5 @@ keystone: - 0.3.9 Add 2024.1 overrides - 0.3.10 Allow custom annotations on jobs - 0.3.11 Fix custom annotations when helm3_hook is disabled + - 0.3.12 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/magnum.yaml b/releasenotes/notes/magnum.yaml index 93606fc1e7..afd66e2e1b 100644 --- a/releasenotes/notes/magnum.yaml +++ b/releasenotes/notes/magnum.yaml @@ -15,4 +15,5 @@ magnum: - 0.2.9 Define service_type in keystone_authtoken to support application credentials with access rules - 0.2.10 Uses uWSGI for API service - 0.2.11 Enable custom annotations for Openstack pods + - 0.2.12 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/manila.yaml b/releasenotes/notes/manila.yaml index bb7e9f522f..ddc015ce7c 100644 --- a/releasenotes/notes/manila.yaml +++ b/releasenotes/notes/manila.yaml @@ -11,4 +11,5 @@ manila: - 0.1.8 uses uWSGI for API service - 0.1.9 Enable custom annotations for Openstack pods - 0.1.10 Add 2024.1 overrides + - 0.1.11 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/masakari.yaml b/releasenotes/notes/masakari.yaml index f4f609bb6d..4d18f08593 100644 --- a/releasenotes/notes/masakari.yaml +++ b/releasenotes/notes/masakari.yaml @@ -10,4 +10,5 @@ masakari: - 0.1.7 Define service_type in keystone_authtoken to support application credentials with access rules - 0.1.8 Add helm hook to jobs-rabbitmq-init - 0.1.9 Enable custom annotations for Openstack pods + - 0.1.10 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/mistral.yaml b/releasenotes/notes/mistral.yaml index e55bb46a60..8534978ad0 100644 --- a/releasenotes/notes/mistral.yaml +++ b/releasenotes/notes/mistral.yaml @@ -12,4 +12,5 @@ mistral: - 0.2.6 Use HTTP probe instead of TCP probe - 0.2.7 Remove default policy rules - 0.2.8 Enable custom annotations for Openstack pods + - 0.2.9 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/monasca.yaml b/releasenotes/notes/monasca.yaml index c3af17ef08..99f19a1c8f 100644 --- a/releasenotes/notes/monasca.yaml +++ b/releasenotes/notes/monasca.yaml @@ -3,4 +3,5 @@ monasca: - 0.1.0 Initial Chart - 0.1.1 Update osh-selenium image used by default - 0.1.2 Enable custom annotations for Openstack pods + - 0.1.3 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml index dace2683c8..08a69cd33d 100644 --- a/releasenotes/notes/neutron.yaml +++ b/releasenotes/notes/neutron.yaml @@ -82,4 +82,5 @@ neutron: - 0.3.38 Add 2024.1 overrides - 0.3.39 Ensure that the script handles cases where the PID file exists but is empty or does not contain the expected data structure. - 0.3.40 Fix ovs bridge creation in mappings for DPDK + - 0.3.41 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml index ebc58ac3d9..7e3a134110 100644 --- a/releasenotes/notes/nova.yaml +++ b/releasenotes/notes/nova.yaml @@ -109,4 +109,5 @@ nova: - 0.3.38 Using uWSGI - 0.3.39 Enable custom annotations for Openstack pods - 0.3.40 Add 2024.1 overrides + - 0.3.41 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/octavia.yaml b/releasenotes/notes/octavia.yaml index c3c3abd3cd..088e24067f 100644 --- a/releasenotes/notes/octavia.yaml +++ b/releasenotes/notes/octavia.yaml @@ -16,4 +16,5 @@ octavia: - 0.2.10 Fix generating health_manager Role and RoleBinding - 0.2.11 Uses uWSGI for API service - 0.2.12 Enable custom annotations for Openstack pods + - 0.2.13 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml index 03f720ad55..3cbcbc02e3 100644 --- a/releasenotes/notes/placement.yaml +++ b/releasenotes/notes/placement.yaml @@ -35,4 +35,5 @@ placement: - 0.3.10 Add log_dir option for placement - 0.3.11 Enable custom annotations for Openstack pods - 0.3.12 Add 2024.1 overrides + - 0.3.13 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/rally.yaml b/releasenotes/notes/rally.yaml index 0b8087c0aa..f4df8bfaa0 100644 --- a/releasenotes/notes/rally.yaml +++ b/releasenotes/notes/rally.yaml @@ -11,4 +11,5 @@ rally: - 0.2.6 Added OCI registry authentication - 0.2.7 Support TLS for identity endpoint - 0.2.8 Bump Cirros version to 0.6.2 + - 0.2.9 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/senlin.yaml b/releasenotes/notes/senlin.yaml index d9930545c9..474a37f9cc 100644 --- a/releasenotes/notes/senlin.yaml +++ b/releasenotes/notes/senlin.yaml @@ -14,4 +14,5 @@ senlin: - 0.2.9 Define service_type in keystone_authtoken to support application credentials with access rules - 0.2.10 Uses uWSGI for API - 0.2.11 Enable custom annotations for Openstack pods + - 0.2.12 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/tacker.yaml b/releasenotes/notes/tacker.yaml index aaec9ebc6d..90f17003fc 100644 --- a/releasenotes/notes/tacker.yaml +++ b/releasenotes/notes/tacker.yaml @@ -4,4 +4,5 @@ tacker: - 0.1.1 Add Ubuntu Jammy overrides - 0.1.2 Add 2023.2 Ubuntu Jammy overrides - 0.1.3 Add 2024.1 overrides + - 0.1.4 Enable custom annotations for Openstack secrets ... diff --git a/releasenotes/notes/tempest.yaml b/releasenotes/notes/tempest.yaml index 82f4418ddd..54cc01cbdd 100644 --- a/releasenotes/notes/tempest.yaml +++ b/releasenotes/notes/tempest.yaml @@ -11,4 +11,5 @@ tempest: - 0.2.6 Support SSL openstack endpoints - 0.2.7 Add configuration for heat-tempest-plugin - 0.2.8 Bump Cirros version to 0.6.2 + - 0.2.9 Enable custom annotations for Openstack secrets ... diff --git a/senlin/Chart.yaml b/senlin/Chart.yaml index 714e838ad6..62724a359c 100644 --- a/senlin/Chart.yaml +++ b/senlin/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Senlin name: senlin -version: 0.2.11 +version: 0.2.12 home: https://docs.openstack.org/senlin/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Senlin/OpenStack_Project_Senlin_vertical.png sources: diff --git a/senlin/templates/secret-db.yaml b/senlin/templates/secret-db.yaml index 0e3e472e41..6f148fc6d0 100644 --- a/senlin/templates/secret-db.yaml +++ b/senlin/templates/secret-db.yaml @@ -21,6 +21,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ tuple "oslo_db" "internal" $userClass "mysql" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc -}} diff --git a/senlin/templates/secret-keystone.yaml b/senlin/templates/secret-keystone.yaml index 4a553eab90..f759643d12 100644 --- a/senlin/templates/secret-keystone.yaml +++ b/senlin/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/senlin/templates/secret-rabbitmq.yaml b/senlin/templates/secret-rabbitmq.yaml index a7390c6a44..9839c43f37 100644 --- a/senlin/templates/secret-rabbitmq.yaml +++ b/senlin/templates/secret-rabbitmq.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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 "http" $envAll | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | b64enc }} diff --git a/senlin/values_overrides/annotations.yaml b/senlin/values_overrides/annotations.yaml index 553e34bb08..22a40ae422 100644 --- a/senlin/values_overrides/annotations.yaml +++ b/senlin/values_overrides/annotations.yaml @@ -6,4 +6,14 @@ annotations: custom.tld/key2: "value2" senlin_api: another.tld/foo: "bar" + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + senlin: + custom.tld/key: "value" ... diff --git a/tacker/Chart.yaml b/tacker/Chart.yaml index 9032643dee..dcf6b2aacb 100644 --- a/tacker/Chart.yaml +++ b/tacker/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Tacker name: tacker -version: 0.1.3 +version: 0.1.4 home: https://docs.openstack.org/tacker/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Tacker/OpenStack_Project_Tacker_vertical.png sources: diff --git a/tacker/templates/secret-db.yaml b/tacker/templates/secret-db.yaml index 1fcb7b88ea..4488026c48 100644 --- a/tacker/templates/secret-db.yaml +++ b/tacker/templates/secret-db.yaml @@ -22,6 +22,8 @@ apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} + annotations: +{{ tuple "oslo_db" $userClass $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }} type: Opaque data: DB_CONNECTION: {{ $connection | b64enc -}} diff --git a/tacker/templates/secret-keystone.yaml b/tacker/templates/secret-keystone.yaml index 642ccdcdc1..ec4c28658d 100644 --- a/tacker/templates/secret-keystone.yaml +++ b/tacker/templates/secret-keystone.yaml @@ -20,6 +20,8 @@ apiVersion: v1 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/tacker/templates/secret-rabbitmq.yaml b/tacker/templates/secret-rabbitmq.yaml index 1d4c304192..0d5bbd448a 100644 --- a/tacker/templates/secret-rabbitmq.yaml +++ b/tacker/templates/secret-rabbitmq.yaml @@ -24,6 +24,8 @@ apiVersion: v1 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/tacker/values_overrides/annotations.yaml b/tacker/values_overrides/annotations.yaml new file mode 100644 index 0000000000..2c6daa7403 --- /dev/null +++ b/tacker/values_overrides/annotations.yaml @@ -0,0 +1,16 @@ +--- +annotations: + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + tacker: + custom.tld/key: "value" + tls: + nfv_orchestration_api_public: + custom.tld/key: "value" +... diff --git a/tempest/Chart.yaml b/tempest/Chart.yaml index 315c28384a..6a6f90871e 100644 --- a/tempest/Chart.yaml +++ b/tempest/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Tempest name: tempest -version: 0.2.8 +version: 0.2.9 home: https://docs.openstack.org/tempest/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/tempest/OpenStack_Project_tempest_vertical.png sources: diff --git a/tempest/templates/secret-keystone.yaml b/tempest/templates/secret-keystone.yaml index 2743aa5705..4151a5164e 100644 --- a/tempest/templates/secret-keystone.yaml +++ b/tempest/templates/secret-keystone.yaml @@ -21,6 +21,8 @@ apiVersion: v1 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/tempest/values_overrides/annotations.yaml b/tempest/values_overrides/annotations.yaml new file mode 100644 index 0000000000..50ae5118de --- /dev/null +++ b/tempest/values_overrides/annotations.yaml @@ -0,0 +1,13 @@ +--- +annotations: + secret: + default: + custom.tld/key: "value" + custom.tld/key2: "value2" + identity: + admin: + another.tld/foo: "bar" + oci_image_registry: + tempest: + custom.tld/key: "value" +...