Skip to content

Commit e236d4a

Browse files
hakmanhakman
committed
Add integration tests for Kubernetes 1.35 and 1.36
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
1 parent 61576cd commit e236d4a

File tree

74 files changed

+10674
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+10674
-0
lines changed

‎cmd/kops/create_cluster_integration_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ var MagicTimestamp = metav1.Time{Time: time.Date(2017, 1, 1, 0, 0, 0, 0, time.UT
4848
func TestCreateClusterMinimal(t *testing.T) {
4949
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.31", "v1alpha2")
5050
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.32", "v1alpha2")
51+
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.35", "v1alpha2")
52+
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-1.36", "v1alpha2")
5153
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-arm64", "v1alpha2")
5254
runCreateClusterIntegrationTest(t, "../../tests/integration/create_cluster/minimal-irsa", "v1alpha2")
5355
}

‎cmd/kops/integration_test.go‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,28 @@ func TestMinimal_v1_34(t *testing.T) {
301301
runTestTerraformAWS(t)
302302
}
303303

304+
// TestMinimal runs the test on a minimum configuration
305+
func TestMinimal_v1_35(t *testing.T) {
306+
newIntegrationTest("minimal.example.com", "minimal-1.35").
307+
withAddons(
308+
awsEBSCSIAddon,
309+
dnsControllerAddon,
310+
awsCCMAddon,
311+
).
312+
runTestTerraformAWS(t)
313+
}
314+
315+
// TestMinimal runs the test on a minimum configuration
316+
func TestMinimal_v1_36(t *testing.T) {
317+
newIntegrationTest("minimal.example.com", "minimal-1.36").
318+
withAddons(
319+
awsEBSCSIAddon,
320+
dnsControllerAddon,
321+
awsCCMAddon,
322+
).
323+
runTestTerraformAWS(t)
324+
}
325+
304326
// TestMinimalAzure runs the test on a minimum Azure configuration.
305327
func TestMinimalAzure(t *testing.T) {
306328
newIntegrationTest("minimal-azure.example.com", "minimal_azure").

‎tests/integration/create_cluster/minimal-1.35/expected-v1alpha2.yaml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
apiVersion: kops.k8s.io/v1alpha2
2+
kind: Cluster
3+
metadata:
4+
creationTimestamp: "2017-01-01T00:00:00Z"
5+
name: minimal.example.com
6+
spec:
7+
api:
8+
loadBalancer:
9+
class: Network
10+
type: Public
11+
authorization:
12+
rbac: {}
13+
channel: stable
14+
cloudProvider: aws
15+
configBase: memfs://tests/minimal.example.com
16+
etcdClusters:
17+
- cpuRequest: 200m
18+
etcdMembers:
19+
- encryptedVolume: true
20+
instanceGroup: control-plane-us-test-1a
21+
name: a
22+
manager:
23+
backupRetentionDays: 90
24+
memoryRequest: 100Mi
25+
name: main
26+
- cpuRequest: 100m
27+
etcdMembers:
28+
- encryptedVolume: true
29+
instanceGroup: control-plane-us-test-1a
30+
name: a
31+
manager:
32+
backupRetentionDays: 90
33+
memoryRequest: 100Mi
34+
name: events
35+
iam:
36+
allowContainerRegistry: true
37+
legacy: false
38+
kubelet:
39+
anonymousAuth: false
40+
kubernetesApiAccess:
41+
- 0.0.0.0/0
42+
- ::/0
43+
kubernetesVersion: v1.35.0
44+
networkCIDR: 172.20.0.0/16
45+
networking:
46+
cni: {}
47+
nonMasqueradeCIDR: 100.64.0.0/10
48+
sshAccess:
49+
- 0.0.0.0/0
50+
- ::/0
51+
subnets:
52+
- cidr: 172.20.0.0/16
53+
name: us-test-1a
54+
type: Public
55+
zone: us-test-1a
56+
topology:
57+
dns:
58+
type: None
59+
60+
---
61+
62+
apiVersion: kops.k8s.io/v1alpha2
63+
kind: InstanceGroup
64+
metadata:
65+
creationTimestamp: "2017-01-01T00:00:00Z"
66+
labels:
67+
kops.k8s.io/cluster: minimal.example.com
68+
name: control-plane-us-test-1a
69+
spec:
70+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
71+
machineType: m3.medium
72+
maxSize: 1
73+
minSize: 1
74+
role: Master
75+
subnets:
76+
- us-test-1a
77+
78+
---
79+
80+
apiVersion: kops.k8s.io/v1alpha2
81+
kind: InstanceGroup
82+
metadata:
83+
creationTimestamp: "2017-01-01T00:00:00Z"
84+
labels:
85+
kops.k8s.io/cluster: minimal.example.com
86+
name: nodes-us-test-1a
87+
spec:
88+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
89+
machineType: t2.medium
90+
maxSize: 1
91+
minSize: 1
92+
role: Node
93+
subnets:
94+
- us-test-1a

‎tests/integration/create_cluster/minimal-1.35/options.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ClusterName: minimal.example.com
2+
Zones:
3+
- us-test-1a
4+
CloudProvider: aws
5+
Networking: cni
6+
KubernetesVersion: v1.35.0

‎tests/integration/create_cluster/minimal-1.36/expected-v1alpha2.yaml‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
apiVersion: kops.k8s.io/v1alpha2
2+
kind: Cluster
3+
metadata:
4+
creationTimestamp: "2017-01-01T00:00:00Z"
5+
name: minimal.example.com
6+
spec:
7+
api:
8+
loadBalancer:
9+
class: Network
10+
type: Public
11+
authorization:
12+
rbac: {}
13+
channel: stable
14+
cloudProvider: aws
15+
configBase: memfs://tests/minimal.example.com
16+
etcdClusters:
17+
- cpuRequest: 200m
18+
etcdMembers:
19+
- encryptedVolume: true
20+
instanceGroup: control-plane-us-test-1a
21+
name: a
22+
manager:
23+
backupRetentionDays: 90
24+
memoryRequest: 100Mi
25+
name: main
26+
- cpuRequest: 100m
27+
etcdMembers:
28+
- encryptedVolume: true
29+
instanceGroup: control-plane-us-test-1a
30+
name: a
31+
manager:
32+
backupRetentionDays: 90
33+
memoryRequest: 100Mi
34+
name: events
35+
iam:
36+
allowContainerRegistry: true
37+
legacy: false
38+
kubelet:
39+
anonymousAuth: false
40+
kubernetesApiAccess:
41+
- 0.0.0.0/0
42+
- ::/0
43+
kubernetesVersion: v1.36.0
44+
networkCIDR: 172.20.0.0/16
45+
networking:
46+
cni: {}
47+
nonMasqueradeCIDR: 100.64.0.0/10
48+
sshAccess:
49+
- 0.0.0.0/0
50+
- ::/0
51+
subnets:
52+
- cidr: 172.20.0.0/16
53+
name: us-test-1a
54+
type: Public
55+
zone: us-test-1a
56+
topology:
57+
dns:
58+
type: None
59+
60+
---
61+
62+
apiVersion: kops.k8s.io/v1alpha2
63+
kind: InstanceGroup
64+
metadata:
65+
creationTimestamp: "2017-01-01T00:00:00Z"
66+
labels:
67+
kops.k8s.io/cluster: minimal.example.com
68+
name: control-plane-us-test-1a
69+
spec:
70+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
71+
machineType: m3.medium
72+
maxSize: 1
73+
minSize: 1
74+
role: Master
75+
subnets:
76+
- us-test-1a
77+
78+
---
79+
80+
apiVersion: kops.k8s.io/v1alpha2
81+
kind: InstanceGroup
82+
metadata:
83+
creationTimestamp: "2017-01-01T00:00:00Z"
84+
labels:
85+
kops.k8s.io/cluster: minimal.example.com
86+
name: nodes-us-test-1a
87+
spec:
88+
image: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20260218
89+
machineType: t2.medium
90+
maxSize: 1
91+
minSize: 1
92+
role: Node
93+
subnets:
94+
- us-test-1a

‎tests/integration/create_cluster/minimal-1.36/options.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ClusterName: minimal.example.com
2+
Zones:
3+
- us-test-1a
4+
CloudProvider: aws
5+
Networking: cni
6+
KubernetesVersion: v1.36.0

‎tests/integration/update_cluster/minimal-1.35/data/aws_cloudwatch_event_rule_minimal.example.com-ASGLifecycle_event_pattern‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"source":["aws.autoscaling"],"detail-type":["EC2 Instance-terminate Lifecycle Action"]}

‎tests/integration/update_cluster/minimal-1.35/data/aws_cloudwatch_event_rule_minimal.example.com-InstanceScheduledChange_event_pattern‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"source": ["aws.health"],"detail-type": ["AWS Health Event"],"detail": {"service": ["EC2"],"eventTypeCategory": ["scheduledChange"]}}

‎tests/integration/update_cluster/minimal-1.35/data/aws_cloudwatch_event_rule_minimal.example.com-InstanceStateChange_event_pattern‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"source": ["aws.ec2"],"detail-type": ["EC2 Instance State-change Notification"]}

‎tests/integration/update_cluster/minimal-1.35/data/aws_cloudwatch_event_rule_minimal.example.com-SpotInterruption_event_pattern‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"source": ["aws.ec2"],"detail-type": ["EC2 Spot Instance Interruption Warning"]}

0 commit comments

Comments
 (0)