This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git
The following commit(s) were added to refs/heads/develop by this push:
new 287bbeb6 image hub set (#483)
287bbeb6 is described below
commit 287bbeb6258ee492c479a87eddc056284dfe9411
Author: bobtthp <[email protected]>
AuthorDate: Thu Sep 8 18:57:25 2022 +0800
image hub set (#483)
Co-authored-by: bobtthp <[email protected]>
Co-authored-by: Albumen Kevin <[email protected]>
---
manifests/charts/gateway/Chart.yaml | 2 +-
manifests/charts/gateway/values.yaml | 2 +-
.../istio-egress/templates/deployment.yaml | 4 ++--
manifests/charts/gateways/istio-egress/values.yaml | 4 ++--
.../istio-ingress/templates/deployment.yaml | 4 ++--
.../charts/gateways/istio-ingress/values.yaml | 4 ++--
manifests/charts/istio-cni/values.yaml | 2 +-
.../istio-discovery/files/gen-istio.yaml | 8 ++++----
.../istio-discovery/templates/autoscale.yaml | 2 +-
.../templates/clusterrolebinding.yaml | 2 +-
.../istio-discovery/templates/deployment.yaml | 2 +-
.../istio-control/istio-discovery/values.yaml | 8 ++++----
.../charts/istio-operator/files/gen-operator.yaml | 2 +-
.../istio-operator/templates/deployment.yaml | 2 +-
manifests/charts/istio-operator/values.yaml | 2 +-
manifests/charts/istiod-remote/values.yaml | 8 ++++----
manifests/profiles/default.yaml | 10 +++++-----
operator/cmd/mesh/manifest-generate_test.go | 14 +++++++-------
.../manifest-generate/data-snapshot.tar.gz | Bin 195720 -> 194828 bytes
.../all_on.golden-show-in-gh-pull-request.yaml | 10 +++++-----
.../output/flag_output.golden.yaml | 2 +-
.../output/helm_values_enablement.golden.yaml | 2 +-
.../output/ingressgateway_k8s_settings.golden.yaml | 4 ++--
.../output/install_package_path.golden.yaml | 2 +-
.../output/pilot_default.golden.yaml | 6 +++---
.../output/pilot_k8s_settings.golden.yaml | 2 +-
.../output/pilot_override_kubernetes.golden.yaml | 2 +-
.../output/pilot_override_values.golden.yaml | 2 +-
.../output/sidecar_template.golden.yaml | 4 ++--
.../mesh/testdata/profile-dump/output/all_off.txt | 6 +++---
.../mesh/testdata/profile-dump/output/all_off.yaml | 6 +++---
31 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/manifests/charts/gateway/Chart.yaml
b/manifests/charts/gateway/Chart.yaml
index f3db496f..1a916402 100644
--- 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
\ No newline at end of file
+- gateways
diff --git a/manifests/charts/gateway/values.yaml
b/manifests/charts/gateway/values.yaml
index e054afb8..9967b532 100644
--- 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: []
\ No newline at end of file
+imagePullSecrets: []
diff --git a/manifests/charts/gateways/istio-egress/templates/deployment.yaml
b/manifests/charts/gateways/istio-egress/templates/deployment.yaml
index 1ae2f485..28da7bb2 100644
--- 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
index d87598a1..1f2ce216 100644
--- 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
index d7df2a90..d56416e0 100644
--- 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
index cc91056c..263a36f2 100644
--- 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
index 0ec1e217..cbaa9d55 100644
--- 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
index 540b6f6f..f8016402 100644
--- 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
index 4069bbde..2edcc745 100644
--- 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 }}
\ No newline at end of file
+{{- end }}
diff --git
a/manifests/charts/istio-control/istio-discovery/templates/clusterrolebinding.yaml
b/manifests/charts/istio-control/istio-discovery/templates/clusterrolebinding.yaml
index f6e42521..e7235dbb 100644
---
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 }}
\ No newline at end of file
+{{- end }}
diff --git
a/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
b/manifests/charts/istio-control/istio-discovery/templates/deployment.yaml
index 3dca9a22..4c1bc352 100644
--- 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
index bda4e46f..32fae67c 100644
--- 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
index 30ffcbb1..c742e223 100644
--- 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
index 688fa1d4..22381594 100644
--- 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
index 3b2d9122..991917e2 100644
--- 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
index e8d4b130..a4797575 100644
--- 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
index 07012cb3..66db471b 100644
--- 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
index 1397e3e0..65e2175a 100644
--- 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
index ec41a9be..87511701 100644
Binary files
a/operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz and
b/operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz differ
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
index 29c0ac67..61bd1c69 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
+++
b/operator/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
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/flag_output.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/flag_output.golden.yaml
index 9d0af43f..cca97cd4 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/flag_output.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/flag_output.golden.yaml
@@ -37,7 +37,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
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/helm_values_enablement.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/helm_values_enablement.golden.yaml
index f0b1dfe4..6bc6a976 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/helm_values_enablement.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/helm_values_enablement.golden.yaml
@@ -47,7 +47,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
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/ingressgateway_k8s_settings.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/ingressgateway_k8s_settings.golden.yaml
index a572541a..19919043 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/ingressgateway_k8s_settings.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/ingressgateway_k8s_settings.golden.yaml
@@ -137,7 +137,7 @@ spec:
value: "true"
- name: ISTIO_META_CLUSTER_ID
value: Kubernetes
- image: gcr.io/istio-testing/proxyv2:latest
+ image: gcr.io/istio-testing/dubbo-agent:latest
name: istio-proxy
ports:
- containerPort: 15021
@@ -298,7 +298,7 @@ spec:
serviceAccountName: istio-ingressgateway-custom-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
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/install_package_path.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/install_package_path.golden.yaml
index 06e21f5b..a4b1e460 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/install_package_path.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/install_package_path.golden.yaml
@@ -37,7 +37,7 @@ spec:
fsGroup: 1337
containers:
- name: discovery
- image: "docker.io/istio/pilot:1.1.4"
+ image: "docker.io/istio/dubbo-pilot:1.1.4"
args:
- "discovery"
- --monitoringAddr=:15014
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
index 5329aac9..6e61e737 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
@@ -1539,7 +1539,7 @@ data:
"excludeInboundPorts": "",
"excludeOutboundPorts": "",
"holdApplicationUntilProxyStarts": false,
- "image": "proxyv2",
+ "image": "dubbo-agent",
"includeIPRanges": "*",
"includeInboundPorts": "*",
"includeOutboundPorts": "",
@@ -1562,7 +1562,7 @@ data:
"tracer": "zipkin"
},
"proxy_init": {
- "image": "proxyv2",
+ "image": "dubbo-agent",
"resources": {
"limits": {
"cpu": "2000m",
@@ -2826,7 +2826,7 @@ spec:
fsGroup: 1337
containers:
- name: discovery
- image: "docker.io/istio/pilot:1.1.4"
+ image: "docker.io/istio/dubbo-pilot:1.1.4"
args:
- "discovery"
- --monitoringAddr=:15014
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.golden.yaml
index d2fd8522..984c7edb 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_k8s_settings.golden.yaml
@@ -81,7 +81,7 @@ spec:
value: "false"
- name: CLUSTER_ID
value: Kubernetes
- image: docker.io/istio/pilot:1.1.4
+ image: docker.io/istio/dubbo-pilot:1.1.4
name: discovery
ports:
- containerPort: 8080
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.golden.yaml
index a778ebc1..b4507e59 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_kubernetes.golden.yaml
@@ -247,7 +247,7 @@ spec:
value: "false"
- name: CLUSTER_ID
value: Kubernetes
- image: docker.io/istio/pilot:1.1.4
+ image: docker.io/istio/dubbo-pilot:1.1.4
name: discovery
ports:
- containerPort: 1234
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.golden.yaml
index c50e1074..abc77dac 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/pilot_override_values.golden.yaml
@@ -77,7 +77,7 @@ spec:
value: "false"
- name: CLUSTER_ID
value: Kubernetes
- image: docker.io/istio/pilot:1.1.4
+ image: docker.io/istio/dubbo-pilot:1.1.4
name: discovery
ports:
- containerPort: 8080
diff --git
a/operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
b/operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
index 5b5d780d..204b857f 100644
---
a/operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
+++
b/operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
@@ -64,7 +64,7 @@ data:
"excludeInboundPorts": "",
"excludeOutboundPorts": "",
"holdApplicationUntilProxyStarts": false,
- "image": "proxyv2",
+ "image": "dubbo-agent",
"includeIPRanges": "*",
"includeInboundPorts": "*",
"includeOutboundPorts": "",
@@ -87,7 +87,7 @@ data:
"tracer": "zipkin"
},
"proxy_init": {
- "image": "proxyv2",
+ "image": "dubbo-agent",
"resources": {
"limits": {
"cpu": "2000m",
diff --git a/operator/cmd/mesh/testdata/profile-dump/output/all_off.txt
b/operator/cmd/mesh/testdata/profile-dump/output/all_off.txt
index 58ac90f3..77f957d9 100644
--- a/operator/cmd/mesh/testdata/profile-dump/output/all_off.txt
+++ b/operator/cmd/mesh/testdata/profile-dump/output/all_off.txt
@@ -56,7 +56,7 @@ values.global.proxy.enableCoreDump=false
values.global.proxy.excludeIPRanges=""
values.global.proxy.excludeInboundPorts=""
values.global.proxy.excludeOutboundPorts=""
-values.global.proxy.image="proxyv2"
+values.global.proxy.image="dubbo-agent"
values.global.proxy.includeIPRanges="*"
values.global.proxy.logLevel="warning"
values.global.proxy.privileged=false
@@ -69,7 +69,7 @@ values.global.proxy.resources.requests.cpu="100m"
values.global.proxy.resources.requests.memory="128Mi"
values.global.proxy.statusPort=15020
values.global.proxy.tracer="zipkin"
-values.global.proxy_init.image="proxyv2"
+values.global.proxy_init.image="dubbo-agent"
values.global.proxy_init.resources.limits.cpu="2000m"
values.global.proxy_init.resources.limits.memory="1024Mi"
values.global.proxy_init.resources.requests.cpu="10m"
@@ -85,7 +85,7 @@ values.pilot.configMap=true
values.pilot.cpu.targetAverageUtilization=80
values.pilot.enableProtocolSniffingForInbound=true
values.pilot.enableProtocolSniffingForOutbound=true
-values.pilot.image="pilot"
+values.pilot.image="dubbo-pilot"
values.pilot.keepaliveMaxServerConnectionAge="30m"
values.pilot.replicaCount=1
values.pilot.traceSampling=1
diff --git a/operator/cmd/mesh/testdata/profile-dump/output/all_off.yaml
b/operator/cmd/mesh/testdata/profile-dump/output/all_off.yaml
index 84756642..a9609f1c 100644
--- a/operator/cmd/mesh/testdata/profile-dump/output/all_off.yaml
+++ b/operator/cmd/mesh/testdata/profile-dump/output/all_off.yaml
@@ -90,7 +90,7 @@ spec:
excludeIPRanges: ""
excludeInboundPorts: ""
excludeOutboundPorts: ""
- image: proxyv2
+ image: dubbo-agent
includeIPRanges: '*'
logLevel: warning
privileged: false
@@ -107,7 +107,7 @@ spec:
statusPort: 15020
tracer: zipkin
proxy_init:
- image: proxyv2
+ image: dubbo-agent
resources:
limits:
cpu: 2000m
@@ -138,7 +138,7 @@ spec:
enableProtocolSniffingForInbound: true
enableProtocolSniffingForOutbound: true
env: {}
- image: pilot
+ image: dubbo-pilot
keepaliveMaxServerConnectionAge: 30m
nodeSelector: {}
podLabels: {}
