Merge pull request #8821 from zalando-incubator/dev-to-eks

dev to eks
zalando-incubator · Jan 27, 2025 · 8b10c63 · 8b10c63
2 parents 9429bb7 + abcd047
commit 8b10c63
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/cluster/manifests/deployment-service/controller-statefulset.yaml b/cluster/manifests/deployment-service/controller-statefulset.yaml
@@ -29,7 +29,7 @@ spec:
       terminationGracePeriodSeconds: 300
       containers:
         - name: "deployment-service-controller"
-          image: "container-registry.zalando.net/teapot/deployment-controller:master-236"
+          image: "container-registry.zalando.net/teapot/deployment-controller:master-237"
           args:
             - "--config-namespace=kube-system"
             - "--decrypt-kms-alias-arn=arn:aws:kms:{{ .Cluster.Region }}:{{ .Cluster.InfrastructureAccount | getAWSAccountID }}:alias/deployment-secret"

diff --git a/cluster/manifests/deployment-service/status-service-deployment.yaml b/cluster/manifests/deployment-service/status-service-deployment.yaml
@@ -1,4 +1,4 @@
-# {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service:master-236" }}
+# {{ $image   := "container-registry.zalando.net/teapot/deployment-status-service:master-237" }}
 # {{ $version := index (split $image ":") 1 }}
 
 apiVersion: apps/v1

diff --git a/cluster/manifests/deployment-service/status-service-rbac.yaml b/cluster/manifests/deployment-service/status-service-rbac.yaml
@@ -43,6 +43,11 @@ rules:
       - eventtypesubscriptions
       - nakadisqlqueries
     verbs: ["get", "list", "watch"]
+  - apiGroups:
+      - acid.zalan.do
+    resources:
+      - postgresqls
+    verbs: ["get", "list", "watch"]
   - apiGroups:
       - ""
     resources:

diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml
@@ -206,7 +206,7 @@ write_files:
             limits:
               memory: {{ .Values.InstanceInfo.MemoryFraction (parseInt64 .Cluster.ConfigItems.apiserver_memory_limit_percent)}}
 {{- end }}
-        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-234
+        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-235
           name: admission-controller
           lifecycle:
             preStop: