diff --git a/README.md b/README.md index 274a3e1d2..61ca30c48 100644 --- a/README.md +++ b/README.md @@ -91,13 +91,13 @@ If someone wants to implement their own installer controller then they need to f - BYOH is currently compatible wth Cluster API v1beta1 (v1.0) ## Supported OS and Kubernetes versions -| Operating System | Architecture | Kubernetes v1.21.* | Kubernetes v1.22.* | Kubernetes v1.23.* | -| ------------------|---------------| :----------------: | :----------------: | :----------------: | -| Ubuntu 20.04.* | amd64 | ✓ | ✓ | ✓ | +| Operating System | Architecture | Kubernetes v1.22.* | Kubernetes v1.23.* | Kubernetes v1.24.* | +| ------------------|---------------|:------------------:|:------------------:|:------------------:| +| Ubuntu 20.04.* | amd64 | ✓ | ✓ | ✓ | **NOTE:** The '*' in OS means that all Ubuntu 20.04 patches are supported. -**NOTE:** The '*' in the K8s version means that the K8s minor release is supported but it may happen that a BYOH bundle for a specific patch may not exist in the OCI registry. +**NOTE:** The '*' in the K8s version means that the K8s minor release is supported but it may happen that a BYOH bundle for a specific patch may not exist in the OCI registry. ## BYOH in News - [TGIK episode on BYOH](https://www.youtube.com/watch?v=Xwm5Ka27-Io&t=2838s) diff --git a/docs/BYOHDockerFileDev b/docs/BYOHDockerFileDev index dbcfbe7f8..c0779544b 100644 --- a/docs/BYOHDockerFileDev +++ b/docs/BYOHDockerFileDev @@ -16,7 +16,7 @@ RUN echo "Installing kubectl kubeadm kubelet" \ && curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - \ && apt-get update \ && apt-get install -y linux-image-$(uname -r) \ - && apt-get install -y kubelet=1.23.5-00 kubeadm=1.23.5-00 kubectl=1.23.5-00 \ + && apt-get install -y kubelet=1.24.2-00 kubeadm=1.24.2-00 kubectl=1.24.2-00 \ && apt-mark hold containerd kubelet kubeadm kubectl \ && apt-get clean \ && systemctl enable kubelet.service \ diff --git a/docs/getting_started.md b/docs/getting_started.md index 68c532ef7..0d7aa6dc8 100644 --- a/docs/getting_started.md +++ b/docs/getting_started.md @@ -205,7 +205,7 @@ Generate the cluster.yaml for workload cluster ```shell CONTROL_PLANE_ENDPOINT_IP=10.10.10.10 clusterctl generate cluster byoh-cluster \ --infrastructure byoh \ - --kubernetes-version v1.23.5 \ + --kubernetes-version v1.24.2 \ --control-plane-machine-count 1 \ --worker-machine-count 1 > cluster.yaml ``` @@ -214,7 +214,7 @@ Generate the cluster.yaml for workload cluster ```shell CONTROL_PLANE_ENDPOINT_IP=10.10.10.10 clusterctl generate cluster byoh-cluster \ --infrastructure byoh \ - --kubernetes-version v1.23.5 \ + --kubernetes-version v1.24.2 \ --control-plane-machine-count 1 \ --worker-machine-count 1 \ --flavor docker > cluster.yaml @@ -253,7 +253,7 @@ after that you should see your nodes turn into ready: ```shell $ KUBECONFIG=byoh-cluster.kubeconfig kubectl get nodes NAME STATUS ROLES AGE VERSION -byoh-cluster-8siai8 Ready master 5m v1.23.5 +byoh-cluster-8siai8 Ready master 5m v1.24.2 ``` ## Additional: Running host-agent as a systemd service diff --git a/docs/local_dev.md b/docs/local_dev.md index 41e6110e2..3bdc8da1d 100644 --- a/docs/local_dev.md +++ b/docs/local_dev.md @@ -232,11 +232,6 @@ Note: It may happen that a specific patch version of a k8s minor release is not BYOH Bundle Name - Ubuntu_20.04.*_x86-64 - v1.21.* - byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.21.* - - Ubuntu_20.04.*_x86-64 v1.22.* byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.22.* @@ -246,6 +241,11 @@ Note: It may happen that a specific patch version of a k8s minor release is not v1.23.* byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.23.* + + Ubuntu_20.04.*_x86-64 + v1.24.* + byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.24.* + The '*' in OS means that all Ubuntu 20.04 patches will be handled by this BYOH bundle. diff --git a/hack/getting_started.sh b/hack/getting_started.sh index efaea9e10..fc0f418e3 100755 --- a/hack/getting_started.sh +++ b/hack/getting_started.sh @@ -537,7 +537,7 @@ manageClusterConfFile="${HOME}/.kube/management-cluster.conf" kubeConfigFile=/tmp/byoh-cluster-kubeconfig reposDir=$(dirname $0)/../ byohBinaryFile=${reposDir}/bin/byoh-hostagent-linux-amd64 -kubernetesVersion="v1.23.5" +kubernetesVersion="v1.24.2" readArgs $@ userConfirmation diff --git a/installer/bundle_builder/ingredients/deb/Dockerfile b/installer/bundle_builder/ingredients/deb/Dockerfile index 336ea937e..614fc28dd 100644 --- a/installer/bundle_builder/ingredients/deb/Dockerfile +++ b/installer/bundle_builder/ingredients/deb/Dockerfile @@ -12,8 +12,8 @@ ARG BASE_IMAGE=ubuntu:20.04 FROM $BASE_IMAGE as build # Override to download other version -ENV CONTAINERD_VERSION=1.6.0 -ENV KUBERNETES_VERSION=1.23.5-00 +ENV CONTAINERD_VERSION=1.6.8 +ENV KUBERNETES_VERSION=1.24.2-00 ENV ARCH=amd64 RUN apt-get update \ diff --git a/installer/bundle_builder/ingredients/deb/download.sh b/installer/bundle_builder/ingredients/deb/download.sh index 2f6b24265..c24122b46 100644 --- a/installer/bundle_builder/ingredients/deb/download.sh +++ b/installer/bundle_builder/ingredients/deb/download.sh @@ -21,5 +21,5 @@ echo "deb [signed-by=/usr/share/keyrings/kubernetes-archive-keyring.gpg] https:/ echo Update apt package index, install kubelet, kubeadm and kubectl sudo apt-get update sudo apt-get download {kubelet,kubeadm,kubectl}:$ARCH=$KUBERNETES_VERSION -sudo apt-get download kubernetes-cni:$ARCH=0.8.7-00 -sudo apt-get download cri-tools:$ARCH=1.23.0-00 +sudo apt-get download kubernetes-cni:$ARCH=1.1.1-00 +sudo apt-get download cri-tools:$ARCH=1.25.0-00 diff --git a/installer/registry.go b/installer/registry.go index 801e50f96..fdbc3e0d2 100644 --- a/installer/registry.go +++ b/installer/registry.go @@ -115,18 +115,18 @@ func GetSupportedRegistry() registry { // BYOH Bundle Repository. Associate bundle with installer linuxDistro := "Ubuntu_20.04.1_x86-64" - reg.AddBundleInstaller(linuxDistro, "v1.21.*") reg.AddBundleInstaller(linuxDistro, "v1.22.*") reg.AddBundleInstaller(linuxDistro, "v1.23.*") + reg.AddBundleInstaller(linuxDistro, "v1.24.*") /* * PLACEHOLDER - ADD MORE K8S VERSIONS HERE */ // Match any patch version of the specified Major & Minor K8s version - reg.AddK8sFilter("v1.21.*") reg.AddK8sFilter("v1.22.*") reg.AddK8sFilter("v1.23.*") + reg.AddK8sFilter("v1.24.*") // Match concrete os version to repository os version reg.AddOsFilter("Ubuntu_20.04.*_x86-64", linuxDistro) diff --git a/installer/registry_internal_test.go b/installer/registry_internal_test.go index c016a2242..f1be9f8c1 100644 --- a/installer/registry_internal_test.go +++ b/installer/registry_internal_test.go @@ -115,7 +115,7 @@ var _ = Describe("Byohost Installer Tests", func() { Expect(osBundles).To(HaveLen(1)) osBundleResult := r.ListK8s("Ubuntu_20.04.1_x86-64") - Expect(osBundleResult).To(ContainElements("v1.21.*", "v1.22.*", "v1.23.*")) + Expect(osBundleResult).To(ContainElements("v1.22.*", "v1.23.*", "v1.24.*")) Expect(osBundleResult).To(HaveLen(3)) }) }) diff --git a/scripts/fetch_ext_bins.sh b/scripts/fetch_ext_bins.sh index a3bc3be20..9205e8619 100644 --- a/scripts/fetch_ext_bins.sh +++ b/scripts/fetch_ext_bins.sh @@ -15,7 +15,7 @@ if [[ -n "${TRACE}" ]]; then set -x fi -k8s_version=1.23.3 +k8s_version=1.24.2 goarch=amd64 goos="unknown" diff --git a/test/e2e/cluster_upgrade_test.go b/test/e2e/cluster_upgrade_test.go index 28863b5ea..19bbe7488 100644 --- a/test/e2e/cluster_upgrade_test.go +++ b/test/e2e/cluster_upgrade_test.go @@ -33,8 +33,8 @@ var _ = Describe("Cluster upgrade test [K8s-upgrade]", func() { dockerClient *client.Client allbyohostContainerIDs []string allAgentLogFiles []string - kubernetesVersionUpgradeFrom = "v1.22.3" - kubernetesVersionUpgradeTo = "v1.23.5" + kubernetesVersionUpgradeFrom = "v1.23.5" + kubernetesVersionUpgradeTo = "v1.24.2" etcdUpgradeVersion = "3.5.1-0" coreDNSUpgradeVersion = "v1.8.6" ) diff --git a/test/e2e/clusterclass_upgrade_test.go b/test/e2e/clusterclass_upgrade_test.go index 1231fdce3..5576cd91c 100644 --- a/test/e2e/clusterclass_upgrade_test.go +++ b/test/e2e/clusterclass_upgrade_test.go @@ -33,8 +33,8 @@ var _ = Describe("Clusterclass upgrade test [K8s-upgrade]", func() { dockerClient *client.Client allbyohostContainerIDs []string allAgentLogFiles []string - kubernetesVersionUpgradeFrom = "v1.22.3" - kubernetesVersionUpgradeTo = "v1.23.5" + kubernetesVersionUpgradeFrom = "v1.23.5" + kubernetesVersionUpgradeTo = "v1.24.2" etcdUpgradeVersion = "3.5.1-0" coreDNSUpgradeVersion = "v1.8.6" ) diff --git a/test/e2e/config/provider.yaml b/test/e2e/config/provider.yaml index ec6352f25..713c1ff2f 100644 --- a/test/e2e/config/provider.yaml +++ b/test/e2e/config/provider.yaml @@ -81,7 +81,7 @@ providers: variables: # default variables for the e2e test; those values could be overridden via env variables, thus # allowing the same e2e config file to be re-used in different prow jobs e.g. each one with a K8s version permutation - KUBERNETES_VERSION: "v1.23.5" + KUBERNETES_VERSION: "v1.24.2" ETCD_VERSION_UPGRADE_TO: "3.4.9-0" COREDNS_VERSION_UPGRADE_TO: "1.7.0" KUBERNETES_VERSION_UPGRADE_TO: "v1.22.0" @@ -98,7 +98,7 @@ variables: NODE_DRAIN_TIMEOUT: "60s" # NOTE: INIT_WITH_BINARY is used only by the clusterctl upgrade test to initialize the management cluster to be upgraded INIT_WITH_BINARY: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.3/clusterctl-{OS}-{ARCH}" - BUNDLE_LOOKUP_TAG: "v1.23.5" + BUNDLE_LOOKUP_TAG: "v1.24.2" CONTROL_PLANE_ENDPOINT_IP: "" MANUAL_CSR_APPROVAL: "disable"