Skip to content

Commit

Permalink
Merge pull request #8752 from zalando-incubator/dev-to-eks
Browse files Browse the repository at this point in the history
dev to eks
  • Loading branch information
mikkeloscar authored Jan 10, 2025
2 parents b810db1 + 1503af5 commit 5fe487e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cluster/manifests/fabric-gateway/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-293" }}
# {{ $image := "container-registry.zalando.net/gwproxy/fabric-gateway:master-296" }}
# {{ $version := index (split $image ":") 1 }}
apiVersion: apps/v1
kind: Deployment
Expand Down
2 changes: 1 addition & 1 deletion cluster/manifests/skipper/deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{/* image-updater-bot detects *image variables so use print to disable it for main image */}}

{{ $main_image := print "container-registry.zalando.net/teapot/skipper-internal:" "v0.21.240-1063" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.240-1063" }}
{{ $canary_image := "container-registry.zalando.net/teapot/skipper-internal:v0.21.247-1070" }}

{{/* Optional canary arguments separated by "[cf724afc]" to allow whitespaces, e.g. "-foo=has a whitespace[cf724afc]-baz=qux" */}}
{{ $canary_args := "" }}
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/master-default/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Resources:
VolumeType: gp3
NetworkInterfaces:
- DeviceIndex: 0
# {{ if eq .Cluster.ConfigItems.associate_public_ip_on_launch "true" }}
# {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }}
AssociatePublicIpAddress: true
# {{ end }}
Groups:
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/worker-karpenter/provisioners.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
securityGroupSelectorTerms:
- tags:
karpenter.sh/discovery: "{{ .Cluster.ID }}/WorkerNodeSecurityGroup"
# {{ if eq .Cluster.ConfigItems.associate_public_ip_on_launch "true" }}
# {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }}
associatePublicIPAddress: true
# {{ end }}
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
Expand Down
2 changes: 1 addition & 1 deletion cluster/node-pools/worker-splitaz/stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Resources:
VolumeType: gp3
NetworkInterfaces:
- DeviceIndex: 0
# {{ if eq .Cluster.ConfigItems.associate_public_ip_on_launch "true" }}
# {{ if eq .NodePool.ConfigItems.associate_public_ip_on_launch "true" }}
AssociatePublicIpAddress: true
# {{ end }}
# {{- if and (eq .Cluster.Provider "zalando-eks") (eq .Cluster.ConfigItems.eks_ip_family "ipv6") }}
Expand Down

0 comments on commit 5fe487e

Please sign in to comment.