Merge pull request #98 from arvatoaws-labs/develop

merge to master

Author: runningman84

templates/cron-job.yaml

@@ -13,6 +13,9 @@ metadata:
     downscaler/uptime: {{ $.Values.wordpress.uptime }}
     {{- end }}
     checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") $ | sha256sum }}
+    {{- if $.Values.automaticZonePlacement.enabled }}
+    automatic-zone-placement/fqdn: {{ $.Values.automaticZonePlacement.fqdn | quote }}
+    {{- end }}
 spec:
   {{- $schedule := dig "schedule" "" $cronvalue }}
   {{- $scheduleEveryHrs := dig "scheduleEveryHrs" "" $cronvalue }}

templates/deployment-exporter.yaml

@@ -25,6 +25,9 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       annotations:
+        {{- if .Values.automaticZonePlacement.enabled }}
+        automatic-zone-placement/fqdn: {{ .Values.automaticZonePlacement.fqdn | quote }}
+        {{- end }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}

templates/deployment-worker.yaml

@@ -26,6 +26,9 @@ spec:
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         checksum/secret: {{ include (print $.Template.BasePath "/secrets.yaml") . | sha256sum }}
+        {{- if .Values.automaticZonePlacement.enabled }}
+        automatic-zone-placement/fqdn: {{ .Values.automaticZonePlacement.fqdn | quote }}
+        {{- end }}
       {{- with .Values.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -316,25 +319,35 @@ spec:
       {{- end }}
       {{- end }}
       topologySpreadConstraints:
+{{- if .Values.automaticZonePlacement.enabled }}
+{{- if .Values.automaticZonePlacement.spreadInstancesTypes }}
+      - labelSelector:
+          matchLabels:
+            app.kubernetes.io/instance: {{ .Release.Name }}
+            app.kubernetes.io/component: "worker"
+        matchLabelKeys:
+        - pod-template-hash
+        maxSkew: 1
+        topologyKey: node.kubernetes.io/instance-type
+        whenUnsatisfiable: ScheduleAnyway
+{{- end }}
+{{- else }}
       - labelSelector:
           matchLabels:
             app.kubernetes.io/instance: {{ .Release.Name }}
             app.kubernetes.io/component: "worker"
-        {{- if semverCompare ">=1.27-0" $.Capabilities.KubeVersion.GitVersion }}
         matchLabelKeys:
         - pod-template-hash
-        {{- end }}
         maxSkew: 1
         topologyKey: topology.kubernetes.io/zone
         whenUnsatisfiable: ScheduleAnyway
+{{- end }}
       - labelSelector:
           matchLabels:
               app.kubernetes.io/instance: {{ .Release.Name }}
               app.kubernetes.io/component: "worker"
-        {{- if semverCompare ">=1.27-0" $.Capabilities.KubeVersion.GitVersion }}
         matchLabelKeys:
         - pod-template-hash
-        {{- end }}
         maxSkew: 1
         topologyKey: kubernetes.io/hostname
         whenUnsatisfiable: DoNotSchedule

templates/hook-jobs.yaml

@@ -30,6 +30,9 @@ spec:
         {{- if $.Values.karpenter.optimization }}
         karpenter.sh/do-not-disrupt: "true"
         {{- end }}
+        {{- if $.Values.automaticZonePlacement.enabled }}
+        automatic-zone-placement/fqdn: {{ $.Values.automaticZonePlacement.fqdn | quote }}
+        {{- end }}
     spec:
     {{- with $.Values.imagePullSecrets }}
       imagePullSecrets:

values.yaml

@@ -81,7 +81,7 @@ karpenter:
 nginx:
   image:
     repository: public.ecr.aws/nginx/nginx
-    tag: 1.29.3-alpine-slim
+    tag: 1.29.4-alpine-slim
     pullPolicy: IfNotPresent
   resources: {}
   disallow_robots: false
@@ -180,7 +180,7 @@ offload:
     fileName: wpoffload_private.pem
   errorPages:
     enabled: false
-    image: public.ecr.aws/aws-cli/aws-cli:2.31.31
+    image: public.ecr.aws/aws-cli/aws-cli:2.32.16
     path: /var/www/html/error-pages
 
 
@@ -379,3 +379,8 @@ cron:
       restartPolicy: OnFailure
       startingDeadlineSeconds: 1800
       ttlSecondsAfterFinished: 600
+
+automaticZonePlacement:
+  enabled: false
+  spreadInstancesTypes: false
+  fqdn: ""

values_test.yaml

@@ -102,3 +102,8 @@ serviceAccount:
   # If not set and create is true, a name is generated using the release name
   name: test-project
   iamRoleArn: arn:aws:iam::123456789012:role/test-project-role
+
+automaticZonePlacement:
+  enabled: true
+  spreadInstancesTypes: false
+  fqdn: wordpress.rds.cloud.internal