Skip to content

Commit 594554c

Browse files
authored
Merge pull request #8110 from zalando-incubator/dev-to-kube-1.31
dev to kube-1.31
2 parents 837ee44 + d5b8988 commit 594554c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

cluster/manifests/deletions.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,7 @@ post_apply:
324324
- name: dashboard-metrics-scraper-vpa
325325
namespace: kube-system
326326
kind: VerticalPodAutoscaler
327-
# clean this up in another step after the above resources have been cleaned-up
328-
# - name: kubernetes-dashboard
329-
# namespace: kube-system
330-
# kind: ServiceAccount
327+
- name: kubernetes-dashboard
328+
namespace: kube-system
329+
kind: ServiceAccount
331330
{{ end }}

cluster/manifests/skipper/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{ $internal_version := "v0.21.195-1014" }}
2-
{{ $canary_internal_version := "v0.21.195-1014" }}
2+
{{ $canary_internal_version := "v0.21.198-1017" }}
33

44
{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
55
{{ $canary_args := "" }}

0 commit comments

Comments
 (0)