diff --git a/charts/rabbitmq/Chart.yaml b/charts/rabbitmq/Chart.yaml index 1d57966..3c3e019 100644 --- a/charts/rabbitmq/Chart.yaml +++ b/charts/rabbitmq/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.3 +version: 1.0.4 # This is the version number of the application being deployed. This version number should be diff --git a/charts/rabbitmq/templates/deployment.yaml b/charts/rabbitmq/templates/deployment.yaml index a2500a2..bcf83ba 100644 --- a/charts/rabbitmq/templates/deployment.yaml +++ b/charts/rabbitmq/templates/deployment.yaml @@ -25,14 +25,18 @@ spec: - name: OPERATOR_SCOPE_NAMESPACE value: "{{ .Values.manager.watchNamespace }}" - name: LOCAL_REGISTRY - value: {{ .Values.localRegistry | default "docker.io" }} + value: {{ .Values.global.imageRegistry | default "docker.io" }} - name: NAMESPACE_OVERRIDE value: {{ .Values.namespaceOverride | default "radondb" }} - name: RABBITMQ_IMAGE value: {{ .Values.cluster.rabbitmq.image | default "rabbitmq" }} - name: RABBITMQ_VERSION value: {{ .Values.cluster.rabbitmq.tag | default "3.11.13-management" }} - image: "{{ .Values.localRegistry | default "docker.io" }}{{"/"}}{{ .Values.namespaceOverride | default "radondb" }}{{"/"}}{{ .Values.manager.image }}:{{ .Values.manager.tag | default .Chart.AppVersion }}" + {{- if .Values.global.imagePullSecrets }} + - name: DEFAULT_IMAGE_PULL_SECRETS + value: {{ .Values.global.imagePullSecrets }} + {{- end }} + image: "{{ .Values.global.imageRegistry | default "docker.io" }}{{"/"}}{{ .Values.namespaceOverride | default "radondb" }}{{"/"}}{{ .Values.manager.image }}:{{ .Values.manager.tag | default .Chart.AppVersion }}" name: rabbitmq-cluster-operator ports: - containerPort: 9782 diff --git a/charts/rabbitmq/values.yaml b/charts/rabbitmq/values.yaml index 8c45c41..6254949 100644 --- a/charts/rabbitmq/values.yaml +++ b/charts/rabbitmq/values.yaml @@ -1,3 +1,7 @@ +global: + imageRegistry: docker.io + imagePullSecrets: [] + nodeSelector: {} tolerations: [] manager: