Added support for K8s v1.26.7

vmware-tanzu · Aug 15, 2023 · f5ec27b · f5ec27b
1 parent fcb7f73
commit f5ec27b
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 40 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19.10
+          go-version: 1.20.7
 
       - name: build agent
         run: make host-agent-binaries
@@ -55,7 +55,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.10
+        go-version: 1.20.7
 
     - name: Install ginkgo
       run: go install github.com/onsi/ginkgo/v2/[email protected]

diff --git a/.github/workflows/draft-release.yaml b/.github/workflows/draft-release.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.19.10
+          go-version: 1.20.7
 
       - name: Build Release Artifacts
         run: IMG="projects.registry.vmware.com/cluster_api_provider_bringyourownhost/cluster-api-byoh-controller:${{ github.ref_name }}" make build-release-artifacts

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.10
+        go-version: 1.20.7
 
     - name: Install ginkgo
       run: go install github.com/onsi/ginkgo/v2/[email protected]

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,10 +15,10 @@ jobs:
   golangci:
     runs-on: ubuntu-20.04
     steps:
-    - name: Install Go 1.19.10
+    - name: Install Go 1.20.7
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.10
+        go-version: 1.20.7
 
     - name: Checkout code
       uses: actions/checkout@v2

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.19.10 as builder
+FROM golang:1.20.7 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests

diff --git a/Makefile b/Makefile
@@ -226,7 +226,7 @@ host-agent-binary: $(RELEASE_DIR)
 		-e GOARCH=$(GOARCH) \
 		-v "$$(pwd):/workspace$(DOCKER_VOL_OPTS)" \
 		-w /workspace \
-		golang:1.19.10 \
+		golang:1.20.7 \
 		go build -buildvcs=false -a -ldflags "$(GOLDFLAGS)" \
 		-o ./bin/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(HOST_AGENT_DIR)
 

diff --git a/README.md b/README.md
@@ -91,9 +91,9 @@ 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.22.* | Kubernetes v1.23.* | Kubernetes v1.24.* | Kubernetes v1.25.* |
-| ------------------|---------------|:------------------:|:------------------:|:------------------:|:------------------:|
-| Ubuntu 20.04.*    | amd64         |         ✓          |         ✓          |         ✓          |         ✓          |
+| Operating System  | Architecture  | Kubernetes v1.24.* | Kubernetes v1.25.* | Kubernetes v1.26.* |
+| ------------------|---------------|:------------------:|:------------------:|:------------------:|
+| Ubuntu 20.04.*    | amd64         |         ✓          |         ✓          |         ✓          |
 
 **NOTE:**  The '*' in OS means that all Ubuntu 20.04 patches are supported.
 

diff --git 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.25.11-00 kubeadm=1.25.11-00 kubectl=1.25.11-00 \
+    && apt-get install -y kubelet=1.26.7-00 kubeadm=1.26.7-00 kubectl=1.26.7-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
@@ -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.25.11 \
+      --kubernetes-version v1.26.7 \
       --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.25.11 \
+        --kubernetes-version v1.26.7 \
         --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.25.11
+byoh-cluster-8siai8                                           Ready      master   5m   v1.26.7
 ```
 
 ## Additional: Running host-agent as a systemd service

diff --git a/docs/local_dev.md b/docs/local_dev.md
@@ -231,26 +231,21 @@ Note: It may happen that a specific patch version of a k8s minor release is not
         <td>K8S Version</td>
         <td>BYOH Bundle Name</td>
     </tr>
-    <tr>
-        <td>Ubuntu_20.04.*_x86-64</td>
-        <td>v1.22.*</td>
-        <td>byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.22.*</td>
-    </tr>
-        <tr>
-        <td>Ubuntu_20.04.*_x86-64</td>
-        <td>v1.23.*</td>
-        <td>byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.23.*</td>
-    </tr>
     <tr>
         <td>Ubuntu_20.04.*_x86-64</td>
         <td>v1.24.*</td>
         <td>byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.24.*</td>
     </tr>
-        <tr>
+    <tr>
         <td>Ubuntu_20.04.*_x86-64</td>
         <td>v1.25.*</td>
         <td>byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.25.*</td>
     </tr>
+        <tr>
+        <td>Ubuntu_20.04.*_x86-64</td>
+        <td>v1.26.*</td>
+        <td>byoh-bundle-ubuntu_20.04.1_x86-64_k8s:v1.26.*</td>
+    </tr>
 </table>
 The '*' in OS means that all Ubuntu 20.04 patches will be handled by this BYOH bundle.
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/vmware-tanzu/cluster-api-provider-bringyourownhost
 
-go 1.19
+go 1.20
 
 replace github.com/insomniacslk/dhcp => github.com/harvester/dhcp v0.0.0-20220421024905-28b38eafefe3
 

diff --git 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.25.11"
+kubernetesVersion="v1.26.7"
 
 readArgs $@
 userConfirmation

diff --git a/installer/bundle_builder/ingredients/deb/Dockerfile b/installer/bundle_builder/ingredients/deb/Dockerfile
@@ -13,7 +13,7 @@ FROM $BASE_IMAGE as build
 
 # Override to download other version
 ENV CONTAINERD_VERSION=1.6.18
-ENV KUBERNETES_VERSION=1.25.11-00
+ENV KUBERNETES_VERSION=1.26.7-00
 ENV ARCH=amd64
 
 RUN apt-get update \

diff --git a/installer/registry.go b/installer/registry.go
@@ -115,19 +115,18 @@ func GetSupportedRegistry() registry {
 
 		// BYOH Bundle Repository. Associate bundle with installer
 		linuxDistro := "Ubuntu_20.04.1_x86-64"
-		reg.AddBundleInstaller(linuxDistro, "v1.23.*")
 		reg.AddBundleInstaller(linuxDistro, "v1.24.*")
 		reg.AddBundleInstaller(linuxDistro, "v1.25.*")
+		reg.AddBundleInstaller(linuxDistro, "v1.26.*")
 
 		/*
 		 * PLACEHOLDER - ADD MORE K8S VERSIONS HERE
 		 */
 
 		// Match any patch version of the specified Major & Minor K8s version
-		reg.AddK8sFilter("v1.22.*")
-		reg.AddK8sFilter("v1.23.*")
 		reg.AddK8sFilter("v1.24.*")
 		reg.AddK8sFilter("v1.25.*")
+		reg.AddK8sFilter("v1.26.*")
 
 		// 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
@@ -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.23.*", "v1.24.*", "v1.25.*"))
+			Expect(osBundleResult).To(ContainElements("v1.24.*", "v1.25.*", "v1.26.*"))
 			Expect(osBundleResult).To(HaveLen(3))
 		})
 	})

diff --git a/test/e2e/cluster_upgrade_test.go b/test/e2e/cluster_upgrade_test.go
@@ -35,8 +35,8 @@ var _ = Describe("Cluster upgrade test [K8s-upgrade]", func() {
 		dockerClient                 *client.Client
 		allbyohostContainerIDs       []string
 		allAgentLogFiles             []string
-		kubernetesVersionUpgradeFrom = "v1.24.2"
-		kubernetesVersionUpgradeTo   = "v1.25.11"
+		kubernetesVersionUpgradeFrom = "v1.25.11"
+		kubernetesVersionUpgradeTo   = "v1.26.7"
 		etcdUpgradeVersion           = "3.5.6-0"
 		coreDNSUpgradeVersion        = "v1.9.3"
 	)

diff --git a/test/e2e/clusterclass_upgrade_test.go b/test/e2e/clusterclass_upgrade_test.go
@@ -35,8 +35,8 @@ var _ = Describe("Clusterclass upgrade test [K8s-upgrade]", func() {
 		dockerClient                 *client.Client
 		allbyohostContainerIDs       []string
 		allAgentLogFiles             []string
-		kubernetesVersionUpgradeFrom = "v1.24.2"
-		kubernetesVersionUpgradeTo   = "v1.25.11"
+		kubernetesVersionUpgradeFrom = "v1.25.11"
+		kubernetesVersionUpgradeTo   = "v1.26.7"
 		etcdUpgradeVersion           = "3.5.6-0"
 		coreDNSUpgradeVersion        = "v1.9.3"
 	)

diff --git a/test/e2e/config/provider.yaml b/test/e2e/config/provider.yaml
@@ -86,7 +86,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.25.11"
+  KUBERNETES_VERSION: "v1.26.7"
   ETCD_VERSION_UPGRADE_TO: "3.5.6-0"
   COREDNS_VERSION_UPGRADE_TO: "1.9.3"
   KUBERNETES_VERSION_UPGRADE_TO: "v1.22.0"
@@ -103,7 +103,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.4.4/clusterctl-{OS}-{ARCH}"
-  BUNDLE_LOOKUP_TAG: "v1.25.11"
+  BUNDLE_LOOKUP_TAG: "v1.26.7"
   CONTROL_PLANE_ENDPOINT_IP: ""
   MANUAL_CSR_APPROVAL: "disable"
 

diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go
@@ -192,7 +192,7 @@ func setupBootstrapCluster(config *clusterctl.E2EConfig, scheme *runtime.Scheme,
 	if !useExistingCluster {
 		clusterProvider = bootstrap.CreateKindBootstrapClusterAndLoadImages(context.TODO(), bootstrap.CreateKindBootstrapClusterAndLoadImagesInput{
 			Name:               config.ManagementClusterName,
-			KubernetesVersion:  "v1.25.11",
+			KubernetesVersion:  "v1.26.7",
 			RequiresDockerSock: config.HasDockerProvider(),
 			Images:             config.Images,
 			IPFamily:           config.GetVariable(IPFamily),