image hub set (#483)

Co-authored-by: bobtthp <bobtthp@bobtthp-mbp.local> Co-authored-by: Albumen Kevin <jhq0812@gmail.com>
apache · Sep 8, 2022 · 287bbeb · 287bbeb
1 parent 119744b
commit 287bbeb
Show file tree

Hide file tree

Showing 31 changed files with 65 additions and 65 deletions.
diff --git a/manifests/charts/gateway/Chart.yaml b/manifests/charts/gateway/Chart.yaml
@@ -13,4 +13,4 @@ sources:
 icon: https://istio.io/latest/favicons/android-192x192.png
 keywords:
 - istio
-- gateways
+- gateways
diff --git a/manifests/charts/gateway/values.yaml b/manifests/charts/gateway/values.yaml
@@ -88,4 +88,4 @@ affinity: {}
 # If specified, the gateway will act as a network gateway for the given network.
 networkGateway: ""
 
-imagePullSecrets: []
+imagePullSecrets: []
diff --git a/manifests/charts/gateways/istio-egress/templates/deployment.yaml b/manifests/charts/gateways/istio-egress/templates/deployment.yaml
@@ -71,7 +71,7 @@ spec:
 {{- if contains "/" .Values.global.proxy.image }}
           image: "{{ .Values.global.proxy.image }}"
 {{- else }}
-          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "proxyv2" }}:{{ .Values.global.tag }}"
+          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "dubbo-agent" }}:{{ .Values.global.tag }}"
 {{- end }}
 {{- if .Values.global.imagePullPolicy }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
@@ -92,7 +92,7 @@ spec:
 {{- if contains "/" .Values.global.proxy.image }}
           image: "{{ .Values.global.proxy.image }}"
 {{- else }}
-          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "proxyv2" }}:{{ .Values.global.tag }}"
+          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "dubbo-agent" }}:{{ .Values.global.tag }}"
 {{- end }}
 {{- if .Values.global.imagePullPolicy }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}

diff --git a/manifests/charts/gateways/istio-egress/values.yaml b/manifests/charts/gateways/istio-egress/values.yaml
@@ -143,7 +143,7 @@ global:
   # Default hub for Istio images.
   # Releases are published to docker hub under 'istio' project.
   # Dev builds from prow are on gcr.io
-  hub: gcr.io/istio-testing
+  hub: apache
 
   # Default tag for Istio images.
   tag: latest
@@ -184,7 +184,7 @@ global:
   priorityClassName: ""
 
   proxy:
-    image: proxyv2
+    image: dubbo-agent
 
     # CAUTION: It is important to ensure that all Istio helm charts specify the same clusterDomain value
     # cluster domain. Default value is "cluster.local".

diff --git a/manifests/charts/gateways/istio-ingress/templates/deployment.yaml b/manifests/charts/gateways/istio-ingress/templates/deployment.yaml
@@ -71,7 +71,7 @@ spec:
 {{- if contains "/" .Values.global.proxy.image }}
           image: "{{ .Values.global.proxy.image }}"
 {{- else }}
-          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "proxyv2" }}:{{ .Values.global.tag }}"
+          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "dubbo-agent" }}:{{ .Values.global.tag }}"
 {{- end }}
 {{- if .Values.global.imagePullPolicy }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}
@@ -92,7 +92,7 @@ spec:
 {{- if contains "/" .Values.global.proxy.image }}
           image: "{{ .Values.global.proxy.image }}"
 {{- else }}
-          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "proxyv2" }}:{{ .Values.global.tag }}"
+          image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image | default "dubbo-agent" }}:{{ .Values.global.tag }}"
 {{- end }}
 {{- if .Values.global.imagePullPolicy }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}

diff --git a/manifests/charts/gateways/istio-ingress/values.yaml b/manifests/charts/gateways/istio-ingress/values.yaml
@@ -156,7 +156,7 @@ global:
   # Default hub for Istio images.
   # Releases are published to docker hub under 'istio' project.
   # Dev builds from prow are on gcr.io
-  hub: gcr.io/istio-testing
+  hub: apache
 
   # Default tag for Istio images.
   tag: latest
@@ -197,7 +197,7 @@ global:
   priorityClassName: ""
 
   proxy:
-    image: proxyv2
+    image: dubbo-agent
 
     # CAUTION: It is important to ensure that all Istio helm charts specify the same clusterDomain value
     # cluster domain. Default value is "cluster.local".

diff --git a/manifests/charts/istio-cni/values.yaml b/manifests/charts/istio-cni/values.yaml
@@ -73,7 +73,7 @@ global:
   # Default hub for Istio images.
   # Releases are published to docker hub under 'istio' project.
   # Dev builds from prow are on gcr.io
-  hub: gcr.io/istio-testing
+  hub: apache
 
   # Default tag for Istio images.
   tag: latest

diff --git a/manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml b/manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
@@ -85,7 +85,7 @@ data:
           }
         },
         "externalIstiod": false,
-        "hub": "gcr.io/istio-testing",
+        "hub": "apache",
         "imagePullPolicy": "",
         "imagePullSecrets": [],
         "istioNamespace": "istio-system",
@@ -119,7 +119,7 @@ data:
           "excludeInboundPorts": "",
           "excludeOutboundPorts": "",
           "holdApplicationUntilProxyStarts": false,
-          "image": "proxyv2",
+          "image": "dubbo-agent",
           "includeIPRanges": "*",
           "includeInboundPorts": "*",
           "includeOutboundPorts": "",
@@ -142,7 +142,7 @@ data:
           "tracer": "zipkin"
         },
         "proxy_init": {
-          "image": "proxyv2",
+          "image": "dubbo-agent",
           "resources": {
             "limits": {
               "cpu": "2000m",
@@ -1570,7 +1570,7 @@ spec:
         fsGroup: 1337
       containers:
         - name: discovery
-          image: "gcr.io/istio-testing/pilot:latest"
+          image: "apache/dubbo-pilot:latest"
           args:
           - "discovery"
           - --monitoringAddr=:15014

diff --git a/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml b/manifests/charts/istio-control/istio-discovery/templates/autoscale.yaml
@@ -56,4 +56,4 @@ spec:
         averageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }}
 ---
 {{- end }}
-{{- end }}
+{{- end }}
diff --git a/manifests/charts/istio-control/istio-discovery/templates/clusterrolebinding.yaml b/manifests/charts/istio-control/istio-discovery/templates/clusterrolebinding.yaml
@@ -30,4 +30,4 @@ subjects:
 - kind: ServiceAccount
   name: istiod{{- if not (eq .Values.revision "")}}-{{ .Values.revision }}{{- end }}
   namespace: {{ .Values.global.istioNamespace }}
-{{- end }}
+{{- end }}
diff --git a/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml b/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
 {{- if contains "/" .Values.pilot.image }}
           image: "{{ .Values.pilot.image }}"
 {{- else }}
-          image: "{{ .Values.pilot.hub | default .Values.global.hub }}/{{ .Values.pilot.image | default "pilot" }}:{{ .Values.pilot.tag | default .Values.global.tag }}"
+          image: "{{ .Values.pilot.hub | default .Values.global.hub }}/{{ .Values.pilot.image | default "dubbo-pilot" }}:{{ .Values.pilot.tag | default .Values.global.tag }}"
 {{- end }}
 {{- if .Values.global.imagePullPolicy }}
           imagePullPolicy: {{ .Values.global.imagePullPolicy }}

diff --git a/manifests/charts/istio-control/istio-discovery/values.yaml b/manifests/charts/istio-control/istio-discovery/values.yaml
@@ -13,7 +13,7 @@ pilot:
   tag: ""
 
   # Can be a full hub/image:tag
-  image: pilot
+  image: dubbo-pilot
   traceSampling: 1.0
 
   # Resources for a small pilot install
@@ -235,7 +235,7 @@ global:
   # Default hub for Istio images.
   # Releases are published to docker hub under 'istio' project.
   # Dev builds from prow are on gcr.io
-  hub: gcr.io/istio-testing
+  hub: apache
   # Default tag for Istio images.
   tag: latest
 
@@ -297,7 +297,7 @@ global:
   priorityClassName: ""
 
   proxy:
-    image: proxyv2
+    image: dubbo-agent
 
     # This controls the 'policy' in the sidecar injector.
     autoInject: enabled
@@ -367,7 +367,7 @@ global:
 
   proxy_init:
     # Base name for the proxy_init container, used to configure iptables.
-    image: proxyv2
+    image: dubbo-agent
     resources:
       limits:
         cpu: 2000m

diff --git a/manifests/charts/istio-operator/files/gen-operator.yaml b/manifests/charts/istio-operator/files/gen-operator.yaml
@@ -174,7 +174,7 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          image: gcr.io/istio-testing/operator:1.14-dev
+          image: apache/dubbo-operator:latest
           command:
           - operator
           - server

diff --git a/manifests/charts/istio-operator/templates/deployment.yaml b/manifests/charts/istio-operator/templates/deployment.yaml
@@ -24,7 +24,7 @@ spec:
       serviceAccountName: istio-operator{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}
       containers:
         - name: istio-operator
-          image: {{.Values.hub}}/operator:{{.Values.tag}}
+          image: {{.Values.hub}}/dubbo-operator:{{.Values.tag}}
           command:
           - operator
           - server

diff --git a/manifests/charts/istio-operator/values.yaml b/manifests/charts/istio-operator/values.yaml
@@ -1,4 +1,4 @@
-hub: gcr.io/istio-testing
+hub: apache
 tag: latest
 
 # ImagePullSecrets for operator ServiceAccount, list of secrets in the same namespace

diff --git a/manifests/charts/istiod-remote/values.yaml b/manifests/charts/istiod-remote/values.yaml
@@ -11,7 +11,7 @@ pilot:
   hub: ""
   tag: ""
   # Can be a full hub/image:tag
-  image: pilot
+  image: dubbo-pilot
   traceSampling: 1.0
   # Resources for a small pilot install
   resources:
@@ -203,7 +203,7 @@ global:
   # Default hub for Istio images.
   # Releases are published to docker hub under 'istio' project.
   # Dev builds from prow are on gcr.io
-  hub: gcr.io/istio-testing
+  hub: apache
   # Default tag for Istio images.
   tag: latest
   # Specify image pull policy if default behavior isn't desired.
@@ -256,7 +256,7 @@ global:
   # for more detail.
   priorityClassName: ""
   proxy:
-    image: proxyv2
+    image: dubbo-agent
     # This controls the 'policy' in the sidecar injector.
     autoInject: enabled
     # CAUTION: It is important to ensure that all Istio helm charts specify the same clusterDomain value
@@ -309,7 +309,7 @@ global:
     holdApplicationUntilProxyStarts: false
   proxy_init:
     # Base name for the proxy_init container, used to configure iptables.
-    image: proxyv2
+    image: dubbo-agent
     resources:
       limits:
         cpu: 2000m

diff --git a/manifests/profiles/default.yaml b/manifests/profiles/default.yaml
@@ -3,7 +3,7 @@ kind: IstioOperator
 metadata:
   namespace: istio-system
 spec:
-  hub: gcr.io/istio-testing
+  hub: apache
   tag: latest
 
   # You may override parts of meshconfig by uncommenting the following lines.
@@ -25,7 +25,7 @@ spec:
     # Istio Gateway feature
     ingressGateways:
     - name: istio-ingressgateway
-      enabled: true
+      enabled: false
     egressGateways:
     - name: istio-egressgateway
       enabled: false
@@ -52,7 +52,7 @@ spec:
       pilotCertProvider: istiod
       jwtPolicy: third-party-jwt
       proxy:
-        image: proxyv2
+        image: dubbo-agent
         clusterDomain: "cluster.local"
         resources:
           requests:
@@ -76,7 +76,7 @@ spec:
         autoInject: enabled
         tracer: "zipkin"
       proxy_init:
-        image: proxyv2
+        image: dubbo-agent
         resources:
           limits:
             cpu: 2000m
@@ -124,7 +124,7 @@ spec:
       autoscaleMin: 1
       autoscaleMax: 5
       replicaCount: 1
-      image: pilot
+      image: dubbo-pilot
       traceSampling: 1.0
       env: {}
       cpu:

diff --git a/operator/cmd/mesh/manifest-generate_test.go b/operator/cmd/mesh/manifest-generate_test.go
@@ -110,7 +110,7 @@ func TestMain(m *testing.M) {
 func TestManifestGenerateComponentHubTag(t *testing.T) {
 	g := NewWithT(t)
 
-	objs, err := runManifestCommands("component_hub_tag", "", liveCharts, []string{"templates/deployment.yaml"})
+	objs, err := runManifestCommands("component_hub_tag", "--set values.gateways.istio-ingressgateway.enabled=true", liveCharts, []string{"templates/deployment.yaml"})
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -123,12 +123,12 @@ func TestManifestGenerateComponentHubTag(t *testing.T) {
 		{
 			deploymentName: "istio-ingressgateway",
 			containerName:  "istio-proxy",
-			want:           "istio-spec.hub/proxyv2:istio-spec.tag",
+			want:           "istio-spec.hub/dubbo-agent:istio-spec.tag",
 		},
 		{
 			deploymentName: "istiod",
 			containerName:  "discovery",
-			want:           "component.pilot.hub/pilot:2",
+			want:           "component.pilot.hub/dubbo-pilot:2",
 		},
 	}
 
@@ -329,12 +329,12 @@ func TestManifestGenerateFlagsSetHubTag(t *testing.T) {
 	dobj := mustGetDeployment(g, objs, "istiod")
 
 	c := dobj.Container("discovery")
-	g.Expect(c).Should(HavePathValueEqual(PathValue{"image", "foo/pilot:bar"}))
+	g.Expect(c).Should(HavePathValueEqual(PathValue{"image", "foo/dubbo-pilot:bar"}))
 }
 
 func TestManifestGenerateFlagsSetValues(t *testing.T) {
 	g := NewWithT(t)
-	m, _, err := generateManifest("default", "-s values.global.proxy.image=myproxy -s values.global.proxy.includeIPRanges=172.30.0.0/16,172.21.0.0/16", liveCharts,
+	m, _, err := generateManifest("default", "-s values.gateways.istio-ingressgateway.enabled=true -s values.global.proxy.image=myproxy -s values.global.proxy.includeIPRanges=172.30.0.0/16,172.21.0.0/16", liveCharts,
 		[]string{"templates/deployment.yaml", "templates/istiod-injector-configmap.yaml"})
 	if err != nil {
 		t.Fatal(err)
@@ -346,7 +346,7 @@ func TestManifestGenerateFlagsSetValues(t *testing.T) {
 	dobj := mustGetDeployment(g, objs, "istio-ingressgateway")
 
 	c := dobj.Container("istio-proxy")
-	g.Expect(c).Should(HavePathValueEqual(PathValue{"image", "gcr.io/istio-testing/myproxy:latest"}))
+	g.Expect(c).Should(HavePathValueEqual(PathValue{"image", "apache/myproxy:latest"}))
 
 	cm := objs.kind("ConfigMap").nameEquals("istio-sidecar-injector").Unstructured()
 	// TODO: change values to some nicer format rather than text block.
@@ -630,7 +630,7 @@ func TestConfigSelectors(t *testing.T) {
 		"templates/autoscale.yaml",
 		"templates/serviceaccount.yaml",
 	}
-	got, err := runManifestGenerate([]string{}, "--set values.gateways.istio-egressgateway.enabled=true", liveCharts, selectors)
+	got, err := runManifestGenerate([]string{}, "--set values.gateways.istio-ingressgateway.enabled=true --set values.gateways.istio-egressgateway.enabled=true", liveCharts, selectors)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz b/operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
diff --git a/...tor/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml b/...tor/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
@@ -8251,7 +8251,7 @@ data:
           "excludeInboundPorts": "",
           "excludeOutboundPorts": "",
           "holdApplicationUntilProxyStarts": false,
-          "image": "proxyv2",
+          "image": "dubbo-agent",
           "includeIPRanges": "*",
           "includeInboundPorts": "*",
           "includeOutboundPorts": "",
@@ -8274,7 +8274,7 @@ data:
           "tracer": "zipkin"
         },
         "proxy_init": {
-          "image": "proxyv2",
+          "image": "dubbo-agent",
           "resources": {
             "limits": {
               "cpu": "2000m",
@@ -9548,7 +9548,7 @@ spec:
       serviceAccountName: istio-egressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "gcr.io/istio-testing/proxyv2:latest"
+          image: "gcr.io/istio-testing/dubbo-agent:latest"
           ports:
             - containerPort: 8080
               protocol: TCP
@@ -9792,7 +9792,7 @@ spec:
       serviceAccountName: istio-ingressgateway-service-account
       containers:
         - name: istio-proxy
-          image: "gcr.io/istio-testing/proxyv2:latest"
+          image: "gcr.io/istio-testing/dubbo-agent:latest"
           ports:
             - containerPort: 15021
               protocol: TCP
@@ -10028,7 +10028,7 @@ spec:
         fsGroup: 1337
       containers:
         - name: discovery
-          image: "gcr.io/istio-testing/pilot:latest"
+          image: "gcr.io/istio-testing/dubbo-pilot:latest"
           args:
           - "discovery"
           - --monitoringAddr=:15014