Skip to content

Commit 73b1648

Browse files
jimmidysonjimmidyson
authored
test: Bump Kubernetes versions for tests (#893)
Updated Docker to run tests on 1.29, 1.30, and 1.31. Updated Nutanix machine image to use 1.29.6 release image. Also update all addons.
1 parent 6126a86 commit 73b1648

File tree

26 files changed

+414
-188
lines changed

26 files changed

+414
-188
lines changed

‎.github/workflows/checks.yml‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,20 @@ jobs:
6363
- "unit-test"
6464
strategy:
6565
matrix:
66-
provider:
67-
- Docker
68-
- Nutanix
66+
config:
67+
- {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"}
68+
- {"provider": "Docker", "kubernetesVersion": "v1.29.8"}
69+
- {"provider": "Docker", "kubernetesVersion": "v1.30.4"}
70+
- {"provider": "Docker", "kubernetesVersion": "v1.31.0"}
6971
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
70-
# - AWS
72+
# - {"provider": "AWS", "kubernetesVersion": "v1.29.6"}
7173
fail-fast: false
7274
uses: ./.github/workflows/e2e.yml
7375
with:
74-
provider: ${{ matrix.provider }}
7576
focus: Quick start
76-
runs-on: ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
77+
provider: ${{ matrix.config.provider }}
78+
kubernetes-version: ${{ matrix.config.kubernetesVersion }}
79+
runs-on: ${{ matrix.config.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
7780
secrets: inherit
7881
permissions:
7982
contents: read
@@ -88,17 +91,20 @@ jobs:
8891
- "unit-test"
8992
strategy:
9093
matrix:
91-
provider:
92-
- Docker
94+
config:
95+
- {"provider": "Docker", "kubernetesVersion": "v1.29.8"}
96+
- {"provider": "Docker", "kubernetesVersion": "v1.30.4"}
97+
- {"provider": "Docker", "kubernetesVersion": "v1.31.0"}
9398
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
94-
# - AWS
95-
# - Nutanix
99+
# - {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"}
100+
# - {"provider": "AWS", "kubernetesVersion": "v1.29.6"}
96101
fail-fast: false
97102
uses: ./.github/workflows/e2e.yml
98103
with:
99-
provider: ${{ matrix.provider }}
100104
focus: Self-hosted
101-
runs-on: ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
105+
provider: ${{ matrix.config.provider }}
106+
kubernetes-version: ${{ matrix.config.kubernetesVersion }}
107+
runs-on: ${{ matrix.config.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
102108
secrets: inherit
103109
permissions:
104110
contents: read

‎.github/workflows/e2e.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ on:
1818
description: The runner to run the e2e tests on
1919
type: string
2020
required: true
21+
kubernetes-version:
22+
description: The version of Kubernetes to test with
23+
type: string
24+
required: true
2125

2226
jobs:
2327
e2e-test:
@@ -83,7 +87,8 @@ jobs:
8387
NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ${{ vars.NUTANIX_PRISM_ELEMENT_CLUSTER_NAME }}
8488
NUTANIX_SUBNET_NAME: ${{ vars.NUTANIX_SUBNET_NAME }}
8589
NUTANIX_STORAGE_CONTAINER_NAME: ${{ vars.NUTANIX_STORAGE_CONTAINER_NAME }}
86-
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.29.6-20240716233458
90+
KINDEST_IMAGE_TAG: ${{ inputs.kubernetes-version }}
91+
E2E_KUBERNETES_VERSION: ${{ inputs.kubernetes-version }}
8792

8893
- if: success() || failure() # always run even if the previous step fails
8994
name: Publish e2e test report

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For example, the following command will create a Docker cluster with Cilium CNI
4444
```shell
4545
export CLUSTER_NAME=docker-cluster-cilium-helm-addon
4646
export CLUSTER_FILE=examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml
47-
export KUBERNETES_VERSION=v1.29.6
47+
export KUBERNETES_VERSION=v1.30.4
4848
```
4949

5050
```shell

‎charts/cluster-api-runtime-extensions-nutanix/README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
3737
| helmRepositoryImage.tag | string | `""` | |
3838
| hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
3939
| hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-aws-ccm-helm-values-template"` | |
40-
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.7"` | |
41-
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.28" | string | `"v1.28.6"` | |
42-
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.29" | string | `"v1.29.3"` | |
43-
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.1"` | |
40+
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.9"` | |
41+
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.28" | string | `"v1.28.9"` | |
42+
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.29" | string | `"v1.29.6"` | |
43+
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.2"` | |
44+
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.31" | string | `"v1.31.0"` | |
4445
| hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
4546
| hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-ccm-helm-values-template"` | |
4647
| hooks.clusterAutoscaler.crsStrategy.defaultInstallationConfigMap.name | string | `"cluster-autoscaler"` | |

‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.7-configmap.yaml‎ renamed to ‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.27.9-configmap.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#=================================================================
88
apiVersion: v1
99
data:
10-
aws-ccm-v1.27.7.yaml: |
10+
aws-ccm-v1.27.9.yaml: |
1111
apiVersion: v1
1212
kind: ServiceAccount
1313
metadata:
@@ -160,7 +160,7 @@ data:
160160
- --cloud-provider=aws
161161
- --configure-cloud-routes=false
162162
env: []
163-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.7
163+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9
164164
name: aws-cloud-controller-manager
165165
resources:
166166
requests:
@@ -186,4 +186,4 @@ data:
186186
kind: ConfigMap
187187
metadata:
188188
creationTimestamp: null
189-
name: aws-ccm-v1.27.7
189+
name: aws-ccm-v1.27.9

‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.6-configmap.yaml‎ renamed to ‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.28.9-configmap.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#=================================================================
88
apiVersion: v1
99
data:
10-
aws-ccm-v1.28.6.yaml: |
10+
aws-ccm-v1.28.9.yaml: |
1111
apiVersion: v1
1212
kind: ServiceAccount
1313
metadata:
@@ -160,7 +160,7 @@ data:
160160
- --cloud-provider=aws
161161
- --configure-cloud-routes=false
162162
env: []
163-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.6
163+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.9
164164
name: aws-cloud-controller-manager
165165
resources:
166166
requests:
@@ -186,4 +186,4 @@ data:
186186
kind: ConfigMap
187187
metadata:
188188
creationTimestamp: null
189-
name: aws-ccm-v1.28.6
189+
name: aws-ccm-v1.28.9

‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.3-configmap.yaml‎ renamed to ‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.29.6-configmap.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#=================================================================
88
apiVersion: v1
99
data:
10-
aws-ccm-v1.29.3.yaml: |
10+
aws-ccm-v1.29.6.yaml: |
1111
apiVersion: v1
1212
kind: ServiceAccount
1313
metadata:
@@ -160,7 +160,7 @@ data:
160160
- --cloud-provider=aws
161161
- --configure-cloud-routes=false
162162
env: []
163-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.3
163+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.6
164164
name: aws-cloud-controller-manager
165165
resources:
166166
requests:
@@ -186,4 +186,4 @@ data:
186186
kind: ConfigMap
187187
metadata:
188188
creationTimestamp: null
189-
name: aws-ccm-v1.29.3
189+
name: aws-ccm-v1.29.6

‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.1-configmap.yaml‎ renamed to ‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.30.2-configmap.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#=================================================================
88
apiVersion: v1
99
data:
10-
aws-ccm-v1.30.1.yaml: |
10+
aws-ccm-v1.30.2.yaml: |
1111
apiVersion: v1
1212
kind: ServiceAccount
1313
metadata:
@@ -160,7 +160,7 @@ data:
160160
- --cloud-provider=aws
161161
- --configure-cloud-routes=false
162162
env: []
163-
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.1
163+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.2
164164
name: aws-cloud-controller-manager
165165
resources:
166166
requests:
@@ -186,4 +186,4 @@ data:
186186
kind: ConfigMap
187187
metadata:
188188
creationTimestamp: null
189-
name: aws-ccm-v1.30.1
189+
name: aws-ccm-v1.30.2

‎charts/cluster-api-runtime-extensions-nutanix/templates/ccm/aws/manifests/aws-ccm-v1.31.0-configmap.yaml‎

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
# Copyright 2024 Nutanix. All rights reserved.
2+
# SPDX-License-Identifier: Apache-2.0
3+
4+
#=================================================================
5+
# DO NOT EDIT THIS FILE
6+
# IT HAS BEEN GENERATED BY /hack/addons/update-aws-ccm.sh
7+
#=================================================================
8+
apiVersion: v1
9+
data:
10+
aws-ccm-v1.31.0.yaml: |
11+
apiVersion: v1
12+
kind: ServiceAccount
13+
metadata:
14+
labels:
15+
helm.sh/chart: aws-cloud-controller-manager-0.0.8
16+
name: cloud-controller-manager
17+
namespace: kube-system
18+
---
19+
apiVersion: rbac.authorization.k8s.io/v1
20+
kind: ClusterRole
21+
metadata:
22+
labels:
23+
helm.sh/chart: aws-cloud-controller-manager-0.0.8
24+
name: system:cloud-controller-manager
25+
rules:
26+
- apiGroups:
27+
- ""
28+
resources:
29+
- events
30+
verbs:
31+
- create
32+
- patch
33+
- update
34+
- apiGroups:
35+
- ""
36+
resources:
37+
- nodes
38+
verbs:
39+
- '*'
40+
- apiGroups:
41+
- ""
42+
resources:
43+
- nodes/status
44+
verbs:
45+
- patch
46+
- apiGroups:
47+
- ""
48+
resources:
49+
- services
50+
verbs:
51+
- list
52+
- patch
53+
- update
54+
- watch
55+
- apiGroups:
56+
- ""
57+
resources:
58+
- services/status
59+
verbs:
60+
- list
61+
- patch
62+
- update
63+
- watch
64+
- apiGroups:
65+
- ""
66+
resources:
67+
- serviceaccounts
68+
verbs:
69+
- create
70+
- apiGroups:
71+
- ""
72+
resources:
73+
- persistentvolumes
74+
verbs:
75+
- get
76+
- list
77+
- update
78+
- watch
79+
- apiGroups:
80+
- ""
81+
resources:
82+
- endpoints
83+
verbs:
84+
- create
85+
- get
86+
- list
87+
- watch
88+
- update
89+
- apiGroups:
90+
- coordination.k8s.io
91+
resources:
92+
- leases
93+
verbs:
94+
- create
95+
- get
96+
- list
97+
- watch
98+
- update
99+
- apiGroups:
100+
- ""
101+
resources:
102+
- serviceaccounts/token
103+
verbs:
104+
- create
105+
---
106+
apiVersion: rbac.authorization.k8s.io/v1
107+
kind: RoleBinding
108+
metadata:
109+
labels:
110+
helm.sh/chart: aws-cloud-controller-manager-0.0.8
111+
name: cloud-controller-manager:apiserver-authentication-reader
112+
namespace: kube-system
113+
roleRef:
114+
apiGroup: rbac.authorization.k8s.io
115+
kind: Role
116+
name: extension-apiserver-authentication-reader
117+
subjects:
118+
- apiGroup: ""
119+
kind: ServiceAccount
120+
name: cloud-controller-manager
121+
namespace: kube-system
122+
---
123+
apiVersion: rbac.authorization.k8s.io/v1
124+
kind: ClusterRoleBinding
125+
metadata:
126+
labels:
127+
helm.sh/chart: aws-cloud-controller-manager-0.0.8
128+
name: system:cloud-controller-manager
129+
roleRef:
130+
apiGroup: rbac.authorization.k8s.io
131+
kind: ClusterRole
132+
name: system:cloud-controller-manager
133+
subjects:
134+
- apiGroup: ""
135+
kind: ServiceAccount
136+
name: cloud-controller-manager
137+
namespace: kube-system
138+
---
139+
apiVersion: apps/v1
140+
kind: DaemonSet
141+
metadata:
142+
labels:
143+
helm.sh/chart: aws-cloud-controller-manager-0.0.8
144+
k8s-app: aws-cloud-controller-manager
145+
name: aws-cloud-controller-manager
146+
namespace: kube-system
147+
spec:
148+
selector:
149+
matchLabels:
150+
k8s-app: aws-cloud-controller-manager
151+
template:
152+
metadata:
153+
labels:
154+
k8s-app: aws-cloud-controller-manager
155+
name: aws-cloud-controller-manager
156+
spec:
157+
containers:
158+
- args:
159+
- --v=2
160+
- --cloud-provider=aws
161+
- --configure-cloud-routes=false
162+
env: []
163+
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
164+
name: aws-cloud-controller-manager
165+
resources:
166+
requests:
167+
cpu: 200m
168+
securityContext: {}
169+
dnsPolicy: Default
170+
hostNetwork: true
171+
nodeSelector:
172+
node-role.kubernetes.io/control-plane: ""
173+
priorityClassName: system-node-critical
174+
securityContext: {}
175+
serviceAccountName: cloud-controller-manager
176+
tolerations:
177+
- effect: NoSchedule
178+
key: node.cloudprovider.kubernetes.io/uninitialized
179+
value: "true"
180+
- effect: NoSchedule
181+
key: node-role.kubernetes.io/master
182+
- effect: NoSchedule
183+
key: node-role.kubernetes.io/control-plane
184+
updateStrategy:
185+
type: RollingUpdate
186+
kind: ConfigMap
187+
metadata:
188+
creationTimestamp: null
189+
name: aws-ccm-v1.31.0

‎charts/cluster-api-runtime-extensions-nutanix/templates/cni/cilium/manifests/cilium-configmap.yaml‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)