Skip to content

Commit 3656f4b

Browse files
Merge pull request #1389 from Nordix/bump/k8s-v1.30
bump k8s to v1.30.0
2 parents 625028e + f7c2c40 commit 3656f4b

File tree

5 files changed

+38
-41
lines changed

5 files changed

+38
-41
lines changed

config_example.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
#
134134
#export CAPI_VERSION=v1beta1
135135

136-
#export KUBERNETES_VERSION="v1.29.0"
137-
#export UPGRADED_K8S_VERSION="v1.29.0"
136+
#export KUBERNETES_VERSION="v1.30.0"
137+
#export UPGRADED_K8S_VERSION="v1.30.0"
138138

139139
# Version of kubelet, kubeadm and kubectl binaries
140140
#export KUBERNETES_BINARIES_VERSION="${KUBERNETES_BINARIES_VERSION:-${KUBERNETES_VERSION}}"
@@ -149,11 +149,11 @@
149149

150150
# Image for target hosts deployment
151151
#
152-
#export IMAGE_NAME="CENTOS_9_NODE_IMAGE_K8S_v1.29.0.qcow2"
152+
#export IMAGE_NAME="CENTOS_9_NODE_IMAGE_K8S_v1.30.0.qcow2"
153153

154154
# Location of the image to download
155155
#
156-
#export IMAGE_LOCATION="https://artifactory.nordix.org/artifactory/metal3/images/k8s_v1.29.0"
156+
#export IMAGE_LOCATION="https://artifactory.nordix.org/artifactory/metal3/images/k8s_v1.30.0"
157157

158158
# Image username for ssh
159159
#

lib/common.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ export TARGET_NODE_MEMORY="${TARGET_NODE_MEMORY:-4096}"
322322

323323
# Cluster
324324
export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
325-
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.29.0}"
325+
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.30.0}"
326326
export KUBERNETES_BINARIES_VERSION="${KUBERNETES_BINARIES_VERSION:-${KUBERNETES_VERSION}}"
327327
export KUBERNETES_BINARIES_CONFIG_VERSION=${KUBERNETES_BINARIES_CONFIG_VERSION:-"v0.15.1"}
328328

@@ -335,7 +335,7 @@ fi
335335

336336
# Kubectl version (do not forget to update KUBECTL_SHA256 when changing KUBERNETES_VERSION!)
337337
export KUBECTL_VERSION="${KUBECTL_VERSION:-${KUBERNETES_BINARIES_VERSION}}"
338-
export KUBECTL_SHA256="${KUBECTL_SHA256:-0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5}"
338+
export KUBECTL_SHA256="${KUBECTL_SHA256:-7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5}"
339339

340340
# Krew version
341341
export KREW_VERSION="${KREW_VERSION:-v0.4.3}"
@@ -354,7 +354,7 @@ export MINIKUBE_DRIVER_SHA256="${MINIKUBE_DRIVER_SHA256:-0cc47a5c508f566ab424c49
354354
export KIND_VERSION="${KIND_VERSION:-v0.22.0}"
355355
export KIND_SHA256="${KIND_SHA256:-e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62}"
356356

357-
export KIND_NODE_IMAGE_VERSION="${KIND_NODE_IMAGE_VERSION:-v1.29.0}"
357+
export KIND_NODE_IMAGE_VERSION="${KIND_NODE_IMAGE_VERSION:-v1.29.2}"
358358
export KIND_NODE_IMAGE="${KIND_NODE_IMAGE:-${DOCKER_HUB_PROXY}/kindest/node:${KIND_NODE_IMAGE_VERSION}}"
359359

360360
# Tilt

renovate.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
"matchPackageNames": [
5757
"kindest/node"
5858
],
59-
"allowedVersions": "<=1.29"
59+
"allowedVersions": "<=1.30"
6060
},
6161
{
6262
"matchPackageNames": [
6363
"kubernetes-sigs/cri-tools"
6464
],
65-
"allowedVersions": "<=1.29"
65+
"allowedVersions": "<=1.30"
6666
}
6767
],
6868
"prHourlyLimit": 5,

tests/roles/run_tests/vars/main.yml

+27-30
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
---
21
# Ansible playbook related variables
32
HOME: "{{ lookup('env', 'HOME') }}"
43
NAMESPACE: "{{ lookup('env', 'NAMESPACE') | default('metal3', true) }}"
@@ -19,13 +18,13 @@ NODE_DRAIN_TIMEOUT: "{{ lookup('env', 'NODE_DRAIN_TIMEOUT') | default('0s', true
1918
BMOPATH: "{{ lookup('env', 'BMOPATH') }}"
2019
IRONIC_DATA_DIR: "{{ lookup('env', 'IRONIC_DATA_DIR') }}"
2120
KUBECONFIG_PATH: "/home/ubuntu/.kube/config"
22-
KUBERNETES_VERSION: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.29.0', true) }}"
23-
UPGRADED_K8S_VERSION: "{{ lookup('env', 'UPGRADED_K8S_VERSION') | default('v1.29.0', true) }}"
21+
KUBERNETES_VERSION: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.30.0', true) }}"
22+
UPGRADED_K8S_VERSION: "{{ lookup('env', 'UPGRADED_K8S_VERSION') | default('v1.30.0', true) }}"
2423
MAX_SURGE_VALUE: "{{ lookup('env', 'MAX_SURGE_VALUE') | default('1', true) }}"
2524
VM_EXTRADISKS: "{{ lookup('env', 'VM_EXTRADISKS') | default('false', true) }}"
2625
VM_EXTRADISKS_FILE_SYSTEM: "{{ lookup('env', 'VM_EXTRADISKS_FILE_SYSTEM') | default('ext4', true) }}"
2726
VM_EXTRADISKS_MOUNT_DIR: "{{ lookup('env', 'VM_EXTRADISKS_MOUNT_DIR') | default('/mnt/disk2') }}"
28-
KUBERNETES_BINARIES_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_VERSION') | default(lookup('env', 'KUBERNETES_VERSION') | default('v1.29.0', true), true) }}"
27+
KUBERNETES_BINARIES_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_VERSION') | default(lookup('env', 'KUBERNETES_VERSION') | default('v1.30.0', true), true) }}"
2928
KUBERNETES_BINARIES_CONFIG_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_CONFIG_VERSION') | default('v0.15.1', true) }}"
3029
IP_STACK: "{{ lookup('env', 'IP_STACK') | default('v4', true) }}"
3130
IPAM_PROVISIONING_POOL_RANGE_START: "{{ lookup('env', 'IPAM_PROVISIONING_POOL_RANGE_START') | default('172.22.0.100', true) }}"
@@ -95,42 +94,40 @@ IPAM_INSECURE_DIAGNOSTICS: "true"
9594

9695
# Args to pass to the deploy.sh script when deploying Ironic and BMO
9796
# [k]eepalived [t]ls [n]o basic auth or [m]ariadb
98-
BMO_IRONIC_ARGS: "-k {{ (IRONIC_TLS_SETUP == 'true') | ternary('-t', '') }}
99-
{{ (IRONIC_BASIC_AUTH == 'true') | ternary('', '-n') }}
100-
{{ (IRONIC_USE_MARIADB == 'true') | ternary('-m', '') }}"
97+
BMO_IRONIC_ARGS: "-k {{ (IRONIC_TLS_SETUP == 'true') | ternary('-t', '') }} {{ (IRONIC_BASIC_AUTH == 'true') | ternary('', '-n') }} {{ (IRONIC_USE_MARIADB == 'true') | ternary('-m', '') }}"
10198

10299
provision_cluster_actions:
103-
- "ci_test_provision"
104-
- "provision_cluster"
100+
- "ci_test_provision"
101+
- "provision_cluster"
105102
provision_controlplane_actions:
106-
- "ci_test_provision"
107-
- "provision_controlplane"
103+
- "ci_test_provision"
104+
- "provision_controlplane"
108105
provision_workers_actions:
109-
- "ci_test_provision"
110-
- "provision_worker"
106+
- "ci_test_provision"
107+
- "provision_worker"
111108
provision_actions:
112-
- "ci_test_provision"
113-
- "provision_cluster"
114-
- "provision_controlplane"
115-
- "provision_worker"
116-
- "generate_template"
109+
- "ci_test_provision"
110+
- "provision_cluster"
111+
- "provision_controlplane"
112+
- "provision_worker"
113+
- "generate_template"
117114
deprovision_cluster_actions:
118-
- "ci_test_deprovision"
119-
- "deprovision_cluster"
115+
- "ci_test_deprovision"
116+
- "deprovision_cluster"
120117
deprovision_controlplane_actions:
121-
- "deprovision_controlplane"
118+
- "deprovision_controlplane"
122119
deprovision_workers_actions:
123-
- "deprovision_worker"
120+
- "deprovision_worker"
124121
verify_actions:
125-
- "ci_test_provision"
126-
- "pivoting"
122+
- "ci_test_provision"
123+
- "pivoting"
127124
pivot_actions:
128-
- "pivoting"
125+
- "pivoting"
129126
repivot_actions:
130-
- "repivoting"
127+
- "repivoting"
131128
cleanup_actions:
132-
- "ci_test_deprovision"
129+
- "ci_test_deprovision"
133130
image_download_actions:
134-
- "ci_test_provision"
135-
- "provision_controlplane"
136-
- "provision_worker"
131+
- "ci_test_provision"
132+
- "provision_controlplane"
133+
- "provision_worker"

vars.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ assured that they are persisted.
5050
| BARE_METAL_PROVISIONER_INTERFACE | Cluster provisioning Interface | "ironicendpoint" | "ironicendpoint" |
5151
| POD_CIDR | Pod CIDR | "x.x.x.x/x" | "192.168.0.0/18" |
5252
| NODE_HOSTNAME_FORMAT | Node hostname format. This is a format string that must contain exactly one %d format field that will be replaced with an integer representing the number of the node. | "node-%d" | "node-%d" |
53-
| KUBERNETES_VERSION | Kubernetes version | "x.x.x" | "1.29.0" |
54-
| UPGRADED_K8S_VERSION | Upgraded Kubernetes version | "x.x.x" | "1.29.0" |
53+
| KUBERNETES_VERSION | Kubernetes version | "x.x.x" | "1.30.0" |
54+
| UPGRADED_K8S_VERSION | Upgraded Kubernetes version | "x.x.x" | "1.30.0" |
5555
| KUBERNETES_BINARIES_VERSION | Version of kubelet, kubeadm and kubectl | "x.x.x-xx" or "x.x.x" | same as KUBERNETES_VERSION |
5656
| KUBERNETES_BINARIES_CONFIG_VERSION | Version of kubelet.service and 10-kubeadm.conf files | "vx.x.x" | "v0.13.0" |
5757
| LIBVIRT_DOMAIN_TYPE | Which hypervisor to use for the virtual machines libvirt domain, default to kvm. It is possible to switch to qemu in case nested virtualization is not available, although it's considered experimental at this stage of development. | "kvm", "qemu" | "kvm" |

0 commit comments

Comments
 (0)