Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🌱 Uplift k8s to v1.31.2 #2067

Merged
merged 1 commit into from
Nov 5, 2024
Merged

🌱 Uplift k8s to v1.31.2 #2067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions docs/api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ spec:
rollingUpdate:
maxSurge: 1
type: RollingUpdate
version: v1.31.0
version: v1.31.2
kubeadmConfigSpec:
joinConfiguration:
controlPlane: {}
Expand Down Expand Up @@ -243,7 +243,7 @@ spec:
namespace: metal3
nodeDrainTimeout: 0s
providerID: metal3://68be298f-ed11-439e-9d51-6c5260faede6
version: v1.31.0
version: v1.31.2
```

## Metal3Machine
Expand Down Expand Up @@ -413,10 +413,10 @@ metadata:
spec:
automatedCleaningMode: metadata
image:
checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum
checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img.sha256sum
checksumType: sha256
format: raw
url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img
url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img
hostSelector:
matchLabels:
key1: value1
Expand Down Expand Up @@ -473,7 +473,7 @@ spec:
name: md-0
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: Metal3MachineTemplate
version: v1.31.0
version: v1.31.2
```

## KubeadmConfigTemplate
Expand Down Expand Up @@ -557,10 +557,10 @@ spec:
spec:
automatedCleaningMode: metadata
image:
checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum
checksum: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img.sha256sum
checksumType: sha256
format: raw
url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img
url: http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img
hostSelector:
matchLabels:
key1: value1
Expand Down
2 changes: 1 addition & 1 deletion docs/architecture.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ spec:
etcd: {}
imageRepository: ""
kind: ClusterConfiguration
kubernetesVersion: v1.31.0
kubernetesVersion: v1.31.2
networking:
dnsDomain: cluster.local
podSubnet: 192.168.0.0/18
Expand Down
2 changes: 1 addition & 1 deletion docs/dev-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ Please note, the precedence of variables is as follows:
},
"metadata": {,
"CONTROL_PLANE_MACHINE_COUNT": "1",
"KUBERNETES_VERSION": "v1.31.0",
"KUBERNETES_VERSION": "v1.31.2",
"WORKER_MACHINE_COUNT": "2",
}
}
Expand Down
6 changes: 3 additions & 3 deletions examples/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ KUSTOMIZE="${SOURCE_DIR}/../hack/tools/bin/kustomize"

# Cluster.
export CLUSTER_NAME="${CLUSTER_NAME:-test1}"
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.31.0}"
export KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.31.2}"
export CLUSTER_APIENDPOINT_HOST="${CLUSTER_APIENDPOINT_HOST:-192.168.111.249}"
export CLUSTER_APIENDPOINT_PORT="${CLUSTER_APIENDPOINT_PORT:-6443}"
export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img}"
export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.0-raw.img.sha256sum}"
export IMAGE_URL="${IMAGE_URL:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img}"
export IMAGE_CHECKSUM="${IMAGE_CHECKSUM:-http://172.22.0.1/images/UBUNTU_22.04_NODE_IMAGE_K8S_v1.31.2-raw.img.sha256sum}"
export IMAGE_CHECKSUM_TYPE="${IMAGE_CHECKSUM_TYPE:-sha256}"
export IMAGE_FORMAT="${IMAGE_FORMAT:-raw}"

Expand Down
2 changes: 1 addition & 1 deletion hack/ensure-kubectl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -o nounset
set -o pipefail

GOPATH_BIN="$(go env GOPATH)/bin/"
MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.31.0"}
MINIMUM_KUBECTL_VERSION=${KUBERNETES_VERSION:-"v1.31.2"}

# Ensure the kubectl tool exists and is a viable version, or installs it
verify_kubectl_version()
Expand Down
2 changes: 1 addition & 1 deletion hack/gen_tilt_settings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ cat <<EOF >tilt-settings.json
{
"capi_version": "${CAPIRELEASE}",
"cert_manager_version": "v1.12.3",
"kubernetes_version": "${KUBERNETES_VERSION:-v1.31.0}"
"kubernetes_version": "${KUBERNETES_VERSION:-v1.31.2}"
}
EOF
fi
2 changes: 1 addition & 1 deletion scripts/environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ else
fi

export FROM_K8S_VERSION=${FROM_K8S_VERSION:-"v1.30.0"}
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.31.0"}
export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.31.2"}

# Can be overriden from jjbs
export CAPI_VERSION=${CAPI_VERSION:-"v1beta1"}
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/upgrade_clusterctl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl
osType := strings.ToLower(os.Getenv("OS"))
Expect(osType).ToNot(Equal(""))
validateGlobals(specName)
imageURL, imageChecksum := EnsureImage("v1.31.0")
imageURL, imageChecksum := EnsureImage("v1.31.2")
os.Setenv("IMAGE_RAW_CHECKSUM", imageChecksum)
os.Setenv("IMAGE_RAW_URL", imageURL)
// We need to override clusterctl apply log folder to avoid getting our credentials exposed.
Expand All @@ -57,8 +57,8 @@ var _ = Describe("When testing cluster upgrade from releases (v1.8=>current) [cl
InitWithBootstrapProviders: []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)},
InitWithControlPlaneProviders: []string{fmt.Sprintf(providerKubeadmPrefix, capiStableRelease)},
InitWithInfrastructureProviders: []string{fmt.Sprintf(providerMetal3Prefix, capm3StableRelease)},
InitWithKubernetesVersion: "v1.31.0",
WorkloadKubernetesVersion: "v1.31.0",
InitWithKubernetesVersion: "v1.31.2",
WorkloadKubernetesVersion: "v1.31.2",
InitWithBinary: fmt.Sprintf(clusterctlDownloadURL, capiStableRelease),
PreInit: func(clusterProxy framework.ClusterProxy) {
preInitFunc(clusterProxy, "0.8", "26.0")
Expand Down