Merge pull request #7765 from zalando-incubator/alpha-to-beta

alpha to beta
zalando-incubator · Jun 28, 2024 · 0b9144c · 0b9144c
2 parents 768b26a + 6e08d03
commit 0b9144c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/cluster/etcd/stack.yaml b/cluster/etcd/stack.yaml
@@ -43,7 +43,7 @@ Resources:
           - Key: component
             Value: etcd-cluster
           - Key: Name
-            Value: 'etcd-cluster ({{.Cluster.ID}})'
+            Value: 'etcd-cluster'
         NetworkInterfaces:
           - DeviceIndex: 0
             AssociatePublicIpAddress: true

diff --git a/cluster/manifests/skipper/deployment.yaml b/cluster/manifests/skipper/deployment.yaml
@@ -1,5 +1,5 @@
 {{ $internal_version := "v0.21.124-947" }}
-{{ $canary_internal_version := "v0.21.124-947" }}
+{{ $canary_internal_version := "v0.21.133-957" }}
 
 {{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
 {{ $canary_args := "" }}

diff --git a/cluster/node-pools/master-default/userdata.yaml b/cluster/node-pools/master-default/userdata.yaml
@@ -203,7 +203,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-209
+        - image: 926694233939.dkr.ecr.eu-central-1.amazonaws.com/production_namespace/teapot/admission-controller:master-211
           name: admission-controller
           lifecycle:
             preStop: