Merge pull request #67 from nautible/feature/istio-1.18

Feature/istio 1.18
nautible · Jul 26, 2023 · 2dabfdc · 2dabfdc
2 parents b1203c6 + 0a6176b
commit 2dabfdc
Show file tree

Hide file tree

Showing 11 changed files with 166 additions and 121 deletions.
diff --git a/service-mesh/base/grafana/base/grafana.yaml b/service-mesh/base/grafana/base/grafana.yaml
diff --git a/service-mesh/base/istio-base/application.yaml b/service-mesh/base/istio-base/application.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     path: 'manifests/charts/base'
     repoURL: 'https://github.com/istio/istio'
-    targetRevision: 1.13.3
+    targetRevision: 1.18.1
   project: default
   syncPolicy:
     automated:

diff --git a/service-mesh/base/istio-egress/application.yaml b/service-mesh/base/istio-egress/application.yaml
@@ -10,13 +10,13 @@ spec:
   source:
     path: 'manifests/charts/gateways/istio-egress'
     repoURL: 'https://github.com/istio/istio'
-    targetRevision: 1.13.3
+    targetRevision: 1.18.1
     helm:
       parameters:
         - name: 'global.hub'
           value: 'docker.io/istio'
         - name: 'global.tag'
-          value: '1.13.3'
+          value: '1.18.1'
   project: default
   syncPolicy:
     automated:

diff --git a/service-mesh/base/istio-ingress/application.yaml b/service-mesh/base/istio-ingress/application.yaml
@@ -10,13 +10,13 @@ spec:
   source:
     path: 'manifests/charts/gateways/istio-ingress'
     repoURL: 'https://github.com/istio/istio'
-    targetRevision: 1.13.3
+    targetRevision: 1.18.1
     helm:
       parameters:
         - name: 'global.hub'
           value: 'docker.io/istio'
         - name: 'global.tag'
-          value: '1.13.3'
+          value: '1.18.1'
   project: default
   syncPolicy:
     automated:

diff --git a/service-mesh/base/istio-operator/application.yaml b/service-mesh/base/istio-operator/application.yaml
@@ -10,14 +10,14 @@ spec:
     namespace: istio-operator
   source:
     repoURL: 'https://github.com/istio/istio'
-    targetRevision: 1.13.3
+    targetRevision: 1.18.1
     path: 'manifests/charts/istio-operator'
     helm:
       parameters:
         - name: 'hub'
           value: 'docker.io/istio'
         - name: 'tag'
-          value: '1.13.3'
+          value: '1.18.1'
   syncPolicy:
     automated:
       prune: true

diff --git a/service-mesh/base/istiod/application.yaml b/service-mesh/base/istiod/application.yaml
@@ -10,13 +10,13 @@ spec:
   source:
     path: 'manifests/charts/istio-control/istio-discovery'
     repoURL: 'https://github.com/istio/istio'
-    targetRevision: 1.13.3
+    targetRevision: 1.18.1
     helm:
       parameters:
         - name: 'global.hub'
           value: 'docker.io/istio'
         - name: 'global.tag'
-          value: '1.13.3'
+          value: '1.18.1'
         # Enable Envoy's access logging
         # https://istio.io/latest/docs/tasks/observability/logs/access-log/
         - name: 'meshConfig.accessLogFile'

diff --git a/service-mesh/base/jaeger/application.yaml b/service-mesh/base/jaeger/application.yaml
@@ -11,7 +11,7 @@ spec:
   source:
     path: service-mesh/base/jaeger/base
     repoURL: https://github.com/nautible/nautible-plugin
-    targetRevision: develop
+    targetRevision: feature/istio-1.18
   syncPolicy:
     automated:
       prune: true
diff --git a/service-mesh/base/jaeger/base/jaeger.yaml b/service-mesh/base/jaeger/base/jaeger.yaml
@@ -13,14 +13,14 @@ spec:
     metadata:
       labels:
         app: jaeger
-      annotations:
         sidecar.istio.io/inject: "false"
+      annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "14269"
     spec:
       containers:
         - name: jaeger
-          image: "docker.io/jaegertracing/all-in-one:1.29"
+          image: "docker.io/jaegertracing/all-in-one:1.35"
           env:
             - name: BADGER_EPHEMERAL
               value: "false"

diff --git a/service-mesh/base/kiali/application.yaml b/service-mesh/base/kiali/application.yaml
@@ -11,7 +11,7 @@ spec:
   source:
     path: service-mesh/base/kiali/base
     repoURL: https://github.com/nautible/nautible-plugin
-    targetRevision: develop
+    targetRevision: feature/istio-1.18
   syncPolicy:
     automated:
       prune: true