Merge pull request #380 from junior/virtual_nodes

junior · web-flow · commit 7080962465e4 · 2023-03-21T23:24:15.000-05:00
OKE Virtual nodes support fixes
diff --git a/deploy/complete/helm-chart/mushop/charts/api/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/api/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: api
 appVersion: 2.3.2
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for API component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/api/templates/api-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/api/templates/api-deployment.yaml
@@ -60,4 +60,6 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/assets/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/assets/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: assets
 appVersion: 1.1.3
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for media assets component of MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/assets/templates/assets-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/assets/templates/assets-deployment.yaml
@@ -41,4 +41,6 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: catalogue
 appVersion: 1.4.0
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for catalogue component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-deployment.yaml
@@ -62,4 +62,6 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
       securityContext:
         fsGroup: 687467
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/edge/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/edge/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: edge
 appVersion: 1.1.0
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for edge component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/edge/templates/edge-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/edge/templates/edge-deployment.yaml
@@ -46,9 +46,10 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
       volumes:
         - name: config
           configMap:
             name: {{ include "edge-router.fullname" .}}
-
diff --git a/deploy/complete/helm-chart/mushop/charts/events/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/events/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: events
 appVersion: 0.0.2
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for events streaming component of MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/events/templates/events-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/events/templates/events-deployment.yaml
@@ -48,4 +48,6 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/payment/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/payment/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: payment
 appVersion: 1.0.1
-version: 0.1.1
+version: 0.2.1
 description: Helm chart for payment component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/payment/templates/payment-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/payment/templates/payment-deployment.yaml
@@ -45,6 +45,8 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
       nodeSelector:
           kubernetes.io/os: linux
diff --git a/deploy/complete/helm-chart/mushop/charts/session/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/session/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: session
 appVersion: 0.1.0
-version: 0.1.0
+version: 0.2.1
 description: Helm chart for session component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/session/templates/session-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/session/templates/session-deployment.yaml
@@ -31,6 +31,8 @@ spec:
 {{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
       nodeSelector:
         kubernetes.io/os: linux
diff --git a/deploy/complete/helm-chart/mushop/charts/storefront/templates/storefront-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/storefront/templates/storefront-deployment.yaml
@@ -58,6 +58,8 @@ spec:
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
             readOnlyRootFilesystem: {{ if eq (.Values.env.odaEnabled | default false) true }}false{{ else }}true{{ end }}
+{{- else }}
+      automountServiceAccountToken: false
 {{- end }}
       volumes:
         - name: tmp-volume
diff --git a/deploy/complete/helm-chart/mushop/charts/user/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/user/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: user
 appVersion: 1.1.0
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for user component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/user/templates/user-deployment.yaml b/deploy/complete/helm-chart/mushop/charts/user/templates/user-deployment.yaml
@@ -33,9 +33,6 @@ spec:
           env: {{- include "user.oadb.connection" . | nindent 12 }}
           volumeMounts: {{- include "user.mount.wallet" . | nindent 12 }}
           resources: {{- toYaml .Values.resources | nindent 12 }}
-{{- if not .Values.global.okeVirtualNodesSupport }}
-          securityContext: {{- toYaml .Values.securityContext | nindent 12 }}
-{{- end }}
           livenessProbe:
             httpGet:
               path: /health
@@ -48,6 +45,11 @@ spec:
               port: http
             initialDelaySeconds: 10
             periodSeconds: 5
+{{- if not .Values.global.okeVirtualNodesSupport }}
+          securityContext: {{- toYaml .Values.securityContext | nindent 12 }}
+{{- else }}
+      automountServiceAccountToken: false
+{{- end }}
       volumes: {{- include "user.volumes" . | nindent 8 }}
       nodeSelector:
         kubernetes.io/os: linux
diff --git a/deploy/complete/helm-chart/mushop/requirements.yaml b/deploy/complete/helm-chart/mushop/requirements.yaml
@@ -1,40 +1,40 @@
 dependencies:
   - name: api
-    version: 0.2.0
+    version: 0.2.1
     condition: api.enabled
   - name: assets
-    version: 0.2.0
+    version: 0.2.1
     condition: assets.enabled
   - name: carts
     version: 0.1.1
     tags:
       - atp
   - name: catalogue
-    version: 0.2.0
+    version: 0.2.1
     tags:
       - atp
   - name: edge
-    version: 0.2.0
+    version: 0.2.1
     condition: edge.enabled
   - name: events
-    version: 0.2.0
+    version: 0.2.1
     tags:
       - streaming
   - name: orders
     version: 0.1.1
     tags:
       - atp
   - name: payment
-    version: 0.1.1
+    version: 0.2.1
     condition: payment.enabled
   - name: session
-    version: 0.1.0
+    version: 0.2.1
     condition: session.enabled
   - name: storefront
     version: 0.2.1
     condition: storefront.enabled
   - name: user
-    version: 0.2.0
+    version: 0.2.1
     tags:
       - atp
   - name: fulfillment
diff --git a/deploy/complete/helm-chart/setup/requirements.yaml b/deploy/complete/helm-chart/setup/requirements.yaml
@@ -5,27 +5,27 @@
 dependencies:
   # Prometheus
   - name: prometheus
-    version: 15.10.5
+    version: 20.0.1
     condition: prometheus.enabled
     repository: https://prometheus-community.github.io/helm-charts
   # Grafana
   - name: grafana
-    version: 6.32.5
+    version: 6.52.4
     condition: grafana.enabled
     repository: https://grafana.github.io/helm-charts
   # HPA Metrics
   - name: metrics-server
-    version: 3.8.2
+    version: 3.8.4
     condition: metrics-server.enabled
     repository: https://kubernetes-sigs.github.io/metrics-server
   # Ingress Controller
   - name: ingress-nginx
-    version: 4.2.0
+    version: 4.5.2
     condition: ingress-nginx.enabled
     repository: https://kubernetes.github.io/ingress-nginx
   # cert-manager
   - name: cert-manager
-    version: 1.8.2
+    version: 1.11.0
     condition: cert-manager.enabled
     repository: https://charts.jetstack.io
   # jenkins
