Casm 3619 (#37)

* CASM-3619: upgrade to istio 1.11.8
Cray-HPE · Feb 22, 2023 · dda0408 · dda0408
1 parent d74c42d
commit dda0408
Show file tree

Hide file tree

Showing 27 changed files with 108 additions and 83 deletions.
diff --git a/kubernetes/cray-istio-deploy/Chart.yaml b/kubernetes/cray-istio-deploy/Chart.yaml
@@ -22,7 +22,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 apiVersion: v2
-version: 1.28.0
+version: 1.29.0
 name: cray-istio-deploy
 description: Creates the IstioOperator instance that deploys the Istio control plane.
 keywords:
@@ -32,15 +32,15 @@ sources:
   - https://github.com/Cray-HPE/cray-istio
 maintainers:
   - name: bo-quan
-appVersion: 1.10.6
+appVersion: 1.11.8
 annotations:
   artifacthub.io/license: MIT
   artifacthub.io/images: |
     - name: istio-pilot-distro
-      image: artifactory.algol60.net/csm-docker/stable/istio/pilot:1.10.6-cray1-distroless
+      image: artifactory.algol60.net/csm-docker/stable/istio/pilot:1.11.8-cray1-distroless
     - name: istio-pilot-distroless
-      image: artifactory.algol60.net/csm-docker/stable/istio/pilot:1.10.6-cray1
+      image: artifactory.algol60.net/csm-docker/stable/istio/pilot:1.11.8-cray1
     - name: istio-proxy-distro
-      image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.10.6-cray1-distroless
+      image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.11.8-cray1-distroless
     - name: istio-proxy-distroless
-      image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.10.6-cray1
+      image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.11.8-cray1
diff --git a/kubernetes/cray-istio-deploy/tests/istiooperator_test.yaml b/kubernetes/cray-istio-deploy/tests/istiooperator_test.yaml
@@ -37,10 +37,10 @@ tests:
           value: artifactory.algol60.net/csm-docker/stable/istio
       - equal:
           path: spec.components.pilot.tag
-          value: 1.10.6-cray1-distroless
+          value: 1.11.8-cray1-distroless
       - equal:
           path: spec.hub
           value: artifactory.algol60.net/csm-docker/stable/istio
       - equal:
           path: spec.tag
-          value: 1.10.6-cray1-distroless
+          value: 1.11.8-cray1-distroless
diff --git a/kubernetes/cray-istio-deploy/values.yaml b/kubernetes/cray-istio-deploy/values.yaml
@@ -23,7 +23,7 @@
 #
 ---
 hub: artifactory.algol60.net/csm-docker/stable/istio
-tag: 1.10.6-cray1-distroless   # Also update the proxyv2 annotations in Chart.yaml
+tag: 1.11.8-cray1-distroless   # Also update the proxyv2 annotations in Chart.yaml
 
 kubectl:
   image:
@@ -32,7 +32,7 @@ kubectl:
 
 pilot:
   hub: artifactory.algol60.net/csm-docker/stable/istio
-  tag: 1.10.6-cray1-distroless   # Also update the pilot annotations in Chart.yaml
+  tag: 1.11.8-cray1-distroless   # Also update the pilot annotations in Chart.yaml
   resources:
     requests:
       cpu:
@@ -63,9 +63,9 @@ istio:
       autoscaleMin: 2
       autoscaleMax: 5
       ports:
-      - port: 80
+      - port: 8080
         name: http2
-      - port: 443
+      - port: 8443
         name: https
       env:
         ISTIO_META_IDLE_TIMEOUT: 10m

diff --git a/kubernetes/cray-istio-operator/Chart.yaml b/kubernetes/cray-istio-operator/Chart.yaml
@@ -22,7 +22,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 apiVersion: v2
-version: 1.25.0
+version: 1.26.0
 name: cray-istio-operator
 description: Helm chart for deploying Istio operator
 keywords:
@@ -33,14 +33,14 @@ sources:
   - https://github.com/Cray-HPE/cray-istio
 dependencies:
   - name: istio-operator
-    version: 1.10.6
+    version: 1.11.8
 maintainers:
   - name: bo-quan
-appVersion: 1.10.6
+appVersion: 1.11.8
 annotations:
   artifacthub.io/images: |
     - name: istio-operator-distroless
-      image: artifactory.algol60.net/csm-docker/stable/istio/operator:1.10.6-cray1-distroless
+      image: artifactory.algol60.net/csm-docker/stable/istio/operator:1.11.8-cray1-distroless
     - name: istio-operator-distro
-      image: artifactory.algol60.net/csm-docker/stable/istio/operator:1.10.6-cray1
+      image: artifactory.algol60.net/csm-docker/stable/istio/operator:1.11.8-cray1
   artifacthub.io/license: MIT
diff --git a/kubernetes/cray-istio-operator/README.md b/kubernetes/cray-istio-operator/README.md
@@ -1,6 +1,6 @@
 
 This deploys the Istio operator. There are instructions here:
-https://istio.io/v1.10/docs/setup/install/operator/
+https://istio.io/v1.11/docs/setup/install/operator/
 
 The istio-operator chart in the charts/ directory was copied (and modified -- see
 details below) from the istio release which is available for download at

diff --git a/kubernetes/cray-istio-operator/charts/istio-operator/Chart.yaml b/kubernetes/cray-istio-operator/charts/istio-operator/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: istio-operator
-version: 1.10.6
+version: 1.11.8
 tillerVersion: ">=2.7.2"
 description: Helm chart for deploying Istio operator
 keywords:

diff --git a/kubernetes/cray-istio-operator/charts/istio-operator/files/gen-operator.yaml b/kubernetes/cray-istio-operator/charts/istio-operator/files/gen-operator.yaml
@@ -124,6 +124,7 @@ rules:
   - namespaces
   - pods
   - pods/proxy
+  - pods/portforward
   - persistentvolumeclaims
   - secrets
   - services
@@ -181,7 +182,7 @@ spec:
       serviceAccountName: istio-operator
       containers:
         - name: istio-operator
-          image: gcr.io/istio-testing/operator:1.10-dev
+          image: gcr.io/istio-testing/operator:1.11-dev
           command:
           - operator
           - server

diff --git a/kubernetes/cray-istio-operator/charts/istio-operator/templates/clusterrole.yaml b/kubernetes/cray-istio-operator/charts/istio-operator/templates/clusterrole.yaml
@@ -106,6 +106,7 @@ rules:
   - namespaces
   - pods
   - pods/proxy
+  - pods/portforward
   - persistentvolumeclaims
   - secrets
   - services

diff --git a/kubernetes/cray-istio-operator/charts/istio-operator/values.yaml b/kubernetes/cray-istio-operator/charts/istio-operator/values.yaml
@@ -1,5 +1,5 @@
 hub: docker.io/istio
-tag: 1.10.6
+tag: 1.11.8
 
 # ImagePullSecrets for operator ServiceAccount, list of secrets in the same namespace
 # used to pull operator image. Must be set for any cluster configured with private docker registry.
@@ -27,4 +27,3 @@ operator:
     requests:
       cpu: 50m
       memory: 128Mi
-
diff --git a/kubernetes/cray-istio-operator/tests/deployment_test.yaml b/kubernetes/cray-istio-operator/tests/deployment_test.yaml
@@ -34,4 +34,4 @@ tests:
           pattern: istio-operator$
       - equal:
           path: spec.template.spec.containers[0].image
-          value: artifactory.algol60.net/csm-docker/stable/istio/operator:1.10.6-cray1-distroless
+          value: artifactory.algol60.net/csm-docker/stable/istio/operator:1.11.8-cray1-distroless
diff --git a/kubernetes/cray-istio-operator/values.yaml b/kubernetes/cray-istio-operator/values.yaml
@@ -23,7 +23,7 @@
 #
 istio-operator:
   hub: artifactory.algol60.net/csm-docker/stable/istio
-  tag: 1.10.6-cray1-distroless  # Also update the annotation in Chart.yaml
+  tag: 1.11.8-cray1-distroless  # Also update the annotation in Chart.yaml
 
 kubectl:
   image:

diff --git a/kubernetes/cray-istio/Chart.yaml b/kubernetes/cray-istio/Chart.yaml
@@ -22,7 +22,7 @@
 # OTHER DEALINGS IN THE SOFTWARE.
 #
 apiVersion: v2
-version: 2.7.0
+version: 2.8.0
 name: cray-istio
 description: Cray Istio for cluster service mesh including service gateway/sidecars, monitoring etc.
 keywords:
@@ -32,6 +32,6 @@ sources:
   - https://github.com/Cray-HPE/cray-istio
 maintainers:
   - name: bo-quan
-appVersion: 1.10.6
+appVersion: 1.11.8
 annotations:
   artifacthub.io/license: MIT
diff --git a/kubernetes/cray-istio/tests/kuttl/deployment/00-assert.yaml b/kubernetes/cray-istio/tests/kuttl/deployment/00-assert.yaml
@@ -190,13 +190,13 @@ spec:
               value: sni-dnat
             - name: ISTIO_META_CLUSTER_ID
               value: Kubernetes
-          image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.10.6-cray1-distroless
+          image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.11.8-cray1-distroless
           imagePullPolicy: IfNotPresent
           name: istio-proxy
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               protocol: TCP
-            - containerPort: 443
+            - containerPort: 8443
               protocol: TCP
             - containerPort: 15090
               name: http-envoy-prom

diff --git a/kubernetes/cray-istio/tests/kuttl/deployment/01-assert.yaml b/kubernetes/cray-istio/tests/kuttl/deployment/01-assert.yaml
@@ -190,13 +190,13 @@ spec:
               value: sni-dnat
             - name: ISTIO_META_CLUSTER_ID
               value: Kubernetes
-          image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.10.6-cray1-distroless
+          image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.11.8-cray1-distroless
           imagePullPolicy: IfNotPresent
           name: istio-proxy
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               protocol: TCP
-            - containerPort: 443
+            - containerPort: 8443
               protocol: TCP
             - containerPort: 15090
               name: http-envoy-prom

diff --git a/kubernetes/cray-istio/tests/kuttl/deployment/02-assert.yaml b/kubernetes/cray-istio/tests/kuttl/deployment/02-assert.yaml
@@ -189,13 +189,13 @@ spec:
               value: sni-dnat
             - name: ISTIO_META_CLUSTER_ID
               value: Kubernetes
-          image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.10.6-cray1-distroless
+          image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.11.8-cray1-distroless
           imagePullPolicy: IfNotPresent
           name: istio-proxy
           ports:
-            - containerPort: 80
+            - containerPort: 8080
               protocol: TCP
-            - containerPort: 443
+            - containerPort: 8443
               protocol: TCP
             - containerPort: 8888
               protocol: TCP

diff --git a/kubernetes/cray-istio/tests/kuttl/deployment/03-assert.yaml b/kubernetes/cray-istio/tests/kuttl/deployment/03-assert.yaml
@@ -197,13 +197,13 @@ spec:
           value: sni-dnat
         - name: ISTIO_META_CLUSTER_ID
           value: Kubernetes
-        image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.10.6-cray1-distroless
+        image: artifactory.algol60.net/csm-docker/stable/istio/proxyv2:1.11.8-cray1-distroless
         imagePullPolicy: IfNotPresent
         name: istio-proxy
         ports:
-        - containerPort: 80
+        - containerPort: 8080
           protocol: TCP
-        - containerPort: 443
+        - containerPort: 8443
           protocol: TCP
         - containerPort: 8081
           protocol: TCP

diff --git a/kubernetes/cray-istio/tests/kuttl/gateways/00-assert.yaml b/kubernetes/cray-istio/tests/kuttl/gateways/00-assert.yaml
@@ -39,15 +39,15 @@ spec:
     - '*'
     port:
       name: http
-      number: 80
+      number: 8080
       protocol: HTTP
     tls:
       httpsRedirect: true
   - hosts:
     - '*'
     port:
-      name: https-443
-      number: 443
+      name: https
+      number: 8443
       protocol: HTTPS
     tls:
       credentialName: ingress-gateway-cert

diff --git a/kubernetes/cray-istio/tests/kuttl/gateways/01-assert.yaml b/kubernetes/cray-istio/tests/kuttl/gateways/01-assert.yaml
@@ -39,13 +39,13 @@ spec:
     - '*'
     port:
       name: http
-      number: 80
+      number: 8080
       protocol: HTTP
   - hosts:
     - '*'
     port:
-      name: https-443
-      number: 443
+      name: https
+      number: 8443
       protocol: HTTPS
     tls:
       credentialName: ingress-gateway-cert

diff --git a/kubernetes/cray-istio/tests/kuttl/gateways/02-assert.yaml b/kubernetes/cray-istio/tests/kuttl/gateways/02-assert.yaml
@@ -39,13 +39,13 @@ spec:
     - '*'
     port:
       name: http
-      number: 80
+      number: 8080
       protocol: HTTP
   - hosts:
     - '*'
     port:
-      name: https-443
-      number: 443
+      name: https
+      number: 8443
       protocol: HTTPS
     tls:
       credentialName: ingress-gateway-cert

diff --git a/kubernetes/cray-istio/tests/kuttl/gateways/03-assert.yaml b/kubernetes/cray-istio/tests/kuttl/gateways/03-assert.yaml
@@ -39,13 +39,13 @@ spec:
     - '*'
     port:
       name: http
-      number: 80
+      number: 8080
       protocol: HTTP
   - hosts:
     - '*'
     port:
-      name: https-443
-      number: 443
+      name: https
+      number: 8443
       protocol: HTTPS
     tls:
       credentialName: ingress-gateway-cert

diff --git a/kubernetes/cray-istio/tests/kuttl/services/00-assert.yaml b/kubernetes/cray-istio/tests/kuttl/services/00-assert.yaml
@@ -40,11 +40,11 @@ spec:
   - name: http2
     port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: 8080
   - name: https
     port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: 8443
   selector:
     app: istio-ingressgateway-customer-user
     istio: ingressgateway-customer-user

diff --git a/kubernetes/cray-istio/tests/kuttl/services/01-assert.yaml b/kubernetes/cray-istio/tests/kuttl/services/01-assert.yaml
@@ -40,11 +40,11 @@ spec:
   - name: http2
     port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: 8080
   - name: https
     port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: 8443
   selector:
     app: istio-ingressgateway
     istio: ingressgateway

diff --git a/kubernetes/cray-istio/tests/kuttl/services/02-assert.yaml b/kubernetes/cray-istio/tests/kuttl/services/02-assert.yaml
@@ -40,11 +40,11 @@ spec:
   - name: http2
     port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: 8080
   - name: https
     port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: 8443
   - name: cloudinit
     port: 8888
     protocol: TCP

diff --git a/kubernetes/cray-istio/tests/kuttl/services/03-assert.yaml b/kubernetes/cray-istio/tests/kuttl/services/03-assert.yaml
@@ -39,11 +39,11 @@ spec:
   - name: http2
     port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: 8080
   - name: https
     port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: 8443
   - name: tls-spire
     port: 8081
     protocol: TCP

diff --git a/kubernetes/cray-istio/tests/kuttl/services/04-assert.yaml b/kubernetes/cray-istio/tests/kuttl/services/04-assert.yaml
@@ -40,11 +40,11 @@ spec:
   - name: http2
     port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: 8080
   - name: https
     port: 443
     protocol: TCP
-    targetPort: 443
+    targetPort: 8443
   selector:
     app: istio-ingressgateway-customer-user
     istio: ingressgateway-customer-user