From 7c515d99c650bd206665e1eb81432795d80c0b7d Mon Sep 17 00:00:00 2001 From: Simon Lord Date: Mon, 11 Jun 2018 14:35:33 +0100 Subject: [PATCH] Support overriding docker registry for operator and agent in Helm chart This allows a better dev process as we push our dev builds to a different ocir registry. ``` make push helm install --name my-release \ --set operator.namespace=default \ --set operator.global=false \ --set rbac.enabled=true \ --set image.registry=iad.ocir.io/ \ --set image.tag=slord-20180611104750 \ ./mysql-operator ``` --- mysql-operator/templates/03-deployment.yaml | 3 ++- mysql-operator/values.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-operator/templates/03-deployment.yaml b/mysql-operator/templates/03-deployment.yaml index e7f276293..88b4c3521 100644 --- a/mysql-operator/templates/03-deployment.yaml +++ b/mysql-operator/templates/03-deployment.yaml @@ -24,7 +24,7 @@ spec: containers: - name: mysql-operator-controller imagePullPolicy: {{ .Values.image.pullPolicy }} - image: iad.ocir.io/oracle/mysql-operator:{{ .Values.image.tag }} + image: {{ .Values.image.registry }}/mysql-operator:{{ .Values.image.tag }} ports: - containerPort: 10254 args: @@ -32,3 +32,4 @@ spec: {{- if not .Values.operator.global }} - --namespace={{- .Values.operator.namespace }} {{- end }} + - --mysql-agent-image={{- .Values.image.registry }}/mysql-agent:{{ .Values.image.tag }} diff --git a/mysql-operator/values.yaml b/mysql-operator/values.yaml index 07c22d703..9f65f875e 100644 --- a/mysql-operator/values.yaml +++ b/mysql-operator/values.yaml @@ -5,5 +5,6 @@ operator: global: true register_crd: true image: + registry: iad.ocir.io/oracle tag: 0.1.0 pullPolicy: Always