feat(istio): Upgrade to 1.20.2 (#1475)

* feat(istio): Upgrade to 1.20.2 * chore: copy upstream chart 1.20.2 * chore: copy upstream chart grafana dashboards 1.20.2 * chore: apply patch_1_values.sh * chore: apply patch_2_templates.sh * chore: apply patch_3_chartyaml.sh * chore: apply patch_4_deployment.sh * fix(istio): Remove bcmendoza from maintainers * chore: copy upstream chart 1.20.2 * chore: apply patch_1_values.sh * chore: apply patch_2_templates.sh * chore: apply patch_3_chartyaml.sh * chore: apply patch_4_deployment.sh
mesosphere · Jan 18, 2024 · 14ef4f7 · 14ef4f7
1 parent 38f227b
commit 14ef4f7
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 33 deletions.
diff --git a/staging/istio/Chart.yaml b/staging/istio/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: istio
-version: 1.17.2
-appVersion: 1.17.2
+version: 1.20.2
+appVersion: 1.20.2
 description: Helm chart for deploying Istio operator
 keywords:
   - istio
@@ -12,7 +12,6 @@ engine: gotpl
 icon: https://istio.io/latest/favicons/android-192x192.png
 maintainers:
   - name: goeldeepak
-  - name: bcmendoza
   - name: gracedo
 dependencies:
   - name: grafana

diff --git a/staging/istio/charts/grafana/dashboards/istio-service-dashboard.json b/staging/istio/charts/grafana/dashboards/istio-service-dashboard.json
@@ -2831,9 +2831,9 @@
         "multi": false,
         "name": "service",
         "options": [],
-        "query": "label_values(destination_service)",
+        "query": "query_result(sum(istio_requests_total{}) by (destination_service) or sum(istio_tcp_sent_bytes_total{}) by (destination_service))",
         "refresh": 1,
-        "regex": "",
+        "regex": "/.*destination_service=\"([^\"]*).*/",
         "skipUrlSync": false,
         "sort": 0,
         "tagValuesQuery": "",
@@ -2856,16 +2856,15 @@
         "label": "Reporter",
         "multi": true,
         "name": "qrep",
-        "options": [],
-        "query": "label_values(reporter)",
+        "query": "source,destination",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
         "sort": 1,
         "tagValuesQuery": "",
         "tags": [],
         "tagsQuery": "",
-        "type": "query",
+        "type": "custom",
         "useTags": false
       },
       {

diff --git a/staging/istio/charts/grafana/dashboards/istio-workload-dashboard.json b/staging/istio/charts/grafana/dashboards/istio-workload-dashboard.json
@@ -2560,16 +2560,15 @@
         "label": "Reporter",
         "multi": true,
         "name": "qrep",
-        "options": [],
-        "query": "label_values(reporter)",
+        "query": "source,destination",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,
         "sort": 2,
         "tagValuesQuery": "",
         "tags": [],
         "tagsQuery": "",
-        "type": "query",
+        "type": "custom",
         "useTags": false
       },
       {

diff --git a/staging/istio/charts/grafana/dashboards/pilot-dashboard.json b/staging/istio/charts/grafana/dashboards/pilot-dashboard.json
@@ -1002,29 +1002,13 @@
           "legendFormat": "Inbound Listeners",
           "refId": "B"
         },
-        {
-          "expr": "pilot_conflict_outbound_listener_http_over_current_tcp{app=\"istiod\"}",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 1,
-          "legendFormat": "Outbound Listeners (http over current tcp)",
-          "refId": "A"
-        },
         {
           "expr": "pilot_conflict_outbound_listener_tcp_over_current_tcp{app=\"istiod\"}",
           "format": "time_series",
           "hide": false,
           "intervalFactor": 1,
           "legendFormat": "Outbound Listeners (tcp over current tcp)",
           "refId": "C"
-        },
-        {
-          "expr": "pilot_conflict_outbound_listener_tcp_over_current_http{app=\"istiod\"}",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 1,
-          "legendFormat": "Outbound Listeners (tcp over current http)",
-          "refId": "D"
         }
       ],
       "thresholds": [],

diff --git a/staging/istio/patch/patches/3_chartyaml.patch b/staging/istio/patch/patches/3_chartyaml.patch
@@ -21,13 +21,12 @@ index cb1613b6dc..7f05e5acce 100644
  description: Helm chart for deploying Istio operator
  keywords:
    - istio
-@@ -13,3 +10,17 @@ sources:
+@@ -13,3 +10,16 @@ sources:
    - https://github.com/istio/istio/tree/master/operator
  engine: gotpl
  icon: https://istio.io/latest/favicons/android-192x192.png
 +maintainers:
 +  - name: goeldeepak
-+  - name: bcmendoza
 +  - name: gracedo
 +dependencies:
 +  - name: grafana

diff --git a/staging/istio/templates/deployment.yaml b/staging/istio/templates/deployment.yaml
@@ -42,8 +42,6 @@ spec:
               - ALL
             privileged: false
             readOnlyRootFilesystem: true
-            runAsGroup: 1337
-            runAsUser: 1337
             runAsNonRoot: true
 {{- if .Values.operator.seccompProfile }}
             seccompProfile:

diff --git a/staging/istio/upgrade_operator.sh b/staging/istio/upgrade_operator.sh
@@ -15,7 +15,7 @@ [email protected]:istio/istio.git
 ISTIO_PATH=manifests/charts/istio-operator
 ISTIO_DASHBOARDS_PATH=manifests/addons/dashboards
 FORK_DASHBOARDS_PATH=charts/grafana/dashboards
-ISTIO_TAG=1.17.2
+ISTIO_TAG=1.20.2
 TMPDIR=$(mktemp -d)
 STARTING_REV=$(git rev-parse HEAD)
 export STARTING_REV

diff --git a/staging/istio/values.yaml b/staging/istio/values.yaml
@@ -18,7 +18,7 @@ prometheus:
 istioOperator:
   profile: default
   hub: docker.io/istio
-  tag: 1.17.2
+  tag: 1.20.2
   components:
     cni:
       enabled: true