Merge pull request #379 from junior/virtual_nodes

junior · web-flow · commit 7b44af18c48e · 2023-03-17T19:06:06.000-05:00
OKE Virtual nodes Support for MuShop Chart
diff --git a/deploy/complete/helm-chart/mushop/Chart.yaml b/deploy/complete/helm-chart/mushop/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: "1.0"
+appVersion: "2.0"
 description: MuShop App microservices chart
 name: mushop
-version: 0.1.2
+version: 0.2.1
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: 0.1.0
-version: 0.1.0
+appVersion: 2.3.2
+version: 0.2.0
 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
@@ -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/api/templates/api-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/api/templates/api-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "api.fullname" . }}
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: 0.1.0
-version: 0.1.0
+appVersion: 1.1.3
+version: 0.2.0
 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
@@ -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/assets/templates/assets-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/assets/templates/assets-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "assets.fullname" . }}
diff --git a/deploy/complete/helm-chart/mushop/charts/carts/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/carts/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: carts
-appVersion: 0.1.0
-version: 0.1.0
+appVersion: 1.5.0
+version: 0.1.1
 description: Helm chart for carts component of the MuShop
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,8 +137,10 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
+{{- end }}
 # service init configMap
 - name: initdb
   configMap:
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: 0.1.0
-version: 0.1.0
+appVersion: 1.4.0
+version: 0.2.0
 description: Helm chart for catalogue component of the MuShop
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,8 +137,10 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
+{{- end }}
 # service init configMap
 - name: initdb
   configMap:
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/catalogue/templates/catalogue-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/catalogue/templates/catalogue-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "catalogue.fullname" . }}
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: 0.1.0
-version: 0.1.0
+appVersion: 1.1.0
+version: 0.2.0
 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
@@ -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/edge/templates/edge-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/edge/templates/edge-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "edge-router.fullname" . }}
diff --git a/deploy/complete/helm-chart/mushop/charts/edge/templates/edge-svc.yaml b/deploy/complete/helm-chart/mushop/charts/edge/templates/edge-svc.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
 {{ include "edge-router.labels" . | indent 4 }}
 spec:
+  type: {{ .Values.service.type }}
   selector:
     app.kubernetes.io/name: {{ include "edge-router.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/deploy/complete/helm-chart/mushop/charts/edge/values.yaml b/deploy/complete/helm-chart/mushop/charts/edge/values.yaml
@@ -36,4 +36,5 @@ securityContext:
   readOnlyRootFilesystem: true
 
 service:
+  type: ClusterIP
   port: 80
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.1.0
-version: 0.1.0
+appVersion: 0.0.2
+version: 0.2.0
 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
@@ -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/events/templates/events-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/events/templates/events-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "events.fullname" . }}
diff --git a/deploy/complete/helm-chart/mushop/charts/fulfillment/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/fulfillment/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: fulfillment
-appVersion: 0.1.0
-version: 0.1.0
+appVersion: 1.1.0
+version: 0.1.1
 description: Helm chart for fulfillment component of the MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/nats/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/nats/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: nats
-appVersion: 0.1.0
-version: 0.1.0
+appVersion: 2.7.1
+version: 0.1.1
 description: Helm chart for NATS.io, the messaging component of MuShop
diff --git a/deploy/complete/helm-chart/mushop/charts/orders/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/orders/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: orders
-appVersion: 0.1.0
-version: 0.1.0
+appVersion: 2.2.2
+version: 0.1.1
 description: Helm chart for orders component of the MuShop
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,8 +144,10 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
+{{- end }}
 # service init configMap
 - name: initdb
   configMap:
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: 0.1.0
-version: 0.1.0
+appVersion: 1.0.1
+version: 0.1.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
@@ -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/Chart.yaml b/deploy/complete/helm-chart/mushop/charts/storefront/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 name: storefront
 appVersion: 2.3.0
-version: 0.2.0
+version: 0.2.1
 description: Helm chart for storefront component of the MuShop
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/storefront/templates/storefront-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/storefront/templates/storefront-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "storefront.fullname" . }}
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: 0.1.0
-version: 0.1.0
+appVersion: 1.1.0
+version: 0.2.0
 description: Helm chart for user component of the MuShop
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,8 +141,10 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 - name: wallet
   secret:
     secretName: {{ $wallet }}
+{{- if ne .Values.global.mock.service "all" }}
     defaultMode: 256
 {{- end }}
+{{- end }}
 # service init configMap
 - name: initdb
   configMap:
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
diff --git a/deploy/complete/helm-chart/mushop/charts/user/templates/user-hpa.yaml b/deploy/complete/helm-chart/mushop/charts/user/templates/user-hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled }}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "user.fullname" . }}
diff --git a/deploy/complete/helm-chart/mushop/requirements.yaml b/deploy/complete/helm-chart/mushop/requirements.yaml
@@ -1,45 +1,45 @@
 dependencies:
   - name: api
-    version: 0.1.0
+    version: 0.2.0
     condition: api.enabled
   - name: assets
-    version: 0.1.0
+    version: 0.2.0
     condition: assets.enabled
   - name: carts
-    version: 0.1.0
+    version: 0.1.1
     tags:
       - atp
   - name: catalogue
-    version: 0.1.0
+    version: 0.2.0
     tags:
       - atp
   - name: edge
-    version: 0.1.0
+    version: 0.2.0
     condition: edge.enabled
   - name: events
-    version: 0.1.0
+    version: 0.2.0
     tags:
       - streaming
   - name: orders
-    version: 0.1.0
+    version: 0.1.1
     tags:
       - atp
   - name: payment
-    version: 0.1.0
+    version: 0.1.1
     condition: payment.enabled
   - name: session
     version: 0.1.0
     condition: session.enabled
   - name: storefront
-    version: 0.2.0
+    version: 0.2.1
     condition: storefront.enabled
   - name: user
-    version: 0.1.0
+    version: 0.2.0
     tags:
       - atp
   - name: fulfillment
-    version: 0.1.0
+    version: 0.1.1
     condition: fulfillment.enabled
   - name: nats
-    version: 0.1.0
+    version: 0.1.1
     condition: nats.enabled
diff --git a/deploy/complete/helm-chart/mushop/values-virtual-nodes.yaml b/deploy/complete/helm-chart/mushop/values-virtual-nodes.yaml
diff --git a/deploy/complete/helm-chart/mushop/values.yaml b/deploy/complete/helm-chart/mushop/values.yaml
