Feat: support user defined image registry (#2623)

* Feat: support user defined image registry * Feat: add test app image repo into values
2026-02-14 18:10:21 +00:00 · 2021-11-22 10:56:36 +08:00
parent 34aa74ff48
commit a67bd24967
19 changed files with 49 additions and 73 deletions
--- a/charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/oam-runtime/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - create
--- a/charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/oam-runtime/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - patch
--- a/charts/oam-runtime/templates/oam-runtime-controller.yaml
+++ b/charts/oam-runtime/templates/oam-runtime-controller.yaml
@@ -126,7 +126,7 @@ spec:
            {{ end }}
            - "--system-definition-namespace={{ .Values.systemDefinitionNamespace }}"
            - "--oam-spec-ver={{ .Values.OAMSpecVer }}"
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
          {{- toYaml .Values.resources | nindent 12 }}
--- a/charts/oam-runtime/templates/test/test-application.yaml
+++ b/charts/oam-runtime/templates/test/test-application.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ include "oam-runtime.fullname" . }}-test-connection"
+  name: {{ include "oam-runtime.fullname" . }}-test-connection
  labels:
  {{- include "oam-runtime.labels" . | nindent 4 }}
  annotations:
@@ -9,7 +9,7 @@ metadata:
 spec:
  containers:
    - name: wget
-      image: busybox
+      image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
      command: ['wget']
      args: ['{{ include "oam-runtime.fullname" . }}:{{ .Values.healthCheck.port }}']
  restartPolicy: Never
--- a/charts/oam-runtime/values.yaml
+++ b/charts/oam-runtime/values.yaml
@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"

 disableCaps: "all"
+
+imageRegistry: ""
 image:
  repository: oamdev/vela-core
  tag: latest
@@ -98,4 +100,9 @@ concurrentReconciles: 4
 dependCheckWait: 30s

 # OAMSpecVer is the oam spec version controller want to setup
-OAMSpecVer: "v0.2"
+OAMSpecVer: "v0.2"
+
+test:
+  app:
+    repository: oamdev/busybox
+    tag: latest
--- a/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/vela-core/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - create
--- a/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/vela-core/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - patch
--- a/charts/vela-core/templates/cluster-gateway.yaml
+++ b/charts/vela-core/templates/cluster-gateway.yaml
@@ -35,7 +35,7 @@ spec:
            {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
            - "--cert-dir={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}"
            {{ end }}
-          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
          imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
          resources:
          {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
@@ -190,7 +190,7 @@ spec:
    spec:
      containers:
      - name: create
-        image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+        image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
        imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
        args:
          - create
@@ -233,7 +233,7 @@ spec:
    spec:
      containers:
      - name: patch
-        image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+        image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
        imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
        command:
          - /patch
--- a/charts/vela-core/templates/kubevela-apiserver.yaml
+++ b/charts/vela-core/templates/kubevela-apiserver.yaml
@@ -30,7 +30,7 @@ spec:
          args:
            - "apiserver"
            - "--port={{ .Values.apiServer.port }}"
-          image: {{ .Values.apiserverImage.repository }}:{{ .Values.apiserverImage.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.apiserverImage.repository }}:{{ .Values.apiserverImage.tag }}
          imagePullPolicy: {{ quote .Values.apiserverImage.pullPolicy }}
          resources:
          {{- toYaml .Values.resources | nindent 12 }}
--- a/charts/vela-core/templates/kubevela-controller.yaml
+++ b/charts/vela-core/templates/kubevela-controller.yaml
@@ -130,7 +130,7 @@ spec:
            {{ if .Values.multicluster.enabled }}
            - "--enable-cluster-gateway"
            {{ end }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
          {{- toYaml .Values.resources | nindent 12 }}
--- a/charts/vela-core/templates/test/test-application.yaml
+++ b/charts/vela-core/templates/test/test-application.yaml
@@ -10,7 +10,7 @@ spec:
    - name: helm-test-express-server
      type: webservice
      properties:
-        image: crccheck/hello-world
+        image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
        port: 8000
      traits:
        - type: ingress
@@ -30,7 +30,7 @@ spec:
  serviceAccountName: kubevela-vela-core
  containers:
    - name: {{ .Release.Name }}-application-test
-      image: alpine/k8s:1.18.2
+      image: {{ .Values.imageRegistry }}{{ .Values.test.k8s.repository }}:{{ .Values.test.k8s.tag }}
      imagePullPolicy: IfNotPresent
      command:
        - /bin/bash
--- a/charts/vela-core/values.yaml
+++ b/charts/vela-core/values.yaml
@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"

 disableCaps: ""
+
+imageRegistry: ""
 image:
  repository: oamdev/vela-core
  tag: latest
@@ -130,4 +132,12 @@ multicluster:
        memory: 200Mi
    secureTLS:
      enabled: true
-      certPath: /etc/k8s-cluster-gateway-certs
+      certPath: /etc/k8s-cluster-gateway-certs
+
+test:
+  app:
+    repository: oamdev/hello-world
+    tag: latest
+  k8s:
+    repository: oamdev/alpine-k8s
+    tag: 1.18.2
--- a/charts/vela-minimal/templates/admission-webhooks/job-patch/job-createSecret.yaml
+++ b/charts/vela-minimal/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - create
--- a/charts/vela-minimal/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ b/charts/vela-minimal/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -24,7 +24,7 @@ spec:
    spec:
      containers:
        - name: patch
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - patch
--- a/charts/vela-minimal/templates/cluster-gateway.yaml
+++ b/charts/vela-minimal/templates/cluster-gateway.yaml
@@ -35,7 +35,7 @@ spec:
            {{ if .Values.multicluster.clusterGateway.secureTLS.enabled }}
            - "--cert-dir={{ .Values.multicluster.clusterGateway.secureTLS.certPath }}"
            {{ end }}
-          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
          imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
          resources:
          {{- toYaml .Values.multicluster.clusterGateway.resources | nindent 12 }}
@@ -132,7 +132,7 @@ spec:
    spec:
      containers:
        - name: create
-          image: {{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.admissionWebhooks.patch.image.repository }}:{{ .Values.admissionWebhooks.patch.image.tag }}
          imagePullPolicy: {{ .Values.admissionWebhooks.patch.image.pullPolicy }}
          args:
            - create
@@ -175,7 +175,7 @@ spec:
    spec:
      containers:
        - name: patch
-          image: {{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.multicluster.clusterGateway.image.repository }}:{{ .Values.multicluster.clusterGateway.image.tag }}
          imagePullPolicy: {{ .Values.multicluster.clusterGateway.image.pullPolicy }}
          command:
            - /patch
--- a/charts/vela-minimal/templates/kubevela-apiserver.yaml
+++ b/charts/vela-minimal/templates/kubevela-apiserver.yaml
@@ -30,7 +30,7 @@ spec:
          args:
            - "apiserver"
            - "--bind-addr=0.0.0.0:{{ .Values.apiServer.port }}"
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
          {{- toYaml .Values.resources | nindent 12 }}
--- a/charts/vela-minimal/templates/kubevela-controller.yaml
+++ b/charts/vela-minimal/templates/kubevela-controller.yaml
@@ -132,7 +132,7 @@ spec:
            {{ if .Values.multicluster.enabled }}
            - "--enable-cluster-gateway"
            {{ end }}
-          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          image: {{ .Values.imageRegistry }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
          imagePullPolicy: {{ quote .Values.image.pullPolicy }}
          resources:
          {{- toYaml .Values.resources | nindent 12 }}
--- a/charts/vela-minimal/templates/test/test-application.yaml
+++ b/charts/vela-minimal/templates/test/test-application.yaml
@@ -10,53 +10,5 @@ spec:
    - name: helm-test-express-server
      type: webservice
      properties:
-        image: crccheck/hello-world
+        image: {{ .Values.imageRegistry }}{{ .Values.test.app.repository }}:{{ .Values.test.app.tag }}
        port: 8000
-      # traits:
-      #   - type: ingress
-      #     properties:
-      #       domain: testsvc.example.com
-      #       http:
-      #         "/": 8000
-# ---
-# apiVersion: v1
-# kind: Pod
-# metadata:
-#   name: "{{ .Release.Name }}-application-test"
-#   annotations:
-#     "helm.sh/hook": test
-#     helm.sh/hook-delete-policy: hook-succeeded
-# spec:
-#   serviceAccountName: kubevela-vela-core
-#   containers:
-#     - name: {{ .Release.Name }}-application-test
-#       image: alpine/k8s:1.18.2
-#       imagePullPolicy: IfNotPresent
-#       command:
-#         - /bin/bash
-#         - -ec
-#         - |
-
-#           set -e
-
-#           echo "Waiting application is ready..."
-
-#           echo "waiting for application being Ready"
-#           kubectl -n vela-system wait --for=condition=Ready applications.core.oam.dev helm-test-vela-app --timeout=3m
-#           echo "application is Ready"
-
-#           # wait for deploy being created
-#           echo "waiting for deployment being available"
-#           kubectl -n vela-system wait --for=condition=available deployments helm-test-express-server --timeout 3m
-#           echo "deployment being available"
-
-#           # wait for ingress being created
-#           while ! [ `kubectl -n vela-system get ing helm-test-express-server | grep -v NAME | wc -l` = 1 ]; do
-#             echo "waiting for ingress being created"
-#             sleep 1
-#           done
-
-
-
-#           echo "Application and its components are created"
-#   restartPolicy: Never
--- a/charts/vela-minimal/values.yaml
+++ b/charts/vela-minimal/values.yaml
@@ -7,6 +7,8 @@ replicaCount: 1
 applyOnceOnly: "off"

 disableCaps: "manualscalertrait,containerizedwokrload,envbinding"
+
+imageRegistry: ""
 image:
  repository: oamdev/vela-core
  tag: latest
@@ -125,4 +127,9 @@ multicluster:
        memory: 200Mi
    secureTLS:
      enabled: true
-      certPath: /etc/k8s-cluster-gateway-certs
+      certPath: /etc/k8s-cluster-gateway-certs
+
+test:
+  app:
+    repository: oamdev/hello-world
+    tag: latest