review fixes

kubernetes-sigs · Dec 12, 2023 · b0c947e · b0c947e
1 parent a5ffd1d
commit b0c947e
Show file tree

Hide file tree

Showing 28 changed files with 46 additions and 3,760 deletions.
diff --git a/Makefile b/Makefile
@@ -78,8 +78,8 @@ endif
 GINKGO_FOCUS ?=
 GINKGO_SKIP ?=
 GINKGO_TIMEOUT ?= 2h
-E2E_CONF_FILE ?= "$(abspath test/e2e/config/vsphere-dev.yaml)"
-INTEGRATION_CONF_FILE ?= "$(abspath test/integration/integration-dev.yaml)"
+E2E_CONF_FILE ?= $(abspath test/e2e/config/vsphere-dev.yaml)
+INTEGRATION_CONF_FILE ?= $(abspath test/integration/integration-dev.yaml)
 E2E_TEMPLATE_DIR := $(abspath test/e2e/data/infrastructure-vsphere/)
 SKIP_RESOURCE_CLEANUP ?= false
 USE_EXISTING_CLUSTER ?= false

diff --git a/packaging/flavorgen/flavors/patches.go b/packaging/flavorgen/flavors/patches.go
@@ -188,6 +188,8 @@ func kubeVipEnabledPatch() clusterv1.ClusterClassPatch {
 						Op:   "add",
 						Path: "/spec/template/spec/kubeadmConfigSpec/files/-",
 						ValueFrom: &clusterv1.JSONPatchValue{
+							// This patch ensures that the ControlPlaneIP which is set as variable `controlPlaneIPAddr` is also set
+							// in the kube-vip static pod manifest.
 							Template: pointer.String(`owner: root:root
 path:  "/etc/kubernetes/manifests/kube-vip.yaml"
 content: {{ printf "%q" (regexReplaceAll "(name: address\n +value:).*" .kubeVipPodManifest (printf "$1 %s" .controlPlaneIpAddr)) }}`),

diff --git a/test/e2e/clusterctl_upgrade_test.go b/test/e2e/clusterctl_upgrade_test.go
@@ -17,54 +17,54 @@ limitations under the License.
 package e2e
 
 import (
-	"context"
-
 	. "github.com/onsi/ginkgo/v2"
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
 )
 
 var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.8=>current, CAPI 1.5=>1.6) [ClusterClass]", func() {
-	capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
+	capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
 		return capi_e2e.ClusterctlUpgradeSpecInput{
 			E2EConfig:                         e2eConfig,
 			ClusterctlConfigPath:              clusterctlConfigPath,
 			BootstrapClusterProxy:             bootstrapClusterProxy,
 			ArtifactFolder:                    artifactFolder,
 			SkipCleanup:                       skipCleanup,
-			InitWithProvidersContract:         "v1beta1",
 			MgmtFlavor:                        "remote-management",
 			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.4/clusterctl-{OS}-{ARCH}",
 			InitWithCoreProvider:              "cluster-api:v1.5.4",
 			InitWithBootstrapProviders:        []string{"kubeadm:v1.5.4"},
 			InitWithControlPlaneProviders:     []string{"kubeadm:v1.5.4"},
 			InitWithInfrastructureProviders:   []string{"vsphere:v1.8.4"},
 			InitWithRuntimeExtensionProviders: []string{},
-			InitWithKubernetesVersion:         "v1.28.0",
-			WorkloadKubernetesVersion:         "v1.28.0",
-			WorkloadFlavor:                    "workload",
+			// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
+			// This is to guarantee that both, the old and new CAPI version, support the defined version.
+			InitWithKubernetesVersion: "v1.28.0",
+			WorkloadKubernetesVersion: "v1.28.0",
+			WorkloadFlavor:            "workload",
 		}
 	})
 })
 
 var _ = Describe("When testing clusterctl upgrades using ClusterClass (CAPV 1.7=>current, CAPI 1.4=>1.6) [ClusterClass]", func() {
-	capi_e2e.ClusterctlUpgradeSpec(context.TODO(), func() capi_e2e.ClusterctlUpgradeSpecInput {
+	capi_e2e.ClusterctlUpgradeSpec(ctx, func() capi_e2e.ClusterctlUpgradeSpecInput {
 		return capi_e2e.ClusterctlUpgradeSpecInput{
 			E2EConfig:                         e2eConfig,
 			ClusterctlConfigPath:              clusterctlConfigPath,
 			BootstrapClusterProxy:             bootstrapClusterProxy,
 			ArtifactFolder:                    artifactFolder,
 			SkipCleanup:                       skipCleanup,
-			InitWithProvidersContract:         "v1beta1",
 			MgmtFlavor:                        "remote-management",
 			InitWithBinary:                    "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/clusterctl-{OS}-{ARCH}",
 			InitWithCoreProvider:              "cluster-api:v1.4.9",
 			InitWithBootstrapProviders:        []string{"kubeadm:v1.4.9"},
 			InitWithControlPlaneProviders:     []string{"kubeadm:v1.4.9"},
 			InitWithInfrastructureProviders:   []string{"vsphere:v1.7.4"},
 			InitWithRuntimeExtensionProviders: []string{},
-			InitWithKubernetesVersion:         "v1.27.3",
-			WorkloadKubernetesVersion:         "v1.27.3",
-			WorkloadFlavor:                    "workload",
+			// InitWithKubernetesVersion should be the highest kubernetes version supported by the init Cluster API version.
+			// This is to guarantee that both, the old and new CAPI version, support the defined version.
+			InitWithKubernetesVersion: "v1.27.3",
+			WorkloadKubernetesVersion: "v1.27.3",
+			WorkloadFlavor:            "workload",
 		}
 	})
 })
diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml
@@ -44,7 +44,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -54,7 +54,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -78,7 +78,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -88,7 +88,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -112,7 +112,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -122,7 +122,7 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"

diff --git a/test/e2e/config/vsphere-dev.yaml b/test/e2e/config/vsphere-dev.yaml
@@ -47,17 +47,17 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.
+      - name: v1.4.9
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./core-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/core-components.yaml"
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.7/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -81,17 +81,17 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.
+      - name: v1.4.9
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./bootstrap-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/bootstrap-components.yaml"
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
@@ -115,17 +115,17 @@ providers:
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"
-      - name: v1.4.
+      - name: v1.4.9
         # Use manifest from source files
-        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4./control-plane-components.yaml"
+        value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.9/control-plane-components.yaml"
         type: "url"
         contract: v1beta1
         files:
-          - sourcePath: "../data/shared/main/v1beta1/metadata.yaml"
+          - sourcePath: "../data/shared/v1.8/v1beta1/metadata.yaml"
         replacements:
           - old: "imagePullPolicy: Always"
             new: "imagePullPolicy: IfNotPresent"