feat: Support in Helm charts for PodDisruptionBudget and TopologySpre…

…adConstraints (#671)

.prettierignore

@@ -1 +1,2 @@
-test-connection.yaml
+test-connection.yaml
+deploy/kubernetes/charts/**/*.yaml

deploy/kubernetes/charts/assets/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       labels:
         {{- include "assets.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

deploy/kubernetes/charts/assets/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "assets.fullname" . }}
+  labels:
+    {{- include "assets.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} 
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "assets.selectorLabels" . | nindent 6 }}
+{{- end }}

deploy/kubernetes/charts/assets/values.yaml

@@ -56,6 +56,8 @@ tolerations: []
 
 affinity: {}
 
+topologySpreadConstraints: []
+
 metrics:
   enabled: false
   podAnnotations:
@@ -69,4 +71,10 @@ configMap:
 
 opentelemetry:
   enabled: false
-  instrumentation: ""
+  instrumentation: ""
+
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 2
+  maxUnavailable: 1
+

deploy/kubernetes/charts/carts/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       labels:
         {{- include "carts.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

deploy/kubernetes/charts/carts/templates/dynamodb-deployment.yaml

@@ -43,4 +43,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end }}
+{{- end }}

deploy/kubernetes/charts/carts/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "carts.fullname" . }}
+  labels:
+    {{- include "carts.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} 
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "carts.selectorLabels" . | nindent 6 }}
+{{- end }}

deploy/kubernetes/charts/carts/values.yaml

@@ -59,6 +59,8 @@ tolerations: []
 
 affinity: {}
 
+topologySpreadConstraints: []
+
 metrics:
   enabled: true
   podAnnotations:
@@ -96,4 +98,9 @@ dynamodb:
 
 opentelemetry:
   enabled: false
-  instrumentation: ""
+  instrumentation: ""
+
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 2
+  maxUnavailable: 1

deploy/kubernetes/charts/catalog/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       labels:
         {{- include "catalog.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

deploy/kubernetes/charts/catalog/templates/mysql-statefulset.yaml

@@ -92,4 +92,4 @@ spec:
       - name: data
         emptyDir: {}
 {{- end }}
-{{- end }}
+{{- end }}

deploy/kubernetes/charts/catalog/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "catalog.fullname" . }}
+  labels:
+    {{- include "catalog.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} 
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "catalog.selectorLabels" . | nindent 6 }}
+{{- end }}

deploy/kubernetes/charts/catalog/values.yaml

@@ -59,6 +59,8 @@ tolerations: []
 
 affinity: {}
 
+topologySpreadConstraints: []
+
 metrics:
   enabled: true
   podAnnotations:
@@ -110,13 +112,17 @@ mysql:
     accessModes:
       - ReadWriteOnce
     size: 10Gi
-    # storageClass: gp2
+    storageClass: ""
 
 securityGroups:
   create: false
-
   securityGroupIds: []
 
 opentelemetry:
   enabled: false
   instrumentation: ""
+
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 2
+  maxUnavailable: 1

deploy/kubernetes/charts/checkout/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       labels:
         {{- include "checkout.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

deploy/kubernetes/charts/checkout/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "checkout.fullname" . }}
+  labels:
+    {{- include "checkout.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} 
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "checkout.selectorLabels" . | nindent 6 }}
+{{- end }}

deploy/kubernetes/charts/checkout/templates/redis-deployment.yaml

@@ -43,4 +43,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end }}
+{{- end }}

deploy/kubernetes/charts/checkout/values.yaml

@@ -59,6 +59,8 @@ tolerations: []
 
 affinity: {}
 
+topologySpreadConstraints: []
+
 metrics:
   enabled: true
   podAnnotations:
@@ -103,4 +105,9 @@ securityGroups:
 
 opentelemetry:
   enabled: false
-  instrumentation: ""
+  instrumentation: ""
+
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 2
+  maxUnavailable: 1

deploy/kubernetes/charts/helmfile.yaml

@@ -55,4 +55,4 @@ releases:
       carts: http://carts
       checkout: http://checkout
       orders: http://orders
-      assets: http://assets
+      assets: http://assets

deploy/kubernetes/charts/opentelemetry/values.yaml

@@ -60,3 +60,5 @@ collector:
   tolerations: []
 
   affinity: {}
+
+

deploy/kubernetes/charts/orders/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       labels:
         {{- include "orders.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

deploy/kubernetes/charts/orders/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "orders.fullname" . }}
+  labels:
+    {{- include "orders.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} 
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "orders.selectorLabels" . | nindent 6 }}
+{{- end }}

deploy/kubernetes/charts/orders/templates/postgresql-statefulset.yaml

@@ -92,4 +92,4 @@ spec:
       - name: data
         emptyDir: {}
 {{- end }}
-{{- end }}
+{{- end }}

deploy/kubernetes/charts/orders/templates/rabbitmq-statefulset.yaml

@@ -81,4 +81,4 @@ spec:
       - name: data
         emptyDir: {}
 {{- end }}
-{{- end }}
+{{- end }}

deploy/kubernetes/charts/orders/values.yaml

@@ -59,6 +59,8 @@ tolerations: []
 
 affinity: {}
 
+topologySpreadConstraints: []
+
 metrics:
   enabled: true
   podAnnotations:
@@ -167,3 +169,8 @@ securityGroups:
 opentelemetry:
   enabled: false
   instrumentation: ""
+
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 2
+  maxUnavailable: 1

deploy/kubernetes/charts/ui/templates/deployment.yaml

@@ -27,6 +27,10 @@ spec:
       labels:
         {{- include "ui.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}

deploy/kubernetes/charts/ui/templates/ingress.yaml

@@ -16,6 +16,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.ingress.class }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

deploy/kubernetes/charts/ui/templates/pdb.yaml

@@ -0,0 +1,18 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: {{ include "ui.fullname" . }}
+  labels:
+    {{- include "ui.labels" . | nindent 4 }}
+spec:
+  {{- if .Values.podDisruptionBudget.minAvailable }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }} 
+  {{- end }}
+  {{- if .Values.podDisruptionBudget.maxUnavailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+  {{- end }}
+  selector:
+    matchLabels:
+      {{- include "ui.selectorLabels" . | nindent 6 }}
+{{- end }}

deploy/kubernetes/charts/ui/templates/service.yaml

@@ -9,11 +9,14 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if .Values.service.loadBalancerClass }}
+  loadBalancerClass: {{ .Values.service.loadBalancerClass }}
+  {{- end }}
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
       name: http
   selector:
-    {{- include "ui.selectorLabels" . | nindent 4 }}
+    {{- include "ui.selectorLabels" . | nindent 4 }}