openstack/openstack-helm-infra
Code Issues Proposed changes

Updated chart naming for subchart compatibility

Browse Source 
CHG: - reno-check script to ignore subchart
     - .Release.Name to match .Chart.Name instead:
       - mariadb
       - rabbitmq
       - memcached

Change-Id: Ieaecd5537c2843357b2787f6f59405b672ce8b8a
This commit is contained in:
Graham Steffaniak 2022-03-17 14:11:51 -05:00
parent 0d5b16cabb
commit 8e3c97714b
31 changed files with 55 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helm-toolkit/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Helm-Toolkit
name: helm-toolkit
version: 0.2.36
version: 0.2.37
home: https://docs.openstack.org/openstack-helm
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
sources:

2
helm-toolkit/templates/snippets/_kubernetes_apparmor_configmap.tpl
View File

@ -49,7 +49,7 @@ data:
{{- if eq $envAll.Values.pod.mandatory_access_control.type "apparmor" -}}
{{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
{{- if $envAll.Values.pod.mandatory_access_control.configmap_apparmor }}
{{- $mapName := printf "%s-%s-%s" $envAll.Release.Name $component "apparmor" -}}
{{- $mapName := printf "%s-%s-%s" $envAll.Chart.Name $component "apparmor" -}}
{{- if $envAll.Values.conf.apparmor_profiles }}
---
apiVersion: v1

2
helm-toolkit/templates/snippets/_kubernetes_apparmor_volumes.tpl
View File

@ -42,7 +42,7 @@ return: |
{{- $envAll := index . "envAll" -}}
{{- $component := index . "component" -}}
{{- $requireSys := index . "requireSys" | default false -}}
{{- $configName := printf "%s-%s-%s" $envAll.Release.Name $component "apparmor" -}}
{{- $configName := printf "%s-%s-%s" $envAll.Chart.Name $component "apparmor" -}}
{{- if hasKey $envAll.Values.pod "mandatory_access_control" -}}
{{- if hasKey $envAll.Values.pod.mandatory_access_control "type" -}}
{{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}

2
helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
View File

@ -37,7 +37,7 @@ return: |
{{- $envAll := index . 0 -}}
{{- $application := index . 1 -}}
{{- $component := index . 2 -}}
release_group: {{ $envAll.Values.release_group | default $envAll.Release.Name }}
release_group: {{ $envAll.Values.release_group | default $envAll.Chart.Name }}
application: {{ $application }}
component: {{ $component }}
{{- if ($envAll.Values.pod).labels }}

2
helm-toolkit/templates/snippets/_kubernetes_pod_anti_affinity.tpl
View File

@ -53,7 +53,7 @@ return: |
{{- $envAll := index . "envAll" -}}
{{- $application := index . "application" -}}
{{- $component := index . "component" -}}
{{- $expressionRelease := dict "key" "release_group" "operator" "In" "values" ( list ( $envAll.Values.release_group | default $envAll.Release.Name ) ) -}}
{{- $expressionRelease := dict "key" "release_group" "operator" "In" "values" ( list ( $envAll.Values.release_group | default $envAll.Chart.Name ) ) -}}
{{- $expressionApplication := dict "key" "application" "operator" "In" "values" ( list $application ) -}}
{{- $expressionComponent := dict "key" "component" "operator" "In" "values" ( list $component ) -}}
{{- list $expressionRelease $expressionApplication $expressionComponent | toYaml }}

2
helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl
View File

@ -17,7 +17,7 @@ limitations under the License.
{{- $deps := index . 1 -}}
{{- $saName := index . 2 | replace "_" "-" }}
{{- $saNamespace := index . 3 -}}
{{- $releaseName := $envAll.Release.Name }}
{{- $releaseName := $envAll.Chart.Name }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding

2
helm-toolkit/templates/snippets/_values_template_renderer.tpl
View File

@ -28,7 +28,7 @@ values: |
{{ include "helm-toolkit.utils.joinListWithComma" .Values.conf.inputs }}
config_to_complete:
#here we can fill out params, but things need to be valid yaml as input
'{{ .Release.Name }}': '{{ printf "%s-%s" .Release.Namespace "namespace" }}'
'{{ .Chart.Name }}': '{{ printf "%s-%s" .Release.Namespace "namespace" }}'
static_config:
#this is just passed though as yaml to the configmap
foo: bar

2
helm-toolkit/templates/utils/_to_k8s_env_secret_vars.tpl
View File

@ -40,7 +40,7 @@ return: |
- name: {{ $key }}
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" $context.Release.Name "env-secret" | quote }}
name: {{ printf "%s-%s" $context.Chart.Name "env-secret" | quote }}
key: {{ $key }}
{{ end -}}
{{- end -}}

2
mariadb/Chart.yaml
View File

@ -15,7 +15,7 @@ apiVersion: v1
appVersion: v10.2.31
description: OpenStack-Helm MariaDB
name: mariadb
version: 0.2.14
version: 0.2.15
home: https://mariadb.com/kb/en/
icon: http://badges.mariadb.org/mariadb-badge-180x60.png
sources:

8
mariadb/templates/deployment-ingress.yaml
View File

@ -15,9 +15,9 @@ limitations under the License.
{{- if .Values.manifests.deployment_ingress }}
{{- $envAll := . }}
{{- $ingressClass := printf "%s-%s" .Release.Name "mariadb-ingress" }}
{{- $ingressClass := printf "%s-%s" .Chart.Name "mariadb-ingress" }}
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ingress" }}
{{- $serviceAccountName := printf "%s-%s" .Chart.Name "ingress" }}
{{ tuple $envAll "ingress" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: rbac.authorization.k8s.io/v1
@ -156,7 +156,7 @@ rules:
- apiGroups:
- ""
resourceNames:
- {{ printf "%s-%s" .Release.Name $ingressClass | quote }}
- {{ printf "%s-%s" .Chart.Name $ingressClass | quote }}
resources:
- configmaps
verbs:
@ -264,7 +264,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: RELEASE_NAME
value: {{ .Release.Name | quote }}
value: {{ .Chart.Name | quote }}
- name: INGRESS_CLASS
value: {{ $ingressClass | quote }}
- name: ERROR_PAGE_SERVICE

4
mariadb/templates/pod-test.yaml
View File

@ -16,13 +16,13 @@ limitations under the License.
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.static.tests }}
{{- $serviceAccountName := print .Release.Name "-test" }}
{{- $serviceAccountName := print .Chart.Name "-test" }}
{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: v1
kind: Pod
metadata:
name: "{{.Release.Name}}-test"
name: "{{.Chart.Name}}-test"
labels:
{{ tuple $envAll "mariadb" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:

6
mariadb/templates/statefulset.yaml
View File

@ -22,7 +22,7 @@ exec:
{{- if .Values.manifests.statefulset }}
{{- $envAll := . }}
{{- $serviceAccountName := printf "%s-%s" .Release.Name "mariadb" }}
{{- $serviceAccountName := printf "%s-%s" .Chart.Name "mariadb" }}
{{ tuple $envAll "mariadb" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: rbac.authorization.k8s.io/v1
@ -40,7 +40,7 @@ rules:
- apiGroups:
- ""
resourceNames:
- {{ printf "%s-%s" .Release.Name "mariadb-state" | quote }}
- {{ printf "%s-%s" .Chart.Name "mariadb-state" | quote }}
resources:
- configmaps
verbs:
@ -151,7 +151,7 @@ spec:
- name: WSREP_PORT
value: {{ tuple "oslo_db" "direct" "wsrep" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
- name: STATE_CONFIGMAP
value: {{ printf "%s-%s" .Release.Name "mariadb-state" | quote }}
value: {{ printf "%s-%s" .Chart.Name "mariadb-state" | quote }}
- name: MYSQL_DBADMIN_USERNAME
value: {{ .Values.endpoints.oslo_db.auth.admin.username }}
- name: MYSQL_DBADMIN_PASSWORD

2
memcached/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v1.5.5
description: OpenStack-Helm Memcached
name: memcached
version: 0.1.6
version: 0.1.7
home: https://github.com/memcached/memcached
...

2
memcached/templates/configmap-bin.yaml
View File

@ -14,7 +14,7 @@ limitations under the License.
{{- if .Values.manifests.configmap_bin }}
{{- $envAll := . }}
{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }}
{{- $configMapBinName := printf "%s-%s" $envAll.Chart.Name "memcached-bin" }}
---
apiVersion: v1
kind: ConfigMap

4
memcached/templates/deployment.yaml
View File

@ -15,8 +15,8 @@ limitations under the License.
{{- if .Values.manifests.deployment }}
{{- $envAll := . }}
{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "memcached" }}
{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }}
{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "memcached" }}
{{- $configMapBinName := printf "%s-%s" $envAll.Chart.Name "memcached-bin" }}
{{ tuple $envAll "memcached" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---

2
rabbitmq/Chart.yaml
View File

@ -15,6 +15,6 @@ apiVersion: v1
appVersion: v3.7.26
description: OpenStack-Helm RabbitMQ
name: rabbitmq
version: 0.1.16
version: 0.1.17
home: https://github.com/rabbitmq/rabbitmq-server
...

2
rabbitmq/templates/configmap-bin.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
name: {{ printf "%s-%s" .Chart.Name "rabbitmq-bin" | quote }}
data:
{{- if .Values.images.local_registry.active }}
image-repo-sync.sh: |

2
rabbitmq/templates/configmap-etc.yaml
View File

@ -49,7 +49,7 @@ limitations under the License.
apiVersion: v1
kind: ConfigMap
metadata:
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-etc" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-etc" | quote }}
data:
enabled_plugins: |
{{ tuple "etc/_enabled_plugins.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}

2
rabbitmq/templates/ingress-management.yaml
View File

@ -15,7 +15,7 @@ limitations under the License.
{{- if and .Values.manifests.ingress_management .Values.network.management.ingress.public }}
{{- $envAll := . }}
{{- if empty $envAll.Values.endpoints.oslo_messaging.hosts.public }}
{{- $service_public_name := .Release.Name | trunc 12 }}
{{- $service_public_name := .Chart.Name | trunc 12 }}
{{- $_ := set $envAll.Values.endpoints.oslo_messaging.hosts "public" ( printf "%s-%s-%s" $service_public_name "mgr" ( $service_public_name | sha256sum | trunc 6 )) }}
{{- end }}
{{- $ingressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}

8
rabbitmq/templates/job-cluster-wait.yaml
View File

@ -15,7 +15,7 @@ limitations under the License.
{{- if .Values.manifests.job_cluster_wait }}
{{- $envAll := . }}
{{- $serviceAccountName := print .Release.Name "-cluster-wait" }}
{{- $serviceAccountName := print .Chart.Name "-cluster-wait" }}
{{ tuple $envAll "cluster_wait" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $protocol := "http" }}
@ -26,7 +26,7 @@ limitations under the License.
apiVersion: batch/v1
kind: Job
metadata:
name: "{{.Release.Name}}-cluster-wait"
name: "{{.Chart.Name}}-cluster-wait"
labels:
{{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
@ -100,11 +100,11 @@ spec:
emptyDir: {}
- name: rabbitmq-bin
configMap:
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
defaultMode: 0555
- name: rabbitmq-erlang-cookie
secret:
secretName: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
secretName: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
defaultMode: 0444
{{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{- end }}

6
rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml
View File

@ -22,7 +22,7 @@ httpGet:
{{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
{{- $envAll := . }}
{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq-exporter" }}
{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "rabbitmq-exporter" }}
{{ tuple $envAll "prometheus_rabbitmq_exporter" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $protocol := "http" }}
@ -77,12 +77,12 @@ spec:
- name: RABBIT_USER
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
key: RABBITMQ_ADMIN_USERNAME
- name: RABBIT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
key: RABBITMQ_ADMIN_PASSWORD
- name: RABBIT_CAPABILITIES
value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}

8
rabbitmq/templates/pod-test.yaml
View File

@ -17,11 +17,11 @@ limitations under the License.
{{ if kindIs "string" $envAll.Values.dependencies.static.tests.jobs }}
{{ if eq $envAll.Values.dependencies.static.tests.jobs "cluster_wait" }}
{{ $_ := set $envAll.Values.dependencies.static.tests "jobs" ( list ( print $envAll.Release.Name "-cluster-wait" ) ) }}
{{ $_ := set $envAll.Values.dependencies.static.tests "jobs" ( list ( print $envAll.Chart.Name "-cluster-wait" ) ) }}
{{ end }}
{{ end }}
{{- $serviceAccountName := print .Release.Name "-test" }}
{{- $serviceAccountName := print .Chart.Name "-test" }}
{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $protocol := "http" }}
@ -32,7 +32,7 @@ limitations under the License.
apiVersion: v1
kind: Pod
metadata:
name: "{{.Release.Name}}-test"
name: "{{.Chart.Name}}-test"
labels:
{{ tuple $envAll "rabbitmq" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations:
@ -71,7 +71,7 @@ spec:
emptyDir: {}
- name: rabbitmq-bin
configMap:
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
defaultMode: 0555
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
{{- end }}

2
rabbitmq/templates/secret-erlang-cookie.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
apiVersion: v1
kind: Secret
metadata:
name: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
type: Opaque
data:
erlang_cookie: {{ $envAll.Values.endpoints.oslo_messaging.auth.erlang_cookie | b64enc -}}

2
rabbitmq/templates/secret-rabbit-admin.yaml
View File

@ -18,7 +18,7 @@ limitations under the License.
apiVersion: v1
kind: Secret
metadata:
name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
type: Opaque
data:
RABBITMQ_ADMIN_USERNAME: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.username | b64enc }}

2
rabbitmq/templates/service-ingress-management.yaml
View File

@ -15,7 +15,7 @@ limitations under the License.
{{- if and .Values.manifests.service_ingress_management .Values.network.management.ingress.public }}
{{- $envAll := . }}
{{- if empty $envAll.Values.endpoints.oslo_messaging.hosts.public }}
{{- $service_public_name := .Release.Name | trunc 12 }}
{{- $service_public_name := .Chart.Name | trunc 12 }}
{{- $_ := set $envAll.Values.endpoints.oslo_messaging.hosts "public" ( printf "%s-%s-%s" $service_public_name "mgr" ( $service_public_name | sha256sum | trunc 6 )) }}
{{- end }}
{{- $serviceIngressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}

12
rabbitmq/templates/statefulset.yaml
View File

@ -32,7 +32,7 @@ limitations under the License.
{{- if .Values.manifests.statefulset }}
{{- $envAll := . }}
{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "rabbitmq" }}
{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "rabbitmq" }}
{{ tuple $envAll "rabbitmq" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $protocol := "http" }}
@ -117,12 +117,12 @@ spec:
- name: RABBITMQ_ADMIN_USERNAME
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
key: RABBITMQ_ADMIN_USERNAME
- name: RABBITMQ_ADMIN_PASSWORD
valueFrom:
secretKeyRef:
name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
key: RABBITMQ_ADMIN_PASSWORD
- name: RABBITMQ_DEFINITION_FILE
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
@ -275,15 +275,15 @@ spec:
emptyDir: {}
- name: rabbitmq-bin
configMap:
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
defaultMode: 0555
- name: rabbitmq-etc
configMap:
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-etc" | quote }}
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-etc" | quote }}
defaultMode: 0444
- name: rabbitmq-erlang-cookie
secret:
secretName: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
secretName: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
defaultMode: 0444
{{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
{{- if not $envAll.Values.volume.enabled }}

1
releasenotes/notes/helm-toolkit.yaml
View File

@ -43,4 +43,5 @@ helm-toolkit:
- 0.2.34 Modify database backup logic to maintain minimum number of backups
- 0.2.35 Database B/R improvements
- 0.2.36 Enable taint toleration for Openstack services jobs
- 0.2.37 Updated chart naming for subchart compatibility
...

1
releasenotes/notes/mariadb.yaml
View File

@ -30,4 +30,5 @@ mariadb:
- 0.2.12 Remove set -x
- 0.2.13 Adjust readiness.sh in single node and no replication case
- 0.2.14 Fix comparison value
- 0.2.15 Updated naming for subchart compatibility
...

1
releasenotes/notes/memcached.yaml
View File

@ -7,4 +7,5 @@ memcached:
- 0.1.4 Use full image ref for docker official images
- 0.1.5 Update htk requirements
- 0.1.6 Switch to using sidecar for exporter
- 0.1.7 Updated naming for subchart compatibility
...

1
releasenotes/notes/rabbitmq.yaml
View File

@ -16,4 +16,5 @@ rabbitmq:
- 0.1.14 Update readiness and liveness probes
- 0.1.15 Update htk requirements
- 0.1.16 Add force_boot command to rabbit start template
- 0.1.17 Updated naming for subchart compatibility
...

11
tools/gate/reno-check.sh
View File

@ -1,18 +1,17 @@
#!/bin/bash
set -e
RESULT=0
while read -r line; do
SERVICE=$(echo $line | awk '{ print $1 }' FS=':' | awk '{ print $2 }' FS='/')
VERSION=$(echo $line | awk '{ print $3 }' FS=':' | xargs)
IFS=$'\n'
for chart in $(find $(pwd) -maxdepth 2 -name 'Chart.yaml');do
SERVICE=$(egrep "^name:" "$chart"|awk -F ' ' '{print $2}')
VERSION=$(egrep "^version:" "$chart"|awk -F ' ' '{print $2}')
if grep -q "$VERSION" ./releasenotes/notes/$SERVICE.yaml ; then
echo "$SERVICE is up to date!"
else
echo "$SERVICE version does not match release notes. Likely requires a release note update"
RESULT=1
fi
done < <(grep -r --include Chart.yaml "version:" .)
done
exit $RESULT