Skip to content

Commit

Permalink
test: Bump Kubernetes versions for tests (#893)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jimmidyson authored Sep 2, 2024
1 parent 6126a86 commit 73b1648
Show file tree
Hide file tree
Showing 26 changed files with 414 additions and 188 deletions.
30 changes: 18 additions & 12 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,20 @@ jobs:
- "unit-test"
strategy:
matrix:
provider:
- Docker
- Nutanix
config:
- {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"}
- {"provider": "Docker", "kubernetesVersion": "v1.29.8"}
- {"provider": "Docker", "kubernetesVersion": "v1.30.4"}
- {"provider": "Docker", "kubernetesVersion": "v1.31.0"}
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
# - AWS
# - {"provider": "AWS", "kubernetesVersion": "v1.29.6"}
fail-fast: false
uses: ./.github/workflows/e2e.yml
with:
provider: ${{ matrix.provider }}
focus: Quick start
runs-on: ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
provider: ${{ matrix.config.provider }}
kubernetes-version: ${{ matrix.config.kubernetesVersion }}
runs-on: ${{ matrix.config.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
secrets: inherit
permissions:
contents: read
Expand All @@ -88,17 +91,20 @@ jobs:
- "unit-test"
strategy:
matrix:
provider:
- Docker
config:
- {"provider": "Docker", "kubernetesVersion": "v1.29.8"}
- {"provider": "Docker", "kubernetesVersion": "v1.30.4"}
- {"provider": "Docker", "kubernetesVersion": "v1.31.0"}
# Uncomment below once we have the ability to run e2e tests on other providers from GHA.
# - AWS
# - Nutanix
# - {"provider": "Nutanix", "kubernetesVersion": "v1.29.6"}
# - {"provider": "AWS", "kubernetesVersion": "v1.29.6"}
fail-fast: false
uses: ./.github/workflows/e2e.yml
with:
provider: ${{ matrix.provider }}
focus: Self-hosted
runs-on: ${{ matrix.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
provider: ${{ matrix.config.provider }}
kubernetes-version: ${{ matrix.config.kubernetesVersion }}
runs-on: ${{ matrix.config.provider == 'Nutanix' && 'self-hosted-ncn-dind' || 'ubuntu-22.04' }}
secrets: inherit
permissions:
contents: read
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ on:
description: The runner to run the e2e tests on
type: string
required: true
kubernetes-version:
description: The version of Kubernetes to test with
type: string
required: true

jobs:
e2e-test:
Expand Down Expand Up @@ -83,7 +87,8 @@ jobs:
NUTANIX_PRISM_ELEMENT_CLUSTER_NAME: ${{ vars.NUTANIX_PRISM_ELEMENT_CLUSTER_NAME }}
NUTANIX_SUBNET_NAME: ${{ vars.NUTANIX_SUBNET_NAME }}
NUTANIX_STORAGE_CONTAINER_NAME: ${{ vars.NUTANIX_STORAGE_CONTAINER_NAME }}
NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME: nkp-rocky-9.4-release-1.29.6-20240716233458
KINDEST_IMAGE_TAG: ${{ inputs.kubernetes-version }}
E2E_KUBERNETES_VERSION: ${{ inputs.kubernetes-version }}

- if: success() || failure() # always run even if the previous step fails
name: Publish e2e test report
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ For example, the following command will create a Docker cluster with Cilium CNI
```shell
export CLUSTER_NAME=docker-cluster-cilium-helm-addon
export CLUSTER_FILE=examples/capi-quick-start/docker-cluster-cilium-helm-addon.yaml
export KUBERNETES_VERSION=v1.29.6
export KUBERNETES_VERSION=v1.30.4
```

```shell
Expand Down
9 changes: 5 additions & 4 deletions charts/cluster-api-runtime-extensions-nutanix/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ A Helm chart for cluster-api-runtime-extensions-nutanix
| helmRepositoryImage.tag | string | `""` | |
| hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
| hooks.ccm.aws.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-aws-ccm-helm-values-template"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.7"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.28" | string | `"v1.28.6"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.29" | string | `"v1.29.3"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.1"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.27" | string | `"v1.27.9"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.28" | string | `"v1.28.9"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.29" | string | `"v1.29.6"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.30" | string | `"v1.30.2"` | |
| hooks.ccm.aws.k8sMinorVersionToCCMVersion."1.31" | string | `"v1.31.0"` | |
| hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.create | bool | `true` | |
| hooks.ccm.nutanix.helmAddonStrategy.defaultValueTemplateConfigMap.name | string | `"default-nutanix-ccm-helm-values-template"` | |
| hooks.clusterAutoscaler.crsStrategy.defaultInstallationConfigMap.name | string | `"cluster-autoscaler"` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#=================================================================
apiVersion: v1
data:
aws-ccm-v1.27.7.yaml: |
aws-ccm-v1.27.9.yaml: |
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down Expand Up @@ -160,7 +160,7 @@ data:
- --cloud-provider=aws
- --configure-cloud-routes=false
env: []
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.7
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.27.9
name: aws-cloud-controller-manager
resources:
requests:
Expand All @@ -186,4 +186,4 @@ data:
kind: ConfigMap
metadata:
creationTimestamp: null
name: aws-ccm-v1.27.7
name: aws-ccm-v1.27.9
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#=================================================================
apiVersion: v1
data:
aws-ccm-v1.28.6.yaml: |
aws-ccm-v1.28.9.yaml: |
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down Expand Up @@ -160,7 +160,7 @@ data:
- --cloud-provider=aws
- --configure-cloud-routes=false
env: []
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.6
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.28.9
name: aws-cloud-controller-manager
resources:
requests:
Expand All @@ -186,4 +186,4 @@ data:
kind: ConfigMap
metadata:
creationTimestamp: null
name: aws-ccm-v1.28.6
name: aws-ccm-v1.28.9
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#=================================================================
apiVersion: v1
data:
aws-ccm-v1.29.3.yaml: |
aws-ccm-v1.29.6.yaml: |
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down Expand Up @@ -160,7 +160,7 @@ data:
- --cloud-provider=aws
- --configure-cloud-routes=false
env: []
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.3
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.29.6
name: aws-cloud-controller-manager
resources:
requests:
Expand All @@ -186,4 +186,4 @@ data:
kind: ConfigMap
metadata:
creationTimestamp: null
name: aws-ccm-v1.29.3
name: aws-ccm-v1.29.6
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#=================================================================
apiVersion: v1
data:
aws-ccm-v1.30.1.yaml: |
aws-ccm-v1.30.2.yaml: |
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down Expand Up @@ -160,7 +160,7 @@ data:
- --cloud-provider=aws
- --configure-cloud-routes=false
env: []
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.30.2
name: aws-cloud-controller-manager
resources:
requests:
Expand All @@ -186,4 +186,4 @@ data:
kind: ConfigMap
metadata:
creationTimestamp: null
name: aws-ccm-v1.30.1
name: aws-ccm-v1.30.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
# Copyright 2024 Nutanix. All rights reserved.
# SPDX-License-Identifier: Apache-2.0

#=================================================================
# DO NOT EDIT THIS FILE
# IT HAS BEEN GENERATED BY /hack/addons/update-aws-ccm.sh
#=================================================================
apiVersion: v1
data:
aws-ccm-v1.31.0.yaml: |
apiVersion: v1
kind: ServiceAccount
metadata:
labels:
helm.sh/chart: aws-cloud-controller-manager-0.0.8
name: cloud-controller-manager
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: aws-cloud-controller-manager-0.0.8
name: system:cloud-controller-manager
rules:
- apiGroups:
- ""
resources:
- events
verbs:
- create
- patch
- update
- apiGroups:
- ""
resources:
- nodes
verbs:
- '*'
- apiGroups:
- ""
resources:
- nodes/status
verbs:
- patch
- apiGroups:
- ""
resources:
- services
verbs:
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- services/status
verbs:
- list
- patch
- update
- watch
- apiGroups:
- ""
resources:
- serviceaccounts
verbs:
- create
- apiGroups:
- ""
resources:
- persistentvolumes
verbs:
- get
- list
- update
- watch
- apiGroups:
- ""
resources:
- endpoints
verbs:
- create
- get
- list
- watch
- update
- apiGroups:
- coordination.k8s.io
resources:
- leases
verbs:
- create
- get
- list
- watch
- update
- apiGroups:
- ""
resources:
- serviceaccounts/token
verbs:
- create
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: aws-cloud-controller-manager-0.0.8
name: cloud-controller-manager:apiserver-authentication-reader
namespace: kube-system
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: extension-apiserver-authentication-reader
subjects:
- apiGroup: ""
kind: ServiceAccount
name: cloud-controller-manager
namespace: kube-system
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: aws-cloud-controller-manager-0.0.8
name: system:cloud-controller-manager
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
name: system:cloud-controller-manager
subjects:
- apiGroup: ""
kind: ServiceAccount
name: cloud-controller-manager
namespace: kube-system
---
apiVersion: apps/v1
kind: DaemonSet
metadata:
labels:
helm.sh/chart: aws-cloud-controller-manager-0.0.8
k8s-app: aws-cloud-controller-manager
name: aws-cloud-controller-manager
namespace: kube-system
spec:
selector:
matchLabels:
k8s-app: aws-cloud-controller-manager
template:
metadata:
labels:
k8s-app: aws-cloud-controller-manager
name: aws-cloud-controller-manager
spec:
containers:
- args:
- --v=2
- --cloud-provider=aws
- --configure-cloud-routes=false
env: []
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.31.0
name: aws-cloud-controller-manager
resources:
requests:
cpu: 200m
securityContext: {}
dnsPolicy: Default
hostNetwork: true
nodeSelector:
node-role.kubernetes.io/control-plane: ""
priorityClassName: system-node-critical
securityContext: {}
serviceAccountName: cloud-controller-manager
tolerations:
- effect: NoSchedule
key: node.cloudprovider.kubernetes.io/uninitialized
value: "true"
- effect: NoSchedule
key: node-role.kubernetes.io/master
- effect: NoSchedule
key: node-role.kubernetes.io/control-plane
updateStrategy:
type: RollingUpdate
kind: ConfigMap
metadata:
creationTimestamp: null
name: aws-ccm-v1.31.0

Large diffs are not rendered by default.

Loading

0 comments on commit 73b1648

Please sign in to comment.