Helm Charts - Added support for OKE Virtual Nodes

junior · junior · commit 8e9d783d3926 · 2023-03-17T19:03:09.000-05:00
Signed-off-by: junior &lt;junior@users.noreply.github.com&gt;
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
@@ -57,5 +57,7 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- end }}
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
@@ -38,5 +38,7 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/carts/templates/_helpers.tpl b/deploy/complete/helm-chart/mushop/charts/carts/templates/_helpers.tpl
@@ -137,7 +137,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
- {{- if ne .Values.global.mock.service "all" }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
 {{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/catalogue/templates/_helpers.tpl b/deploy/complete/helm-chart/mushop/charts/catalogue/templates/_helpers.tpl
@@ -137,7 +137,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
- {{- if ne .Values.global.mock.service "all" }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
 {{- end }}
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
@@ -54,8 +54,12 @@ spec:
             periodSeconds: 5
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- end }}
       volumes: {{- include "catalogue.volumes" . | nindent 8 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
       securityContext:
         fsGroup: 687467
+{{- end }}
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
@@ -43,8 +43,10 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- end }}
       volumes:
         - name: config
           configMap:
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
@@ -45,5 +45,7 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- end }}
diff --git a/deploy/complete/helm-chart/mushop/charts/orders/templates/_helpers.tpl b/deploy/complete/helm-chart/mushop/charts/orders/templates/_helpers.tpl
@@ -144,7 +144,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
- {{- if ne .Values.global.mock.service "all" }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
 {{- end }}
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
@@ -42,7 +42,9 @@ spec:
             periodSeconds: 5
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- end }}
       nodeSelector:
           kubernetes.io/os: linux
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
@@ -28,7 +28,9 @@ spec:
           ports:
             - name: redis
               containerPort: 6379
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
+{{- 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
@@ -54,9 +54,11 @@ spec:
             name: tmp-volume
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+{{- if not .Values.global.okeVirtualNodesSupport }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
             readOnlyRootFilesystem: {{ if eq (.Values.env.odaEnabled | default false) true }}false{{ else }}true{{ end }}
+{{- end }}
       volumes:
         - name: tmp-volume
           emptyDir:
diff --git a/deploy/complete/helm-chart/mushop/charts/user/templates/_helpers.tpl b/deploy/complete/helm-chart/mushop/charts/user/templates/_helpers.tpl
@@ -141,7 +141,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
- {{- if ne .Values.global.mock.service "all" }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
 {{- end }}
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,7 +33,9 @@ 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
