build: add pdb/hpa config

unicef · Jun 5, 2024 · 97772fc · 97772fc
1 parent 8cb92eb
commit 97772fc
Show file tree

Hide file tree

Showing 12 changed files with 128 additions and 242 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -111,13 +111,19 @@ tasks:
       - docker push {{.DATA_SHARING_PROXY_IMAGE_REPOSITORY}}:{{.COMMIT_SHA}}
       - docker push {{.DATA_SHARING_DELTA_IMAGE_REPOSITORY}}:{{.COMMIT_SHA}}
 
+  k8s-prereqs:
+    desc: Install K8s prerequisites
+    dir: infra/k8s
+    cmds:
+      - kubectl apply -f namespace.yaml
+      - kubectl apply -f configmap.yaml --namespace giga-data-sharing
+      - kubectl apply -f secrets.yaml --namespace giga-data-sharing
+
   helm-up:
-    desc: Install/upgrade Helm chart
+    desc: Install/upgrade Helm chart on a local K8s cluster
     dir: infra
     cmds:
-      - kubectl apply -f k8s/namespace.yaml
-      - kubectl apply -f k8s/configmap.yaml --namespace giga-data-sharing
-      - kubectl apply -f k8s/secrets.yaml --namespace giga-data-sharing
+      - task: k8s-prereqs
       - >
         helm upgrade --install data-sharing-delta ./helm/data-sharing-delta
         --namespace giga-data-sharing
@@ -130,6 +136,33 @@ tasks:
         --set image.tag={{.COMMIT_SHA}}
         --set service.type=LoadBalancer
 
+  helm-upi:
+    desc: Install/upgrade Helm chart on a K8s cluster with configured ingress
+    dir: infra
+    cmds:
+      - task: k8s-prereqs
+      - >
+        helm upgrade --install data-sharing-delta ./helm/data-sharing-delta
+        --namespace giga-data-sharing
+        --set image.repository={{.DATA_SHARING_DELTA_IMAGE_REPOSITORY}}
+        --set image.tag={{.COMMIT_SHA}}
+        --set autoscaling.enabled=true
+        --set podDisruptionBudget.enabled=true
+      - >
+        helm upgrade --install data-sharing-proxy ./helm/data-sharing-proxy
+        --namespace giga-data-sharing
+        --set image.repository={{.DATA_SHARING_PROXY_IMAGE_REPOSITORY}}
+        --set image.tag={{.COMMIT_SHA}}
+        --set ingress.enabled=true
+        --set ingress.annotations=null
+        --set ingress.hosts[0].host={{.DATA_SHARING_INGRESS_HOST}}
+        --set ingress.hosts[0].paths[0].path=/
+        --set ingress.hosts[0].paths[0].pathType=Prefix
+        --set postgresql.primary.readinessProbe.enabled=false  
+        --set postgresql.primary.livenessProbe.enabled=false
+        --set autoscaling.enabled=true
+        --set podDisruptionBudget.enabled=true
+
   helm-down:
     desc: Uninstall Helm chart
     cmds:

diff --git a/azure/templates/helm-deploy.yaml b/azure/templates/helm-deploy.yaml
@@ -9,7 +9,8 @@ jobs:
             - checkout: self
 
             - task: HelmDeploy@0
-              displayName: Helm deploy Data Sharing Delta
+              displayName: Helm deploy Data Sharing Delta dev
+              condition: eq(variables.environment, 'dev')
               inputs:
                 command: upgrade
                 chartType: FilePath
@@ -20,9 +21,41 @@ jobs:
                   --set image.repository="$(containerRegistryName).azurecr.io/giga-data-sharing-delta"
                   --set image.tag="$(Build.SourceVersion)"
 
+            - task: HelmDeploy@0
+              displayName: Helm deploy Data Sharing Delta stg/prd
+              condition: or(eq(variables.environment, 'stg'), eq(variables.environment, 'prd'))
+              inputs:
+                command: upgrade
+                chartType: FilePath
+                chartPath: infra/helm/data-sharing-delta
+                releaseName: data-sharing-delta
+                namespace: $(kubernetesNamespace)
+                arguments: >
+                  --set image.repository="$(containerRegistryName).azurecr.io/giga-data-sharing-delta"
+                  --set image.tag="$(Build.SourceVersion)"
+                  --set autoscaling.enabled=true
+                  --set podDisruptionBudget.enabled=true
+
+            - task: HelmDeploy@0
+              displayName: Helm deploy Data Sharing proxy dev
+              condition: eq(variables.environment, 'dev')
+              inputs:
+                command: upgrade
+                chartType: FilePath
+                chartPath: infra/helm/data-sharing-proxy
+                releaseName: data-sharing-proxy
+                namespace: $(kubernetesNamespace)
+                arguments: >
+                  --set image.repository="$(containerRegistryName).azurecr.io/giga-data-sharing-proxy"
+                  --set image.tag="$(Build.SourceVersion)"
+                  --set ingress.enabled=true
+                  --set ingress.hosts[0].host="$(ingressHost)"
+                  --set ingress.hosts[0].paths[0].path="/"
+                  --set ingress.hosts[0].paths[0].pathType=Prefix
+
             - task: HelmDeploy@0
               displayName: Helm deploy Data Sharing proxy
-              condition: or(eq(variables.environment, 'dev'), eq(variables.environment, 'stg'))
+              condition: eq(variables.environment, 'stg')
               inputs:
                 command: upgrade
                 chartType: FilePath
@@ -36,9 +69,11 @@ jobs:
                   --set ingress.hosts[0].host="$(ingressHost)"
                   --set ingress.hosts[0].paths[0].path="/"
                   --set ingress.hosts[0].paths[0].pathType=Prefix
+                  --set autoscaling.enabled=true
+                  --set podDisruptionBudget.enabled=true
 
             - task: HelmDeploy@0
-              displayName: Helm deploy production-config Data Sharing proxy
+              displayName: Helm deploy Data Sharing proxy prd
               condition: eq(variables.environment, 'prd')
               inputs:
                 command: upgrade
@@ -54,3 +89,5 @@ jobs:
                   --set ingress.hosts[0].paths[0].path="/"
                   --set ingress.hosts[0].paths[0].pathType=Prefix
                   --set ingress.annotations."appgw\.ingress\.kubernetes\.io/appgw-ssl-certificate"=kv-cert-gigaglobal
+                  --set autoscaling.enabled=true
+                  --set podDisruptionBudget.enabled=true
diff --git a/custom-sas-provider/.dockerignore b/custom-sas-provider/.dockerignore
diff --git a/custom-sas-provider/.gitignore b/custom-sas-provider/.gitignore
diff --git a/custom-sas-provider/pom.xml b/custom-sas-provider/pom.xml
diff --git a/custom-sas-provider/src/main/java/internal/giga/customSasProvider/CustomSasProvider.java b/custom-sas-provider/src/main/java/internal/giga/customSasProvider/CustomSasProvider.java
diff --git a/custom-sas-provider/src/test/java/internal/giga/customSasProvider/AppTest.java b/custom-sas-provider/src/test/java/internal/giga/customSasProvider/AppTest.java
diff --git a/infra/helm/data-sharing-delta/templates/pdb.yaml b/infra/helm/data-sharing-delta/templates/pdb.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.podDisruptionBudget.enabled }}
+apiVersion: policy/v1
+kind: PodDisruptionBudget
+metadata:
+  name: "{{ include "data-sharing-delta.fullname" . }}-pdb"
+spec:
+  selector:
+    matchLabels:
+      {{- include "data-sharing-delta.selectorLabels" . | nindent 6 }}
+  minAvailable: {{ .Values.podDisruptionBudget.minAvailable }}
+  maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }}
+{{- end }}
diff --git a/infra/helm/data-sharing-delta/values.yaml b/infra/helm/data-sharing-delta/values.yaml
@@ -70,11 +70,15 @@ resources: { }
 
 autoscaling:
   enabled: false
-  minReplicas: 1
-  maxReplicas: 100
+  minReplicas: 2
+  maxReplicas: 5
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
+podDisruptionBudget:
+  enabled: false
+  minAvailable: 2
+
 nodeSelector: { }
 
 tolerations: [ ]

diff --git a/infra/helm/data-sharing-proxy/templates/hpa.yaml b/infra/helm/data-sharing-proxy/templates/hpa.yaml
@@ -12,6 +12,12 @@ spec:
     name: {{ include "data-sharing-proxy.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
+  behavior:
+    scaleUp:
+      policies:
+        - type: Pods
+          periodSeconds: 30
+          value: 1
   metrics:
     {{- if .Values.autoscaling.targetCPUUtilizationPercentage }}
     - type: Resource