feat: support global registry and remove br related code

Signed-off-by: Aylei <[email protected]>
matrixorigin · Nov 28, 2023 · 57eb3e0 · 57eb3e0
1 parent 8717933
commit 57eb3e0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 228 deletions.
diff --git a/charts/matrixone-operator/Chart.yaml b/charts/matrixone-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: matrixone-operator
 description: Matrixone Kubernetes Operator
 type: application
-version: 1.0.0-rc1
+version: 1.0.0-rc2
 appVersion: 0.1.0
 kubeVersion: ">=1.19.0-0"
 icon: https://raw.githubusercontent.com/matrixorigin/artwork/main/docs/overview/logo.png

diff --git a/charts/matrixone-operator/templates/_helpers.tpl b/charts/matrixone-operator/templates/_helpers.tpl
@@ -73,3 +73,10 @@ caBundle: {{ $ca.Cert | b64enc }}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
 {{- end -}}
+
+{{/*
+Generate default image
+*/}}
+{{- define "matrixone-operator.image" -}}
+"{{ .Values.globalRegistryPrefix }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+{{- end }}
diff --git a/charts/matrixone-operator/templates/configmap.yaml b/charts/matrixone-operator/templates/configmap.yaml
@@ -18,4 +18,4 @@ data:
     {{- end }}
 
   brConfig: |
-    image: {{ .Values.backupRestore.image }}
+    image: "{{- .Values.globalRegistryPrefix -}}{{- .Values.backupRestore.image -}}"
diff --git a/charts/matrixone-operator/templates/deployment.yaml b/charts/matrixone-operator/templates/deployment.yaml
@@ -43,7 +43,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "matrixone-operator.image" . }}
           command:
           - /manager
           imagePullPolicy: {{ .Values.image.pullPolicy }}

diff --git a/charts/matrixone-operator/values.yaml b/charts/matrixone-operator/values.yaml
@@ -13,7 +13,11 @@ image:
   pullPolicy: IfNotPresent
 
 backupRestore:
-  image: aylei/mobr
+  image: matrixorigin/mobr:1.0.0-rc1
+
+# globalRegistryPrefix add a registry prefix to every image operator used, which is useful when switching operator
+# to a private registry
+globalRegistryPrefix: ""
 
 imagePullSecrets: []
 nameOverride: ""
@@ -64,6 +68,9 @@ affinity: {}
 
 kruise:
   featureGates: "StatefulSetAutoDeletePVC=true,PodUnavailableBudgetDeleteGate=true,PodUnavailableBudgetUpdateGate=true"
+  manager:
+    image:
+      repository: openkruise/kruise-manager
 
 defaultArgs:
   - name: logService

diff --git a/cmd/cmdrest/go.mod b/cmd/cmdrest/go.mod
diff --git a/cmd/cmdrest/go.sum b/cmd/cmdrest/go.sum
diff --git a/cmd/cmdrest/main.go b/cmd/cmdrest/main.go