feat(kgo): add affinity and tolerations fields (#1111)

Kong · Jul 25, 2024 · d1fa4c9 · d1fa4c9
1 parent 44d3a9c
commit d1fa4c9
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 1 deletion.
diff --git a/charts/gateway-operator/CHANGELOG.md b/charts/gateway-operator/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.1.10
+
+### Changes
+
+- Added `tolerations` and `affinity` fields support to specify on operator's Pods
+
 ## 0.1.9
 
 ### Fixes

diff --git a/charts/gateway-operator/Chart.yaml b/charts/gateway-operator/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
 name: gateway-operator
 sources:
   - https://github.com/Kong/charts/tree/main/charts/gateway-operator
-version: 0.1.9
+version: 0.1.10
 appVersion: "1.2"
 annotations:
   artifacthub.io/prerelease: "false"

diff --git a/charts/gateway-operator/ci/affinity-values.yaml b/charts/gateway-operator/ci/affinity-values.yaml
@@ -0,0 +1,24 @@
+affinity:
+  podAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - labelSelector:
+        matchExpressions:
+        - key: component
+          operator: NotIn
+          values:
+          - dummy
+      topologyKey: kubernetes.io/hostname
+
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: 8081
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
+readinessProbe:
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
+env:
+  anonymous_reports: "false"
diff --git a/charts/gateway-operator/ci/disable-gateway-controller-values.yaml b/charts/gateway-operator/ci/disable-gateway-controller-values.yaml
@@ -1,3 +1,4 @@
 env:
   # gateway controller
   enable_gateway_controller: false
+  anonymous_reports: "false"
diff --git a/charts/gateway-operator/ci/env-and-args-values.yaml b/charts/gateway-operator/ci/env-and-args-values.yaml
@@ -1,3 +1,14 @@
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: 8081
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
+readinessProbe:
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
 env:
   # gateway controller
   enable_controller_gateway: false

diff --git a/charts/gateway-operator/ci/env-and-customenv-values.yaml b/charts/gateway-operator/ci/env-and-customenv-values.yaml
@@ -1,6 +1,18 @@
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: 8081
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
+readinessProbe:
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
 env:
   # gateway controller
   enable_controller_gateway: false
+  anonymous_reports: "false"
 
 customEnv:
   TZ: "Europe/Berlin"
diff --git a/charts/gateway-operator/ci/extra-labels-values.yaml b/charts/gateway-operator/ci/extra-labels-values.yaml
@@ -8,3 +8,6 @@ livenessProbe:
 readinessProbe:
   initialDelaySeconds: 1
   periodSeconds: 1
+
+env:
+  anonymous_reports: "false"
diff --git a/.../gateway-operator/ci/probes-and-args.yaml → ...y-operator/ci/probes-and-args-values.yaml b/.../gateway-operator/ci/probes-and-args.yaml → ...y-operator/ci/probes-and-args-values.yaml
@@ -11,3 +11,6 @@ readinessProbe:
 
 args:
   - --zap-log-level=debug
+
+env:
+  anonymous_reports: "false"
diff --git a/charts/gateway-operator/ci/tolerations-values.yaml b/charts/gateway-operator/ci/tolerations-values.yaml
@@ -0,0 +1,18 @@
+tolerations:
+- key: "example-key"
+  operator: "Exists"
+  effect: "NoSchedule"
+
+livenessProbe:
+  httpGet:
+    path: /healthz
+    port: 8081
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
+readinessProbe:
+  initialDelaySeconds: 1
+  periodSeconds: 1
+
+env:
+  anonymous_reports: "false"
diff --git a/charts/gateway-operator/templates/deployment.yaml b/charts/gateway-operator/templates/deployment.yaml
@@ -27,6 +27,14 @@ spec:
         {{ include "kong.renderTpl" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
         {{- end }}
     spec:
+      {{- with .Values.tolerations }}
+      tolerations:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: manager
         {{ with .Values.args -}}

diff --git a/charts/gateway-operator/values.yaml b/charts/gateway-operator/values.yaml
@@ -48,6 +48,10 @@ gwapi-standard-crds:
 gwapi-experimental-crds:
   enabled: false
 
+affinity: {}
+
+tolerations: []
+
 # Customize gateway-operator livenessProbe.
 livenessProbe:
   httpGet: