Merge "Updated chart naming for subchart compatibility"
This commit is contained in:
commit
542f723e09
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Helm-Toolkit
|
description: OpenStack-Helm Helm-Toolkit
|
||||||
name: helm-toolkit
|
name: helm-toolkit
|
||||||
version: 0.2.36
|
version: 0.2.37
|
||||||
home: https://docs.openstack.org/openstack-helm
|
home: https://docs.openstack.org/openstack-helm
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -49,7 +49,7 @@ data:
|
|||||||
{{- if eq $envAll.Values.pod.mandatory_access_control.type "apparmor" -}}
|
{{- if eq $envAll.Values.pod.mandatory_access_control.type "apparmor" -}}
|
||||||
{{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
|
{{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
|
||||||
{{- if $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 }}
|
{{- if $envAll.Values.conf.apparmor_profiles }}
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
|
@ -42,7 +42,7 @@ return: |
|
|||||||
{{- $envAll := index . "envAll" -}}
|
{{- $envAll := index . "envAll" -}}
|
||||||
{{- $component := index . "component" -}}
|
{{- $component := index . "component" -}}
|
||||||
{{- $requireSys := index . "requireSys" | default false -}}
|
{{- $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" -}}
|
||||||
{{- if hasKey $envAll.Values.pod.mandatory_access_control "type" -}}
|
{{- if hasKey $envAll.Values.pod.mandatory_access_control "type" -}}
|
||||||
{{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
|
{{- if hasKey $envAll.Values.pod.mandatory_access_control "configmap_apparmor" -}}
|
||||||
|
@ -37,7 +37,7 @@ return: |
|
|||||||
{{- $envAll := index . 0 -}}
|
{{- $envAll := index . 0 -}}
|
||||||
{{- $application := index . 1 -}}
|
{{- $application := index . 1 -}}
|
||||||
{{- $component := index . 2 -}}
|
{{- $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 }}
|
application: {{ $application }}
|
||||||
component: {{ $component }}
|
component: {{ $component }}
|
||||||
{{- if ($envAll.Values.pod).labels }}
|
{{- if ($envAll.Values.pod).labels }}
|
||||||
|
@ -53,7 +53,7 @@ return: |
|
|||||||
{{- $envAll := index . "envAll" -}}
|
{{- $envAll := index . "envAll" -}}
|
||||||
{{- $application := index . "application" -}}
|
{{- $application := index . "application" -}}
|
||||||
{{- $component := index . "component" -}}
|
{{- $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 ) -}}
|
{{- $expressionApplication := dict "key" "application" "operator" "In" "values" ( list $application ) -}}
|
||||||
{{- $expressionComponent := dict "key" "component" "operator" "In" "values" ( list $component ) -}}
|
{{- $expressionComponent := dict "key" "component" "operator" "In" "values" ( list $component ) -}}
|
||||||
{{- list $expressionRelease $expressionApplication $expressionComponent | toYaml }}
|
{{- list $expressionRelease $expressionApplication $expressionComponent | toYaml }}
|
||||||
|
@ -17,7 +17,7 @@ limitations under the License.
|
|||||||
{{- $deps := index . 1 -}}
|
{{- $deps := index . 1 -}}
|
||||||
{{- $saName := index . 2 | replace "_" "-" }}
|
{{- $saName := index . 2 | replace "_" "-" }}
|
||||||
{{- $saNamespace := index . 3 -}}
|
{{- $saNamespace := index . 3 -}}
|
||||||
{{- $releaseName := $envAll.Release.Name }}
|
{{- $releaseName := $envAll.Chart.Name }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
kind: RoleBinding
|
kind: RoleBinding
|
||||||
|
@ -28,7 +28,7 @@ values: |
|
|||||||
{{ include "helm-toolkit.utils.joinListWithComma" .Values.conf.inputs }}
|
{{ include "helm-toolkit.utils.joinListWithComma" .Values.conf.inputs }}
|
||||||
config_to_complete:
|
config_to_complete:
|
||||||
#here we can fill out params, but things need to be valid yaml as input
|
#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:
|
static_config:
|
||||||
#this is just passed though as yaml to the configmap
|
#this is just passed though as yaml to the configmap
|
||||||
foo: bar
|
foo: bar
|
||||||
|
@ -40,7 +40,7 @@ return: |
|
|||||||
- name: {{ $key }}
|
- name: {{ $key }}
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: {{ printf "%s-%s" $context.Release.Name "env-secret" | quote }}
|
name: {{ printf "%s-%s" $context.Chart.Name "env-secret" | quote }}
|
||||||
key: {{ $key }}
|
key: {{ $key }}
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v10.2.31
|
appVersion: v10.2.31
|
||||||
description: OpenStack-Helm MariaDB
|
description: OpenStack-Helm MariaDB
|
||||||
name: mariadb
|
name: mariadb
|
||||||
version: 0.2.14
|
version: 0.2.15
|
||||||
home: https://mariadb.com/kb/en/
|
home: https://mariadb.com/kb/en/
|
||||||
icon: http://badges.mariadb.org/mariadb-badge-180x60.png
|
icon: http://badges.mariadb.org/mariadb-badge-180x60.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -15,9 +15,9 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.deployment_ingress }}
|
{{- if .Values.manifests.deployment_ingress }}
|
||||||
{{- $envAll := . }}
|
{{- $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" }}
|
{{ tuple $envAll "ingress" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
@ -156,7 +156,7 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resourceNames:
|
resourceNames:
|
||||||
- {{ printf "%s-%s" .Release.Name $ingressClass | quote }}
|
- {{ printf "%s-%s" .Chart.Name $ingressClass | quote }}
|
||||||
resources:
|
resources:
|
||||||
- configmaps
|
- configmaps
|
||||||
verbs:
|
verbs:
|
||||||
@ -264,7 +264,7 @@ spec:
|
|||||||
fieldRef:
|
fieldRef:
|
||||||
fieldPath: metadata.namespace
|
fieldPath: metadata.namespace
|
||||||
- name: RELEASE_NAME
|
- name: RELEASE_NAME
|
||||||
value: {{ .Release.Name | quote }}
|
value: {{ .Chart.Name | quote }}
|
||||||
- name: INGRESS_CLASS
|
- name: INGRESS_CLASS
|
||||||
value: {{ $ingressClass | quote }}
|
value: {{ $ingressClass | quote }}
|
||||||
- name: ERROR_PAGE_SERVICE
|
- name: ERROR_PAGE_SERVICE
|
||||||
|
@ -16,13 +16,13 @@ limitations under the License.
|
|||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $dependencies := .Values.dependencies.static.tests }}
|
{{- $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" }}
|
{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{.Release.Name}}-test"
|
name: "{{.Chart.Name}}-test"
|
||||||
labels:
|
labels:
|
||||||
{{ tuple $envAll "mariadb" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
{{ tuple $envAll "mariadb" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
|
@ -22,7 +22,7 @@ exec:
|
|||||||
{{- if .Values.manifests.statefulset }}
|
{{- if .Values.manifests.statefulset }}
|
||||||
{{- $envAll := . }}
|
{{- $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" }}
|
{{ tuple $envAll "mariadb" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1
|
apiVersion: rbac.authorization.k8s.io/v1
|
||||||
@ -40,7 +40,7 @@ rules:
|
|||||||
- apiGroups:
|
- apiGroups:
|
||||||
- ""
|
- ""
|
||||||
resourceNames:
|
resourceNames:
|
||||||
- {{ printf "%s-%s" .Release.Name "mariadb-state" | quote }}
|
- {{ printf "%s-%s" .Chart.Name "mariadb-state" | quote }}
|
||||||
resources:
|
resources:
|
||||||
- configmaps
|
- configmaps
|
||||||
verbs:
|
verbs:
|
||||||
@ -151,7 +151,7 @@ spec:
|
|||||||
- name: WSREP_PORT
|
- name: WSREP_PORT
|
||||||
value: {{ tuple "oslo_db" "direct" "wsrep" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
value: {{ tuple "oslo_db" "direct" "wsrep" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}
|
||||||
- name: STATE_CONFIGMAP
|
- 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
|
- name: MYSQL_DBADMIN_USERNAME
|
||||||
value: {{ .Values.endpoints.oslo_db.auth.admin.username }}
|
value: {{ .Values.endpoints.oslo_db.auth.admin.username }}
|
||||||
- name: MYSQL_DBADMIN_PASSWORD
|
- name: MYSQL_DBADMIN_PASSWORD
|
||||||
|
@ -15,6 +15,6 @@ apiVersion: v1
|
|||||||
appVersion: v1.5.5
|
appVersion: v1.5.5
|
||||||
description: OpenStack-Helm Memcached
|
description: OpenStack-Helm Memcached
|
||||||
name: memcached
|
name: memcached
|
||||||
version: 0.1.6
|
version: 0.1.7
|
||||||
home: https://github.com/memcached/memcached
|
home: https://github.com/memcached/memcached
|
||||||
...
|
...
|
||||||
|
@ -14,7 +14,7 @@ limitations under the License.
|
|||||||
|
|
||||||
{{- if .Values.manifests.configmap_bin }}
|
{{- if .Values.manifests.configmap_bin }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }}
|
{{- $configMapBinName := printf "%s-%s" $envAll.Chart.Name "memcached-bin" }}
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
|
@ -15,8 +15,8 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.deployment }}
|
{{- if .Values.manifests.deployment }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
|
|
||||||
{{- $rcControllerName := printf "%s-%s" $envAll.Release.Name "memcached" }}
|
{{- $rcControllerName := printf "%s-%s" $envAll.Chart.Name "memcached" }}
|
||||||
{{- $configMapBinName := printf "%s-%s" $envAll.Release.Name "memcached-bin" }}
|
{{- $configMapBinName := printf "%s-%s" $envAll.Chart.Name "memcached-bin" }}
|
||||||
|
|
||||||
{{ tuple $envAll "memcached" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll "memcached" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
---
|
---
|
||||||
|
@ -15,6 +15,6 @@ apiVersion: v1
|
|||||||
appVersion: v3.7.26
|
appVersion: v3.7.26
|
||||||
description: OpenStack-Helm RabbitMQ
|
description: OpenStack-Helm RabbitMQ
|
||||||
name: rabbitmq
|
name: rabbitmq
|
||||||
version: 0.1.16
|
version: 0.1.17
|
||||||
home: https://github.com/rabbitmq/rabbitmq-server
|
home: https://github.com/rabbitmq/rabbitmq-server
|
||||||
...
|
...
|
||||||
|
@ -18,7 +18,7 @@ limitations under the License.
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
|
name: {{ printf "%s-%s" .Chart.Name "rabbitmq-bin" | quote }}
|
||||||
data:
|
data:
|
||||||
{{- if .Values.images.local_registry.active }}
|
{{- if .Values.images.local_registry.active }}
|
||||||
image-repo-sync.sh: |
|
image-repo-sync.sh: |
|
||||||
|
@ -49,7 +49,7 @@ limitations under the License.
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ConfigMap
|
kind: ConfigMap
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-etc" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-etc" | quote }}
|
||||||
data:
|
data:
|
||||||
enabled_plugins: |
|
enabled_plugins: |
|
||||||
{{ tuple "etc/_enabled_plugins.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
{{ tuple "etc/_enabled_plugins.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
|
||||||
|
@ -15,7 +15,7 @@ limitations under the License.
|
|||||||
{{- if and .Values.manifests.ingress_management .Values.network.management.ingress.public }}
|
{{- if and .Values.manifests.ingress_management .Values.network.management.ingress.public }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- if empty $envAll.Values.endpoints.oslo_messaging.hosts.public }}
|
{{- 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 )) }}
|
{{- $_ := set $envAll.Values.endpoints.oslo_messaging.hosts "public" ( printf "%s-%s-%s" $service_public_name "mgr" ( $service_public_name | sha256sum | trunc 6 )) }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- $ingressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}
|
{{- $ingressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}
|
||||||
|
@ -15,7 +15,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.job_cluster_wait }}
|
{{- if .Values.manifests.job_cluster_wait }}
|
||||||
{{- $envAll := . }}
|
{{- $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" }}
|
{{ tuple $envAll "cluster_wait" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|
||||||
{{- $protocol := "http" }}
|
{{- $protocol := "http" }}
|
||||||
@ -26,7 +26,7 @@ limitations under the License.
|
|||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: Job
|
kind: Job
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{.Release.Name}}-cluster-wait"
|
name: "{{.Chart.Name}}-cluster-wait"
|
||||||
labels:
|
labels:
|
||||||
{{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
{{ tuple $envAll "rabbitmq" "cluster-wait" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
@ -100,11 +100,11 @@ spec:
|
|||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: rabbitmq-bin
|
- name: rabbitmq-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
- name: rabbitmq-erlang-cookie
|
- name: rabbitmq-erlang-cookie
|
||||||
secret:
|
secret:
|
||||||
secretName: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
|
secretName: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
|
||||||
defaultMode: 0444
|
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 }}
|
{{ dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -22,7 +22,7 @@ httpGet:
|
|||||||
{{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
|
{{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }}
|
||||||
{{- $envAll := . }}
|
{{- $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" }}
|
{{ tuple $envAll "prometheus_rabbitmq_exporter" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|
||||||
{{- $protocol := "http" }}
|
{{- $protocol := "http" }}
|
||||||
@ -77,12 +77,12 @@ spec:
|
|||||||
- name: RABBIT_USER
|
- name: RABBIT_USER
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
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
|
key: RABBITMQ_ADMIN_USERNAME
|
||||||
- name: RABBIT_PASSWORD
|
- name: RABBIT_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
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
|
key: RABBITMQ_ADMIN_PASSWORD
|
||||||
- name: RABBIT_CAPABILITIES
|
- name: RABBIT_CAPABILITIES
|
||||||
value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}
|
value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }}
|
||||||
|
@ -17,11 +17,11 @@ limitations under the License.
|
|||||||
|
|
||||||
{{ if kindIs "string" $envAll.Values.dependencies.static.tests.jobs }}
|
{{ if kindIs "string" $envAll.Values.dependencies.static.tests.jobs }}
|
||||||
{{ if eq $envAll.Values.dependencies.static.tests.jobs "cluster_wait" }}
|
{{ 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 }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
{{- $serviceAccountName := print .Release.Name "-test" }}
|
{{- $serviceAccountName := print .Chart.Name "-test" }}
|
||||||
{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll "tests" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|
||||||
{{- $protocol := "http" }}
|
{{- $protocol := "http" }}
|
||||||
@ -32,7 +32,7 @@ limitations under the License.
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
metadata:
|
metadata:
|
||||||
name: "{{.Release.Name}}-test"
|
name: "{{.Chart.Name}}-test"
|
||||||
labels:
|
labels:
|
||||||
{{ tuple $envAll "rabbitmq" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
{{ tuple $envAll "rabbitmq" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
||||||
annotations:
|
annotations:
|
||||||
@ -71,7 +71,7 @@ spec:
|
|||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: rabbitmq-bin
|
- name: rabbitmq-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
|
{{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.oslo_messaging.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 4 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
@ -18,7 +18,7 @@ limitations under the License.
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
|
||||||
type: Opaque
|
type: Opaque
|
||||||
data:
|
data:
|
||||||
erlang_cookie: {{ $envAll.Values.endpoints.oslo_messaging.auth.erlang_cookie | b64enc -}}
|
erlang_cookie: {{ $envAll.Values.endpoints.oslo_messaging.auth.erlang_cookie | b64enc -}}
|
||||||
|
@ -18,7 +18,7 @@ limitations under the License.
|
|||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Secret
|
kind: Secret
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "admin-user" | quote }}
|
||||||
type: Opaque
|
type: Opaque
|
||||||
data:
|
data:
|
||||||
RABBITMQ_ADMIN_USERNAME: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.username | b64enc }}
|
RABBITMQ_ADMIN_USERNAME: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.username | b64enc }}
|
||||||
|
@ -15,7 +15,7 @@ limitations under the License.
|
|||||||
{{- if and .Values.manifests.service_ingress_management .Values.network.management.ingress.public }}
|
{{- if and .Values.manifests.service_ingress_management .Values.network.management.ingress.public }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- if empty $envAll.Values.endpoints.oslo_messaging.hosts.public }}
|
{{- 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 )) }}
|
{{- $_ := set $envAll.Values.endpoints.oslo_messaging.hosts "public" ( printf "%s-%s-%s" $service_public_name "mgr" ( $service_public_name | sha256sum | trunc 6 )) }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- $serviceIngressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}
|
{{- $serviceIngressOpts := dict "envAll" . "backendService" "management" "backendServiceType" "oslo_messaging" "backendPort" "http" -}}
|
||||||
|
@ -32,7 +32,7 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.statefulset }}
|
{{- if .Values.manifests.statefulset }}
|
||||||
{{- $envAll := . }}
|
{{- $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" }}
|
{{ tuple $envAll "rabbitmq" $rcControllerName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
|
|
||||||
{{- $protocol := "http" }}
|
{{- $protocol := "http" }}
|
||||||
@ -117,12 +117,12 @@ spec:
|
|||||||
- name: RABBITMQ_ADMIN_USERNAME
|
- name: RABBITMQ_ADMIN_USERNAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
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
|
key: RABBITMQ_ADMIN_USERNAME
|
||||||
- name: RABBITMQ_ADMIN_PASSWORD
|
- name: RABBITMQ_ADMIN_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
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
|
key: RABBITMQ_ADMIN_PASSWORD
|
||||||
- name: RABBITMQ_DEFINITION_FILE
|
- name: RABBITMQ_DEFINITION_FILE
|
||||||
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
|
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
|
||||||
@ -275,15 +275,15 @@ spec:
|
|||||||
emptyDir: {}
|
emptyDir: {}
|
||||||
- name: rabbitmq-bin
|
- name: rabbitmq-bin
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-bin" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-bin" | quote }}
|
||||||
defaultMode: 0555
|
defaultMode: 0555
|
||||||
- name: rabbitmq-etc
|
- name: rabbitmq-etc
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ printf "%s-%s" $envAll.Release.Name "rabbitmq-etc" | quote }}
|
name: {{ printf "%s-%s" $envAll.Chart.Name "rabbitmq-etc" | quote }}
|
||||||
defaultMode: 0444
|
defaultMode: 0444
|
||||||
- name: rabbitmq-erlang-cookie
|
- name: rabbitmq-erlang-cookie
|
||||||
secret:
|
secret:
|
||||||
secretName: {{ printf "%s-%s" $envAll.Release.Name "erlang-cookie" | quote }}
|
secretName: {{ printf "%s-%s" $envAll.Chart.Name "erlang-cookie" | quote }}
|
||||||
defaultMode: 0444
|
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 }}
|
{{ 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 }}
|
{{- if not $envAll.Values.volume.enabled }}
|
||||||
|
@ -43,4 +43,5 @@ helm-toolkit:
|
|||||||
- 0.2.34 Modify database backup logic to maintain minimum number of backups
|
- 0.2.34 Modify database backup logic to maintain minimum number of backups
|
||||||
- 0.2.35 Database B/R improvements
|
- 0.2.35 Database B/R improvements
|
||||||
- 0.2.36 Enable taint toleration for Openstack services jobs
|
- 0.2.36 Enable taint toleration for Openstack services jobs
|
||||||
|
- 0.2.37 Updated chart naming for subchart compatibility
|
||||||
...
|
...
|
||||||
|
@ -30,4 +30,5 @@ mariadb:
|
|||||||
- 0.2.12 Remove set -x
|
- 0.2.12 Remove set -x
|
||||||
- 0.2.13 Adjust readiness.sh in single node and no replication case
|
- 0.2.13 Adjust readiness.sh in single node and no replication case
|
||||||
- 0.2.14 Fix comparison value
|
- 0.2.14 Fix comparison value
|
||||||
|
- 0.2.15 Updated naming for subchart compatibility
|
||||||
...
|
...
|
||||||
|
@ -7,4 +7,5 @@ memcached:
|
|||||||
- 0.1.4 Use full image ref for docker official images
|
- 0.1.4 Use full image ref for docker official images
|
||||||
- 0.1.5 Update htk requirements
|
- 0.1.5 Update htk requirements
|
||||||
- 0.1.6 Switch to using sidecar for exporter
|
- 0.1.6 Switch to using sidecar for exporter
|
||||||
|
- 0.1.7 Updated naming for subchart compatibility
|
||||||
...
|
...
|
||||||
|
@ -16,4 +16,5 @@ rabbitmq:
|
|||||||
- 0.1.14 Update readiness and liveness probes
|
- 0.1.14 Update readiness and liveness probes
|
||||||
- 0.1.15 Update htk requirements
|
- 0.1.15 Update htk requirements
|
||||||
- 0.1.16 Add force_boot command to rabbit start template
|
- 0.1.16 Add force_boot command to rabbit start template
|
||||||
|
- 0.1.17 Updated naming for subchart compatibility
|
||||||
...
|
...
|
||||||
|
@ -1,18 +1,17 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
RESULT=0
|
RESULT=0
|
||||||
|
IFS=$'\n'
|
||||||
while read -r line; do
|
for chart in $(find $(pwd) -maxdepth 2 -name 'Chart.yaml');do
|
||||||
SERVICE=$(echo $line | awk '{ print $1 }' FS=':' | awk '{ print $2 }' FS='/')
|
SERVICE=$(egrep "^name:" "$chart"|awk -F ' ' '{print $2}')
|
||||||
VERSION=$(echo $line | awk '{ print $3 }' FS=':' | xargs)
|
VERSION=$(egrep "^version:" "$chart"|awk -F ' ' '{print $2}')
|
||||||
if grep -q "$VERSION" ./releasenotes/notes/$SERVICE.yaml ; then
|
if grep -q "$VERSION" ./releasenotes/notes/$SERVICE.yaml ; then
|
||||||
echo "$SERVICE is up to date!"
|
echo "$SERVICE is up to date!"
|
||||||
else
|
else
|
||||||
echo "$SERVICE version does not match release notes. Likely requires a release note update"
|
echo "$SERVICE version does not match release notes. Likely requires a release note update"
|
||||||
RESULT=1
|
RESULT=1
|
||||||
fi
|
fi
|
||||||
done < <(grep -r --include Chart.yaml "version:" .)
|
done
|
||||||
|
|
||||||
exit $RESULT
|
exit $RESULT
|
||||||
|
Loading…
Reference in New Issue
Block a user