Skip to content

Commit

Permalink
Merge pull request #7472 from zalando-incubator/kube-1.30-to-alpha
Browse files Browse the repository at this point in the history
kube-1.30 to alpha
  • Loading branch information
mikkeloscar authored May 8, 2024
2 parents 584273b + 890329c commit 4672c9d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cluster/manifests/coredns-local/daemonset-coredns.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ spec:
memory: {{.Cluster.ConfigItems.dns_dnsmasq_sidecar_mem}}
{{ end }}
- name: coredns
image: container-registry.zalando.net/teapot/coredns:1.11.2-master-22
image: container-registry.zalando.net/teapot/coredns:1.11.3-master-23
args: [ "-conf", "/etc/coredns/Corefile" ]
env:
- name: ZONE
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{ $internal_version := "v0.21.76-905" }}
{{ $canary_internal_version := "v0.21.76-905" }}
{{ $canary_internal_version := "v0.21.86-915" }}

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

0 comments on commit 4672c9d

Please sign in to comment.