Skip to content

Commit

Permalink
Merge pull request #1389 from Nordix/bump/k8s-v1.30
Browse files Browse the repository at this point in the history
bump k8s to v1.30.0
  • Loading branch information
metal3-io-bot authored Apr 29, 2024
2 parents 625028e + f7c2c40 commit 3656f4b
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 41 deletions.
8 changes: 4 additions & 4 deletions config_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
#
#export CAPI_VERSION=v1beta1

#export KUBERNETES_VERSION="v1.29.0"
#export UPGRADED_K8S_VERSION="v1.29.0"
#export KUBERNETES_VERSION="v1.30.0"
#export UPGRADED_K8S_VERSION="v1.30.0"

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

# Image for target hosts deployment
#
#export IMAGE_NAME="CENTOS_9_NODE_IMAGE_K8S_v1.29.0.qcow2"
#export IMAGE_NAME="CENTOS_9_NODE_IMAGE_K8S_v1.30.0.qcow2"

# Location of the image to download
#
#export IMAGE_LOCATION="https://artifactory.nordix.org/artifactory/metal3/images/k8s_v1.29.0"
#export IMAGE_LOCATION="https://artifactory.nordix.org/artifactory/metal3/images/k8s_v1.30.0"

# Image username for ssh
#
Expand Down
6 changes: 3 additions & 3 deletions lib/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ export TARGET_NODE_MEMORY="${TARGET_NODE_MEMORY:-4096}"

# Cluster
export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.29.0}"
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.30.0}"
export KUBERNETES_BINARIES_VERSION="${KUBERNETES_BINARIES_VERSION:-${KUBERNETES_VERSION}}"
export KUBERNETES_BINARIES_CONFIG_VERSION=${KUBERNETES_BINARIES_CONFIG_VERSION:-"v0.15.1"}

Expand All @@ -335,7 +335,7 @@ fi

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

# Krew version
export KREW_VERSION="${KREW_VERSION:-v0.4.3}"
Expand All @@ -354,7 +354,7 @@ export MINIKUBE_DRIVER_SHA256="${MINIKUBE_DRIVER_SHA256:-0cc47a5c508f566ab424c49
export KIND_VERSION="${KIND_VERSION:-v0.22.0}"
export KIND_SHA256="${KIND_SHA256:-e4264d7ee07ca642fe52818d7c0ed188b193c214889dd055c929dbcb968d1f62}"

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

# Tilt
Expand Down
4 changes: 2 additions & 2 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
"matchPackageNames": [
"kindest/node"
],
"allowedVersions": "<=1.29"
"allowedVersions": "<=1.30"
},
{
"matchPackageNames": [
"kubernetes-sigs/cri-tools"
],
"allowedVersions": "<=1.29"
"allowedVersions": "<=1.30"
}
],
"prHourlyLimit": 5,
Expand Down
57 changes: 27 additions & 30 deletions tests/roles/run_tests/vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
# Ansible playbook related variables
HOME: "{{ lookup('env', 'HOME') }}"
NAMESPACE: "{{ lookup('env', 'NAMESPACE') | default('metal3', true) }}"
Expand All @@ -19,13 +18,13 @@ NODE_DRAIN_TIMEOUT: "{{ lookup('env', 'NODE_DRAIN_TIMEOUT') | default('0s', true
BMOPATH: "{{ lookup('env', 'BMOPATH') }}"
IRONIC_DATA_DIR: "{{ lookup('env', 'IRONIC_DATA_DIR') }}"
KUBECONFIG_PATH: "/home/ubuntu/.kube/config"
KUBERNETES_VERSION: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.29.0', true) }}"
UPGRADED_K8S_VERSION: "{{ lookup('env', 'UPGRADED_K8S_VERSION') | default('v1.29.0', true) }}"
KUBERNETES_VERSION: "{{ lookup('env', 'KUBERNETES_VERSION') | default('v1.30.0', true) }}"
UPGRADED_K8S_VERSION: "{{ lookup('env', 'UPGRADED_K8S_VERSION') | default('v1.30.0', true) }}"
MAX_SURGE_VALUE: "{{ lookup('env', 'MAX_SURGE_VALUE') | default('1', true) }}"
VM_EXTRADISKS: "{{ lookup('env', 'VM_EXTRADISKS') | default('false', true) }}"
VM_EXTRADISKS_FILE_SYSTEM: "{{ lookup('env', 'VM_EXTRADISKS_FILE_SYSTEM') | default('ext4', true) }}"
VM_EXTRADISKS_MOUNT_DIR: "{{ lookup('env', 'VM_EXTRADISKS_MOUNT_DIR') | default('/mnt/disk2') }}"
KUBERNETES_BINARIES_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_VERSION') | default(lookup('env', 'KUBERNETES_VERSION') | default('v1.29.0', true), true) }}"
KUBERNETES_BINARIES_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_VERSION') | default(lookup('env', 'KUBERNETES_VERSION') | default('v1.30.0', true), true) }}"
KUBERNETES_BINARIES_CONFIG_VERSION: "{{ lookup('env', 'KUBERNETES_BINARIES_CONFIG_VERSION') | default('v0.15.1', true) }}"
IP_STACK: "{{ lookup('env', 'IP_STACK') | default('v4', true) }}"
IPAM_PROVISIONING_POOL_RANGE_START: "{{ lookup('env', 'IPAM_PROVISIONING_POOL_RANGE_START') | default('172.22.0.100', true) }}"
Expand Down Expand Up @@ -95,42 +94,40 @@ IPAM_INSECURE_DIAGNOSTICS: "true"

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

provision_cluster_actions:
- "ci_test_provision"
- "provision_cluster"
- "ci_test_provision"
- "provision_cluster"
provision_controlplane_actions:
- "ci_test_provision"
- "provision_controlplane"
- "ci_test_provision"
- "provision_controlplane"
provision_workers_actions:
- "ci_test_provision"
- "provision_worker"
- "ci_test_provision"
- "provision_worker"
provision_actions:
- "ci_test_provision"
- "provision_cluster"
- "provision_controlplane"
- "provision_worker"
- "generate_template"
- "ci_test_provision"
- "provision_cluster"
- "provision_controlplane"
- "provision_worker"
- "generate_template"
deprovision_cluster_actions:
- "ci_test_deprovision"
- "deprovision_cluster"
- "ci_test_deprovision"
- "deprovision_cluster"
deprovision_controlplane_actions:
- "deprovision_controlplane"
- "deprovision_controlplane"
deprovision_workers_actions:
- "deprovision_worker"
- "deprovision_worker"
verify_actions:
- "ci_test_provision"
- "pivoting"
- "ci_test_provision"
- "pivoting"
pivot_actions:
- "pivoting"
- "pivoting"
repivot_actions:
- "repivoting"
- "repivoting"
cleanup_actions:
- "ci_test_deprovision"
- "ci_test_deprovision"
image_download_actions:
- "ci_test_provision"
- "provision_controlplane"
- "provision_worker"
- "ci_test_provision"
- "provision_controlplane"
- "provision_worker"
4 changes: 2 additions & 2 deletions vars.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ assured that they are persisted.
| BARE_METAL_PROVISIONER_INTERFACE | Cluster provisioning Interface | "ironicendpoint" | "ironicendpoint" |
| POD_CIDR | Pod CIDR | "x.x.x.x/x" | "192.168.0.0/18" |
| 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" |
| KUBERNETES_VERSION | Kubernetes version | "x.x.x" | "1.29.0" |
| UPGRADED_K8S_VERSION | Upgraded Kubernetes version | "x.x.x" | "1.29.0" |
| KUBERNETES_VERSION | Kubernetes version | "x.x.x" | "1.30.0" |
| UPGRADED_K8S_VERSION | Upgraded Kubernetes version | "x.x.x" | "1.30.0" |
| KUBERNETES_BINARIES_VERSION | Version of kubelet, kubeadm and kubectl | "x.x.x-xx" or "x.x.x" | same as KUBERNETES_VERSION |
| KUBERNETES_BINARIES_CONFIG_VERSION | Version of kubelet.service and 10-kubeadm.conf files | "vx.x.x" | "v0.13.0" |
| 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" |
Expand Down

0 comments on commit 3656f4b

Please sign in to comment.