Merge pull request #17 from msfidelis/artigo/argo

Inicial do artigo sobre argo rollouts
msfidelis · Mar 29, 2023 · 6f0a2c3 · 6f0a2c3
2 parents 8f4dc86 + 43bb3c6
commit 6f0a2c3
Show file tree

Hide file tree

Showing 16 changed files with 454 additions and 155 deletions.
diff --git a/helm/istio/istio-kiali/templates/grafana-deployment.yaml b/helm/istio/istio-kiali/templates/grafana-deployment.yaml
@@ -1,14 +1,15 @@
 ---
+# Source: grafana/templates/deployment.yaml
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: grafana
   namespace: istio-system
   labels:
-    helm.sh/chart: grafana-5.8.10
+    helm.sh/chart: grafana-6.31.1
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "7.2.1"
+    app.kubernetes.io/version: "9.0.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   replicas: 1
@@ -25,21 +26,23 @@ spec:
         app.kubernetes.io/name: grafana
         app.kubernetes.io/instance: grafana
         app: grafana
+        sidecar.istio.io/inject: "false"
       annotations:
-        checksum/config: d2485b1ee9f9be63381c231826a43742bb10ebac2964bdc3f22a100eab9d032c
+        checksum/config: 00cbea6713b515cc981941cb5cc4004e842e678e23fbb177bff4d890ac2d71da
         checksum/dashboards-json-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
         checksum/sc-dashboard-provider-config: 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
-        sidecar.istio.io/inject: "false"
     spec:
 
       serviceAccountName: grafana
+      automountServiceAccountToken: true
       securityContext:
         fsGroup: 472
         runAsGroup: 472
         runAsUser: 472
+      enableServiceLinks: true
       containers:
         - name: grafana
-          image: "grafana/grafana:7.2.1"
+          image: "grafana/grafana:9.0.1"
           imagePullPolicy: IfNotPresent
           volumeMounts:
             - name: config
@@ -53,10 +56,10 @@ spec:
               mountPath: "/var/lib/grafana/dashboards/istio-services"
             - name: config
               mountPath: "/etc/grafana/provisioning/datasources/datasources.yaml"
-              subPath: datasources.yaml
+              subPath: "datasources.yaml"
             - name: config
               mountPath: "/etc/grafana/provisioning/dashboards/dashboardproviders.yaml"
-              subPath: dashboardproviders.yaml
+              subPath: "dashboardproviders.yaml"
           ports:
             - name: service
               containerPort: 3000
@@ -65,7 +68,14 @@ spec:
               containerPort: 3000
               protocol: TCP
           env:
-
+            - name: GF_PATHS_DATA
+              value: /var/lib/grafana/
+            - name: GF_PATHS_LOGS
+              value: /var/log/grafana
+            - name: GF_PATHS_PLUGINS
+              value: /var/lib/grafana/plugins
+            - name: GF_PATHS_PROVISIONING
+              value: /etc/grafana/provisioning
             - name: "GF_AUTH_ANONYMOUS_ENABLED"
               value: "true"
             - name: "GF_AUTH_ANONYMOUS_ORG_ROLE"

diff --git a/helm/istio/istio-kiali/templates/grafana-service.yaml b/helm/istio/istio-kiali/templates/grafana-service.yaml
@@ -6,10 +6,10 @@ metadata:
   name: grafana
   namespace: istio-system
   labels:
-    helm.sh/chart: grafana-5.8.10
+    helm.sh/chart: grafana-6.31.1
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "7.2.1"
+    app.kubernetes.io/version: "9.0.1"
     app.kubernetes.io/managed-by: Helm
 spec:
   type: ClusterIP

diff --git a/helm/istio/istio-kiali/templates/grafana-serviceaccount.yaml b/helm/istio/istio-kiali/templates/grafana-serviceaccount.yaml
@@ -1,12 +1,13 @@
 ---
+# Source: grafana/templates/serviceaccount.yaml
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    helm.sh/chart: grafana-5.8.10
+    helm.sh/chart: grafana-6.31.1
     app.kubernetes.io/name: grafana
     app.kubernetes.io/instance: grafana
-    app.kubernetes.io/version: "7.2.1"
+    app.kubernetes.io/version: "9.0.1"
     app.kubernetes.io/managed-by: Helm
   name: grafana
   namespace: istio-system

diff --git a/helm/istio/istio-kiali/templates/jaeger-deployment.yaml b/helm/istio/istio-kiali/templates/jaeger-deployment.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.20"
+          image: "docker.io/jaegertracing/all-in-one:1.35"
           env:
             - name: BADGER_EPHEMERAL
               value: "false"
@@ -30,8 +30,8 @@ spec:
               value: "/badger/data"
             - name: BADGER_DIRECTORY_KEY
               value: "/badger/key"
-            - name: COLLECTOR_ZIPKIN_HTTP_PORT
-              value: "9411"
+            - name: COLLECTOR_ZIPKIN_HOST_PORT
+              value: ":9411"
             - name: MEMORY_MAX_TRACES
               value: "50000"
             - name: QUERY_BASE_PATH
@@ -52,5 +52,4 @@ spec:
               cpu: 10m
       volumes:
         - name: data
-          emptyDir: {}
----
+          emptyDir: {}
diff --git a/helm/istio/istio-kiali/templates/jaeger-service.yaml b/helm/istio/istio-kiali/templates/jaeger-service.yaml
@@ -13,9 +13,15 @@ spec:
       port: 80
       protocol: TCP
       targetPort: 16686
+    # Note: Change port name if you add '--query.grpc.tls.enabled=true'
+    - name: grpc-query
+      port: 16685
+      protocol: TCP
+      targetPort: 16685
   selector:
     app: jaeger
 ---
+# Jaeger implements the Zipkin API. To support swapping out the tracing backend, we use a Service named Zipkin.
 apiVersion: v1
 kind: Service
 metadata:
@@ -49,5 +55,8 @@ spec:
     port: 14250
     targetPort: 14250
     protocol: TCP
+  - port: 9411
+    targetPort: 9411
+    name: http-zipkin
   selector:
-    app: jaeger
+    app: jaeger
diff --git a/helm/istio/istio-kiali/templates/kiali-clusterolebinding.yaml b/helm/istio/istio-kiali/templates/kiali-clusterolebinding.yaml
@@ -4,14 +4,13 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: kiali
-  namespace: {{ .Release.Namespace }}
   labels:
-    helm.sh/chart: kiali-server-1.29.0
+    helm.sh/chart: kiali-server-1.60.0
     app: kiali
     app.kubernetes.io/name: kiali
-    app.kubernetes.io/instance: kiali-server
-    version: "v1.29.0"
-    app.kubernetes.io/version: "v1.29.0"
+    app.kubernetes.io/instance: kiali
+    version: "v1.60.0"
+    app.kubernetes.io/version: "v1.60.0"
     app.kubernetes.io/managed-by: Helm
     app.kubernetes.io/part-of: "kiali"
 roleRef:
@@ -21,5 +20,6 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: kiali
-  namespace: {{ .Release.Namespace }}
+  namespace: istio-system
+...
 ---