*: Support custom repository address of images. #378

Author: runkecheng

charts/mysql-operator/templates/deployment.yaml

@@ -24,7 +24,11 @@ spec:
       containers:
       {{- if .Values.rbacProxy.create }}
       - name: kube-rbac-proxy
-        image: {{ .Values.rbacProxy.image }}
+      {{- if not .Values.imagePrefix }}
+        image: "{{ .Values.rbacProxy.image }}"
+      {{- else }}
+        image: "{{ .Values.imagePrefix }}/{{ .Values.rbacProxy.image }}"
+      {{- end }}
         args:
         - "--secure-listen-address=0.0.0.0:8443"
         - "--upstream=http://127.0.0.1:8080/"
@@ -41,8 +45,15 @@ spec:
         - --health-probe-bind-address=:8081
         - --metrics-bind-address=127.0.0.1:8080
         - --leader-elect
+      {{- if not .Values.imagePrefix }}
         image: "{{ .Values.manager.image }}:{{ .Values.manager.tag }}"
+      {{- else }}
+        image: "{{ .Values.imagePrefix }}/{{ .Values.manager.image }}:{{ .Values.manager.tag }}"
+      {{- end }}
         imagePullPolicy: {{ .Values.imagePullPolicy | quote }}
+        env:
+        - name: IMAGE_PREFIX
+          value: {{ .Values.imagePrefix }}
         securityContext:
           allowPrivilegeEscalation: false
         livenessProbe:

charts/mysql-operator/values.yaml

@@ -12,6 +12,7 @@ installCRDS: true
 imagePullPolicy: IfNotPresent
 nameOverride: ""
 fullnameOverride: ""
+imagePrefix: ""
 
 manager:
   image: radondb/mysql-operator

mysqlcluster/container/auditlog_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -56,7 +57,7 @@ func TestGetAuditlogName(t *testing.T) {
 }
 
 func TestGetAuditlogImage(t *testing.T) {
-	assert.Equal(t, "busybox", auditLogCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "busybox"), auditLogCase.Image)
 }
 
 func TestGetAuditlogCommand(t *testing.T) {

mysqlcluster/container/container.go

@@ -17,6 +17,8 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
+
 	corev1 "k8s.io/api/core/v1"
 
 	"github.com/radondb/radondb-mysql-kubernetes/mysqlcluster"
@@ -61,7 +63,7 @@ func EnsureContainer(name string, c *mysqlcluster.MysqlCluster) corev1.Container
 
 	return corev1.Container{
 		Name:            ctr.getName(),
-		Image:           ctr.getImage(),
+		Image:           fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), ctr.getImage()),
 		ImagePullPolicy: c.Spec.PodPolicy.ImagePullPolicy,
 		Command:         ctr.getCommand(),
 		Env:             ctr.getEnvVars(),

mysqlcluster/container/init_mysql_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -109,7 +110,7 @@ func TestGetInitMysqlName(t *testing.T) {
 }
 
 func TestGetInitMysqlImage(t *testing.T) {
-	assert.Equal(t, "percona/percona-server:5.7.34", initMysqlCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "percona/percona-server:5.7.34"), initMysqlCase.Image)
 }
 
 func TestGetInitMysqlCommand(t *testing.T) {

mysqlcluster/container/init_sidecar_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"strconv"
 	"testing"
 
@@ -303,7 +304,7 @@ func TestGetInitSidecarName(t *testing.T) {
 }
 
 func TestGetInitSidecarImage(t *testing.T) {
-	assert.Equal(t, "sidecar image", initSidecarCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "sidecar image"), initSidecarCase.Image)
 }
 
 func TestGetInitSidecarCommand(t *testing.T) {

mysqlcluster/container/metrics_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -56,7 +57,7 @@ func TestGetMetricsName(t *testing.T) {
 }
 
 func TestGetMetricsImage(t *testing.T) {
-	assert.Equal(t, "metrics-image", metricsCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "metrics-image"), metricsCase.Image)
 }
 
 func TestGetMetricsCommand(t *testing.T) {

mysqlcluster/container/mysql_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -53,7 +54,7 @@ func TestGetMysqlName(t *testing.T) {
 }
 
 func TestGetMysqlImage(t *testing.T) {
-	assert.Equal(t, "percona/percona-server:5.7.34", mysqlCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "percona/percona-server:5.7.34"), mysqlCase.Image)
 }
 
 func TestGetMysqlCommand(t *testing.T) {

mysqlcluster/container/slowlog_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -49,7 +50,7 @@ func TestGetSlowlogName(t *testing.T) {
 }
 
 func TestGetSlowlogImage(t *testing.T) {
-	assert.Equal(t, "sidecar image", slowlogCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "sidecar image"), slowlogCase.Image)
 }
 
 func TestGetSlowlogCommand(t *testing.T) {

mysqlcluster/container/xenon_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package container
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -59,7 +60,7 @@ func TestGetXenonName(t *testing.T) {
 }
 
 func TestGetXenonImage(t *testing.T) {
-	assert.Equal(t, "xenon image", xenonCase.Image)
+	assert.Equal(t, fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), "xenon image"), xenonCase.Image)
 }
 
 func TestGetXenonCommand(t *testing.T) {