Skip to content

Commit c4e93f3

Browse files
authored
Merge pull request #9699 from zalando-incubator/dev-to-alpha
dev to alpha
2 parents 006b873 + 24af0b4 commit c4e93f3

File tree

5 files changed

+70
-58
lines changed

5 files changed

+70
-58
lines changed

cluster/manifests/stackset-controller/deployment.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{ $version := "v1.4.99" }}
1+
{{ $version := "v1.4.112" }}
22
apiVersion: apps/v1
33
kind: Deployment
44
metadata:
@@ -55,8 +55,10 @@ spec:
5555
- "--sync-ingress-annotation=zalando.org/aws-waf-web-acl-id"
5656
- "--sync-ingress-annotation=kubernetes.io/ingress.class"
5757
{{ end}}
58-
- "--cluster-domain={{ .Values.hosted_zone }}"
5958
- "--cluster-domain=ingress.cluster.local"
59+
{{- if eq .Cluster.Provider "zalando-aws" }}
60+
- "--cluster-domain={{ .Values.hosted_zone }}"
61+
{{- end }}
6062
resources:
6163
limits:
6264
cpu: 10m

delivery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pipeline:
1111
- event: pull_request
1212
vm_config:
1313
type: linux
14-
image: "cdp-runtime/go-1.23"
14+
image: "cdp-runtime/go-1.24"
1515
size: large # speed up building kubernetes/kubernetes
1616
cache:
1717
paths:

test/e2e/apply/config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ data:
99
HOSTED_ZONE: "teapot-e2e.zalan.do"
1010
REGION: "eu-central-1"
1111
AWS_REGION: "eu-central-1"
12-
CLUSTER_DOMAIN: "teapot-e2e.zalan.do"
13-
CLUSTER_DOMAIN_INTERNAL: "ingress.cluster.local"
12+
CLUSTER_DOMAIN: "ingress.cluster.local"
1413
RESULT_BUCKET: "teapot-kubernetes-e2e-results"
1514
ETCD_ENDPOINTS: "https://etcd-server.etcd.teapot-e2e.zalan.do:2479"
1615
SKIPPER_OPA_ENABLED: "true"
@@ -26,6 +25,7 @@ metadata:
2625
name: "{{{APPLICATION}}}-{{{COMPONENT}}}-config-provider-aws"
2726
data:
2827
CLUSTER_PROVIDER: "zalando-aws"
28+
CLUSTER_DOMAIN_INTERNAL: "teapot-e2e.zalan.do"
2929

3030
---
3131

@@ -38,3 +38,4 @@ metadata:
3838
name: "{{{APPLICATION}}}-{{{COMPONENT}}}-config-provider-eks"
3939
data:
4040
CLUSTER_PROVIDER: "zalando-eks"
41+
CLUSTER_DOMAIN_INTERNAL: ""

test/e2e/stackset/go.mod

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/zalando-incubator/kubernetes-on-aws/test/e2e/stackset
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.24.3
5+
toolchain go1.24.4
66

7-
require github.com/zalando-incubator/stackset-controller v1.4.99
7+
require github.com/zalando-incubator/stackset-controller v1.4.110
88

99
require (
1010
github.com/beorn7/perks v1.0.1 // indirect
@@ -17,10 +17,8 @@ require (
1717
github.com/go-openapi/jsonreference v0.21.0 // indirect
1818
github.com/go-openapi/swag v0.23.0 // indirect
1919
github.com/gogo/protobuf v1.3.2 // indirect
20-
github.com/golang/protobuf v1.5.4 // indirect
21-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
20+
github.com/google/gnostic-models v0.6.9 // indirect
2221
github.com/google/go-cmp v0.7.0 // indirect
23-
github.com/google/gofuzz v1.2.0 // indirect
2422
github.com/google/uuid v1.6.0 // indirect
2523
github.com/heptiolabs/healthcheck v0.0.0-20211123025425-613501dd5deb // indirect
2624
github.com/josharian/intern v1.0.0 // indirect
@@ -40,24 +38,26 @@ require (
4038
github.com/stretchr/testify v1.10.0 // indirect
4139
github.com/szuecs/routegroup-client v0.28.2 // indirect
4240
github.com/x448/float16 v0.8.4 // indirect
43-
golang.org/x/net v0.36.0 // indirect
44-
golang.org/x/oauth2 v0.24.0 // indirect
45-
golang.org/x/sync v0.13.0 // indirect
46-
golang.org/x/sys v0.30.0 // indirect
47-
golang.org/x/term v0.29.0 // indirect
48-
golang.org/x/text v0.22.0 // indirect
49-
golang.org/x/time v0.7.0 // indirect
41+
go.yaml.in/yaml/v2 v2.4.2 // indirect
42+
golang.org/x/net v0.39.0 // indirect
43+
golang.org/x/oauth2 v0.27.0 // indirect
44+
golang.org/x/sync v0.16.0 // indirect
45+
golang.org/x/sys v0.32.0 // indirect
46+
golang.org/x/term v0.31.0 // indirect
47+
golang.org/x/text v0.24.0 // indirect
48+
golang.org/x/time v0.9.0 // indirect
5049
google.golang.org/protobuf v1.36.5 // indirect
5150
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5251
gopkg.in/inf.v0 v0.9.1 // indirect
5352
gopkg.in/yaml.v3 v3.0.1 // indirect
54-
k8s.io/api v0.32.3 // indirect
55-
k8s.io/apimachinery v0.32.3 // indirect
56-
k8s.io/client-go v0.32.3 // indirect
53+
k8s.io/api v0.33.2 // indirect
54+
k8s.io/apimachinery v0.33.2 // indirect
55+
k8s.io/client-go v0.33.2 // indirect
5756
k8s.io/klog/v2 v2.130.1 // indirect
58-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
57+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
5958
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
6059
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
61-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
62-
sigs.k8s.io/yaml v1.4.0 // indirect
60+
sigs.k8s.io/randfill v1.0.0 // indirect
61+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
62+
sigs.k8s.io/yaml v1.5.0 // indirect
6363
)

0 commit comments

Comments
 (0)