stolostron · morvencao · Nov 3, 2021
diff --git a/istio-multicluster-servicemesh/2-bookinfo-destinationrule/destination-rule-all.yaml b/istio-multicluster-servicemesh/2-bookinfo-destinationrule/destination-rule-all.yaml
diff --git a/istio-multicluster-servicemesh/3-bookinfo-virtualservices-all-v1/virtual-service-all-v1.yaml b/istio-multicluster-servicemesh/3-bookinfo-virtualservices-all-v1/virtual-service-all-v1.yaml
diff --git a/...uster-servicemesh/4-bookinfo-virtualservices-v2-test/virtual-service-reviews-test-v2.yaml b/...uster-servicemesh/4-bookinfo-virtualservices-v2-test/virtual-service-reviews-test-v2.yaml
diff --git a/...lticluster-servicemesh/5-bookinfo-virtualservice-50-v3/virtual-service-reviews-50-v3.yaml b/...lticluster-servicemesh/5-bookinfo-virtualservice-50-v3/virtual-service-reviews-50-v3.yaml
diff --git a/...ulticluster-servicemesh/6-bookinfo-virtualservices-all-v3/virtual-service-reviews-v3.yaml b/...ulticluster-servicemesh/6-bookinfo-virtualservices-all-v3/virtual-service-reviews-v3.yaml
diff --git a/.../1-bookinfo-gateway/bookinfo-gateway.yaml → ...sh/bookinfo-gateway/bookinfo-gateway.yaml b/.../1-bookinfo-gateway/bookinfo-gateway.yaml → ...sh/bookinfo-gateway/bookinfo-gateway.yaml
diff --git a/istio-multicluster-servicemesh/bookinfo-gateway/namespace.yaml b/istio-multicluster-servicemesh/bookinfo-gateway/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-apps
+  labels:
+    istio-injection: enabled
diff --git a/istio-multicluster-servicemesh/bookinfo-mc1/bookinfo-mc1.yaml b/istio-multicluster-servicemesh/bookinfo-mc1/bookinfo-mc1.yaml
@@ -1,31 +1,3 @@
-# Copyright Istio Authors
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-##################################################################################################
-# This file defines the services, service accounts, and deployments for the Bookinfo sample.
-#
-# To apply all 4 Bookinfo services, their corresponding service accounts, and deployments:
-#
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml
-#
-# Alternatively, you can deploy any resource separately:
-#
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -l service=reviews # reviews Service
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -l account=reviews # reviews ServiceAccount
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -l app=reviews,version=v3 # reviews-v3 Deployment
-##################################################################################################
-
 ##################################################################################################
 # Details service
 ##################################################################################################

diff --git a/istio-multicluster-servicemesh/bookinfo-mc1/namespace.yaml b/istio-multicluster-servicemesh/bookinfo-mc1/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-apps
+  labels:
+    istio-injection: enabled
diff --git a/istio-multicluster-servicemesh/bookinfo-mc1/networkattachmentdefinition.yaml b/istio-multicluster-servicemesh/bookinfo-mc1/networkattachmentdefinition.yaml
@@ -0,0 +1,4 @@
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+  name: istio-cni
diff --git a/istio-multicluster-servicemesh/bookinfo-mc2/bookinfo-mc2.yaml b/istio-multicluster-servicemesh/bookinfo-mc2/bookinfo-mc2.yaml
@@ -1,31 +1,3 @@
-# Copyright Istio Authors
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
-##################################################################################################
-# This file defines the services, service accounts, and deployments for the Bookinfo sample.
-#
-# To apply all 4 Bookinfo services, their corresponding service accounts, and deployments:
-#
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml
-#
-# Alternatively, you can deploy any resource separately:
-#
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -l service=reviews # reviews Service
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -l account=reviews # reviews ServiceAccount
-#   kubectl apply -f samples/bookinfo/platform/kube/bookinfo.yaml -l app=reviews,version=v3 # reviews-v3 Deployment
-##################################################################################################
-
 ##################################################################################################
 # Ratings service
 ##################################################################################################

diff --git a/istio-multicluster-servicemesh/bookinfo-mc2/namespace.yaml b/istio-multicluster-servicemesh/bookinfo-mc2/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-apps
+  labels:
+    istio-injection: enabled
diff --git a/istio-multicluster-servicemesh/bookinfo-mc2/networkattachmentdefinition.yaml b/istio-multicluster-servicemesh/bookinfo-mc2/networkattachmentdefinition.yaml
@@ -0,0 +1,4 @@
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+  name: istio-cni
diff --git a/...erator-gw/istio-ingressgateway-route.yaml → ...o-gateway/istio-ingressgateway-route.yaml b/...erator-gw/istio-ingressgateway-route.yaml → ...o-gateway/istio-ingressgateway-route.yaml
@@ -5,7 +5,6 @@ metadata:
     app: istio-ingressgateway
     istio: ingressgateway
   name: ingressgateway
-  namespace: istio-apps
 spec:
   port:
     targetPort: http2

diff --git a/istio-multicluster-servicemesh/istio-gateway/istio-operator.yaml b/istio-multicluster-servicemesh/istio-gateway/istio-operator.yaml
@@ -0,0 +1,32 @@
+apiVersion: install.istio.io/v1alpha1
+kind: IstioOperator
+metadata:
+  name: istio-ingress
+spec:
+  profile: empty
+  components:
+    ingressGateways:
+    - name: ingressgateway
+      namespace: istio-apps
+      enabled: true
+      label:
+        istio: ingressgateway
+      k8s:
+        service:
+          ports:
+            - port: 15021
+              targetPort: 15021
+              name: status-port
+            - port: 80
+              targetPort: 8080
+              name: http2
+            - port: 443
+              targetPort: 8443
+              name: https
+            - port: 31400
+              targetPort: 31400
+              name: tcp
+  values:
+    gateways:
+      istio-ingressgateway:
+        injectionTemplate: gateway
diff --git a/istio-multicluster-servicemesh/istio-gateway/namespace.yaml b/istio-multicluster-servicemesh/istio-gateway/namespace.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: istio-apps
+  labels:
+    istio-injection: enabled
diff --git a/istio-multicluster-servicemesh/istio-gateway/networkattachmentdefinition.yaml b/istio-multicluster-servicemesh/istio-gateway/networkattachmentdefinition.yaml
@@ -0,0 +1,4 @@
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+  name: istio-cni
diff --git a/...sh/istio-operator-hub/istio-operator.yaml → ...stio-multicluster-hub/istio-operator.yaml b/...sh/istio-operator-hub/istio-operator.yaml → ...stio-multicluster-hub/istio-operator.yaml
@@ -1,7 +1,7 @@
 apiVersion: install.istio.io/v1alpha1
 kind: IstioOperator
 metadata:
-  name: istio-hub
+  name: istio-controlplane-hub
   namespace: istio-system
 spec:
   profile: empty
@@ -62,8 +62,11 @@ spec:
       operatorManageWebhooks: true
       meshID: mesh1
       multiCluster:
-        clusterName: mcscluster1
+        clusterName: local-cluster
       network: network1
+      tracer:
+        zipkin:
+          address: zipkin.istio-system.svc.clusterset.local:9411
     cni:
       cniBinDir: /var/lib/cni/bin
       cniConfDir: /etc/cni/multus/net.d

diff --git a/...o-operator-hub/istiod-serrviceexport.yaml → ...lticluster-hub/istiod-serrviceexport.yaml b/...o-operator-hub/istiod-serrviceexport.yaml → ...lticluster-hub/istiod-serrviceexport.yaml
@@ -3,3 +3,5 @@ kind: ServiceExport
 metadata:
   name: istiod
   namespace: istio-system
+  labels:
+    app: istiod
diff --git a/istio-multicluster-servicemesh/istio-multicluster-hub/jeager-route.yaml b/istio-multicluster-servicemesh/istio-multicluster-hub/jeager-route.yaml
@@ -0,0 +1,15 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: jeager
+  namespace: istio-system
+  labels:
+    app: jaeger
+spec:
+  to:
+    kind: Service
+    name: tracing
+    weight: 100
+  port:
+    targetPort: http-query
+  wildcardPolicy: None
diff --git a/istio-multicluster-servicemesh/istio-multicluster-hub/jeager-serviceexport.yaml b/istio-multicluster-servicemesh/istio-multicluster-hub/jeager-serviceexport.yaml
@@ -0,0 +1,7 @@
+apiVersion: multicluster.x-k8s.io/v1alpha1
+kind: ServiceExport
+metadata:
+  name: zipkin
+  namespace: istio-system
+  labels:
+    app: jaeger