Backport multiple changes to release/v0.26 (#2212)

* test: remove capi bump test

This is not relevant anymore and it adds extra complexity on top of an
already complicated test environment. It also increases execution time
by fetching a new CAPI manifest and building a different Turtles image.

Signed-off-by: Carlos Salas <carlos.salas@suse.com>

* test: remove provider migration

With Rancher v2.14, it is no longer supported to upgrade from a version
where Turtles was a extension (v2.12) and this means there's no need to
use the provider migration tool. The oldest version of Rancher used in
E2E is v2.13 in the chart upgrade test which already includes Turtles as
a system chart.

Signed-off-by: Carlos Salas <carlos.salas@suse.com>

* test: Moving providers secrets creation to after installation of the providers chart

* test: Conditionally install providers

* ci: cleanup Rancher validation code

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>

* Use ClusterClass in e2e for GKE provisioning (#2177)

* Use ClusterClass in e2e for GKE provisioning

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

* fix(e2e): skip VerifyClusterAvailable for GKE test

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

* Add clarifying comment for WorkerMachineCount and SkipClusterAvailableWait

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

---------

Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>

* ci: do not reuse helm values when upgrading/installing Rancher

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>

* fix: bump capg to v1.11.1

This is the latest patch release that fixes a conflict in managed
template resources using the same short name as CAPZ's

Signed-off-by: Carlos Salas <carlos.salas@suse.com>

---------

Signed-off-by: Carlos Salas <carlos.salas@suse.com>
Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
Signed-off-by: Furkat Gofurov <furkat.gofurov@suse.com>
Co-authored-by: Carlos Salas <carlos.salas@suse.com>
Co-authored-by: yiannistri <8741709+yiannistri@users.noreply.github.com>
Co-authored-by: Andrea Mazzotti <andrea.mazzotti@suse.com>

Author: 4 people

.github/workflows/e2e-short.yaml

@@ -13,7 +13,6 @@ env:
   GINKGO_LABEL_FILTER: "short"
   TAG: v0.0.1
   SOURCE_REPO: https://github.com/${{ github.event.pull_request.head.repo.full_name }}
-  TURTLES_PROVIDERS: "docker,kubeadm"
 
 jobs:
   e2e:

.github/workflows/run-vsphere-tests.yaml

@@ -25,7 +25,6 @@ env:
   DOCKER_REGISTRY_USERNAME: ${{ secrets.DOCKER_REGISTRY_USERNAME }}
   DOCKER_REGISTRY_CONFIG: ${{ secrets.DOCKER_REGISTRY_CONFIG }}
   GINKGO_NODES: 2
-  TURTLES_PROVIDERS: "vsphere,kubeadm"
 
 jobs:
   run_vsphere_e2e:

Makefile

@@ -37,12 +37,8 @@ GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 REPO ?= rancher/turtles
 
 CAPI_VERSION ?= $(shell grep "sigs.k8s.io/cluster-api" go.mod | head -1 |awk '{print $$NF}')
-# NOTE: Pinned to latest; bump when newer CAPI version available.
-CAPI_VERSION_TEST_BUMP ?= v1.12.2
-CAPI_VERSION_TEST_BUMP_SUFFIX ?= capi
 CAPI_UPSTREAM_REPO ?= https://github.com/kubernetes-sigs/cluster-api
 CAPI_UPSTREAM_RELEASES ?= $(CAPI_UPSTREAM_REPO)/releases
-CORE_CAPI_FETCH_SCRIPT = .github/scripts/fetch-core-capi.sh
 
 # Use GOPROXY environment variable if set
 GOPROXY := $(shell go env GOPROXY)
@@ -98,9 +94,6 @@ GINKGO_NOCOLOR ?= false
 GINKGO_LABEL_FILTER ?= short
 TURTLES_PROVIDERS ?= ALL
 GINKGO_TESTS ?= $(ROOT_DIR)/$(TEST_DIR)/e2e/suites/...
-TURTLES_MIGRATION_SCRIPT_PATH ?= $(ROOT_DIR)/scripts/migrate-providers-ownership.sh
-CLUSTERCTL_CONFIG_PATH ?= $(ROOT_DIR)/internal/controllers/clusterctl
-CLUSTERCTL_CONFIG_PRIME_NAME ?= config-prime.yaml
 
 MANAGEMENT_CLUSTER_ENVIRONMENT ?= eks
 
@@ -182,7 +175,6 @@ CHART_TESTING_VER := v3.14.0
 
 # Registry / images
 TAG ?= dev
-TAG_CAPI_BUMP_TEST ?= $(TAG)-$(CAPI_VERSION_TEST_BUMP_SUFFIX)
 ARCH ?= linux/$(shell go env GOARCH)
 TARGET_BUILD ?= prime
 TARGET_PLATFORMS := linux/amd64,linux/arm64
@@ -204,7 +196,6 @@ PROVIDERS_CHART_DIR := charts/rancher-turtles-providers
 RELEASE_DIR ?= out
 CHART_PACKAGE_DIR ?= $(RELEASE_DIR)/package
 CHART_RELEASE_DIR ?= $(RELEASE_DIR)/$(CHART_DIR)
-CHART_RELEASE_DIR_CAPI_BUMP_TEST ?= $(RELEASE_DIR)/$(CHART_DIR)-$(CAPI_VERSION_TEST_BUMP_SUFFIX)
 PROVIDERS_CHART_RELEASE_DIR ?= $(RELEASE_DIR)/$(PROVIDERS_CHART_DIR)
 
 # Rancher charts testing
@@ -594,23 +585,6 @@ build-chart: $(HELM) $(KUSTOMIZE) $(RELEASE_DIR) $(CHART_RELEASE_DIR) $(CHART_PA
 	cd $(CHART_RELEASE_DIR) && $(HELM) dependency update
 	$(HELM) package $(CHART_RELEASE_DIR) --app-version=$(HELM_CHART_TAG) --version=$(HELM_CHART_TAG) --destination=$(CHART_PACKAGE_DIR)
 
-.PHONY: build-chart-bump-capi
-build-chart-bump-capi: $(HELM) $(KUSTOMIZE) $(RELEASE_DIR) $(CHART_RELEASE_DIR) $(CHART_PACKAGE_DIR) ## Builds the chart with an updated version of core CAPI
-	$(KUSTOMIZE) build ./config/chart > $(CHART_DIR)/templates/rancher-turtles-components.yaml
-	$(KUSTOMIZE) build ./config/operatorchart > $(CHART_DIR)/templates/operator-crds.yaml
-
-	cp -rf $(CHART_DIR)/* $(CHART_RELEASE_DIR)
-
-	yq -i '.image.tag="${RELEASE_TAG}"' $(CHART_RELEASE_DIR)/values.yaml
-	yq -i '.image.imagePullPolicy="${PULL_POLICY}"' $(CHART_RELEASE_DIR)/values.yaml
-	yq -i '.image.repository="${CONTROLLER_IMG}"' $(CHART_RELEASE_DIR)/values.yaml
-
-	cd $(CHART_RELEASE_DIR) && $(HELM) dependency update
-	$(HELM) package $(CHART_RELEASE_DIR) --app-version=$(HELM_CHART_TAG) --version=$(HELM_CHART_TAG) --destination=$(CHART_PACKAGE_DIR)
-
-	# Fetch updated core CAPI manifest file and embed it into the packaged chart
-	CAPI_VERSION=$(CAPI_VERSION_TEST_BUMP) CAPI_RELEASE_URL="$(CAPI_UPSTREAM_RELEASES)/$(CAPI_VERSION_TEST_BUMP)/core-components.yaml" CHART_DIR=$(CHART_RELEASE_DIR) $(CORE_CAPI_FETCH_SCRIPT)
-
 .PHONY: build-providers-chart
 build-providers-chart: $(HELM) $(RELEASE_DIR) $(PROVIDERS_CHART_RELEASE_DIR) $(CHART_PACKAGE_DIR)
 	cp -rf $(PROVIDERS_CHART_DIR)/* $(PROVIDERS_CHART_RELEASE_DIR)
@@ -638,15 +612,9 @@ test-providers-chart: build-providers-chart
 build-local-rancher-charts:
 	$(MAKE) clean-rancher-charts
 	mkdir -p $(RANCHER_CHARTS_REPO_DIR)
-	# First build the regular Turtles chart
+	# First build the Turtles chart
 	RELEASE_TAG=$(TAG) HELM_CHART_TAG=$(RANCHER_CHART_DEV_VERSION) $(MAKE) build-chart
 	CHART_RELEASE_DIR=$(CHART_RELEASE_DIR) HELM=$(HELM) ./scripts/build-local-rancher-charts.sh
-	# Then build a modified Turtles chart for testing core CAPI bumps
-	RELEASE_TAG=$(TAG_CAPI_BUMP_TEST) HELM_CHART_TAG=$(RANCHER_CHART_DEV_VERSION).1 CHART_RELEASE_DIR=$(CHART_RELEASE_DIR_CAPI_BUMP_TEST) $(MAKE) build-chart-bump-capi
-	CHART_RELEASE_DIR=$(CHART_RELEASE_DIR_CAPI_BUMP_TEST) \
-					  RANCHER_CHART_DEV_VERSION=$(RANCHER_CHART_DEV_VERSION).1 \
-					  CLEANUP=false \
-					  HELM=$(HELM) ./scripts/build-local-rancher-charts.sh # make it update the existing local Rancher Charts repo
 	# Finally build the providers chart
 	RELEASE_TAG=$(TAG) HELM_CHART_TAG=$(RANCHER_CHART_DEV_VERSION) $(MAKE) build-providers-chart
 
@@ -660,7 +628,6 @@ $(CACHE_DIR):
 E2ECONFIG_VARS ?= MANAGEMENT_CLUSTER_ENVIRONMENT=$(MANAGEMENT_CLUSTER_ENVIRONMENT) \
 ROOT_DIR=$(ROOT_DIR) \
 TURTLES_VERSION=$(TAG) \
-CAPI_VERSION_TEST_BUMP=$(CAPI_VERSION_TEST_BUMP) \
 E2E_CONFIG=$(E2E_CONFIG) \
 TURTLES_IMAGE=$(REGISTRY)/$(ORG)/turtles-e2e \
 ARTIFACTS=$(ARTIFACTS) \
@@ -670,7 +637,6 @@ CLUSTERCTL_BINARY_PATH=$(CLUSTERCTL) \
 SKIP_RESOURCE_CLEANUP=$(SKIP_RESOURCE_CLEANUP) \
 USE_EXISTING_CLUSTER=$(USE_EXISTING_CLUSTER) \
 TURTLES_PROVIDERS=$(TURTLES_PROVIDERS) \
-TURTLES_MIGRATION_SCRIPT_PATH=$(TURTLES_MIGRATION_SCRIPT_PATH) \
 TURTLES_PROVIDERS_PATH=$(ROOT_DIR)/$(CHART_PACKAGE_DIR)/rancher-turtles-providers-$(RANCHER_CHART_DEV_VERSION).tgz
 
 E2E_RUN_COMMAND=$(E2ECONFIG_VARS) $(GINKGO) -v --trace -p -procs=10 -poll-progress-after=$(GINKGO_POLL_PROGRESS_AFTER) \
@@ -702,22 +668,11 @@ test-e2e-remote: $(GINKGO) $(HELM) $(CLUSTERCTL) kubectl build-local-rancher-cha
 e2e-image: ## Build the image for e2e tests
 	# First build the regular Turtles image
 	CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-build
-	# Then build a modified version of Turtles for testing core CAPI bumps
-	$(MAKE) e2e-image-capi-bump
-
-.PHONY: e2e-image-capi-bump
-e2e-image-capi-bump: ## Build the image for e2e tests with an updated version of core CAPI
-	@bash -c 'cp $(CLUSTERCTL_CONFIG_PATH)/$(CLUSTERCTL_CONFIG_PRIME_NAME) $(CLUSTERCTL_CONFIG_PATH)/$(CLUSTERCTL_CONFIG_PRIME_NAME).bak; \
-		trap "mv $(CLUSTERCTL_CONFIG_PATH)/$(CLUSTERCTL_CONFIG_PRIME_NAME).bak $(CLUSTERCTL_CONFIG_PATH)/$(CLUSTERCTL_CONFIG_PRIME_NAME)" EXIT; \
-		CAPI_VERSION_TEST_BUMP=$(CAPI_VERSION_TEST_BUMP) $(ENVSUBST) < ./test/e2e/data/config-prime-bump.yaml > $(CLUSTERCTL_CONFIG_PATH)/$(CLUSTERCTL_CONFIG_PRIME_NAME); \
-		TAG=$(TAG_CAPI_BUMP_TEST) CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-build'
 
 .PHONY: e2e-image-build-and-push
 e2e-image-build-and-push: e2e-image
 	# First push the regular Turtles image
 	CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-push
-	# Then push a modified version of Turtles for testing core CAPI bumps
-	TAG=$(TAG_CAPI_BUMP_TEST) CONTROLLER_IMG=$(REGISTRY)/$(ORG)/turtles-e2e $(MAKE) e2e-image-push
 
 .PHONY: e2e-image-build
 e2e-image-build: ## Build the image for e2e tests

charts/rancher-turtles-providers/values.yaml

@@ -350,7 +350,7 @@ images:
       tag: v2.13.0
   infrastructureGCP:
     repository: rancher/cluster-api-gcp-controller
-    tag: v1.11.0  
+    tag: v1.11.1
   infrastructureVSphere:
     repository: rancher/cluster-api-vsphere-controller
     tag: v1.15.2

examples/clusterclasses/gcp/gke/clusterclass-gke-example.yaml

@@ -0,0 +1,176 @@
+apiVersion: cluster.x-k8s.io/v1beta2
+kind: ClusterClass
+metadata:
+  name: gcp-gke-example
+spec:
+  controlPlane:
+    templateRef:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+      kind: GCPManagedControlPlaneTemplate
+      name: gke-control-plane
+  infrastructure:
+    templateRef:
+      apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+      kind: GCPManagedClusterTemplate
+      name: gke-cluster
+  workers:
+    machinePools:
+      - class: default-system
+        bootstrap:
+          templateRef:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+            kind: GKEConfigTemplate
+            name: gke-bootstrap-system
+        infrastructure:
+          templateRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedMachinePoolTemplate
+            name: gke-default-system
+      - class: default-worker
+        bootstrap:
+          templateRef:
+            apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+            kind: GKEConfigTemplate
+            name: gke-bootstrap-worker
+        infrastructure:
+          templateRef:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedMachinePoolTemplate
+            name: gke-default-worker
+  variables:
+    - name: project
+      required: true
+      schema:
+        openAPIV3Schema:
+          description: "The GCP project where the cluster will be created"
+          type: string
+    - name: region
+      required: true
+      schema:
+        openAPIV3Schema:
+          description: "The GCP region where the cluster will be created"
+          type: string
+          default: us-west1
+    - name: networkName
+      required: true
+      schema:
+        openAPIV3Schema:
+          description: "The GCP network name"
+          type: string
+  patches:
+    - name: project
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedClusterTemplate
+            matchResources:
+              infrastructureCluster: true
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/project
+              valueFrom:
+                variable: project
+    - name: projectControlPlane
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedControlPlaneTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/project
+              valueFrom:
+                variable: project
+    - name: region
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedClusterTemplate
+            matchResources:
+              infrastructureCluster: true
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/region
+              valueFrom:
+                variable: region
+    - name: regionControlPlane
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedControlPlaneTemplate
+            matchResources:
+              controlPlane: true
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/location
+              valueFrom:
+                variable: region
+    - name: networkName
+      definitions:
+        - selector:
+            apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+            kind: GCPManagedClusterTemplate
+            matchResources:
+              infrastructureCluster: true
+          jsonPatches:
+            - op: add
+              path: /spec/template/spec/network/name
+              valueFrom:
+                variable: networkName
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: GCPManagedClusterTemplate
+metadata:
+  name: gke-cluster
+spec:
+  template:
+    spec:
+      project: ""
+      region: ""
+      network:
+        name: ""
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: GCPManagedControlPlaneTemplate
+metadata:
+  name: gke-control-plane
+spec:
+  template:
+    spec:
+      project: ""
+      location: ""
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: GCPManagedMachinePoolTemplate
+metadata:
+  name: gke-default-system
+spec:
+  template:
+    spec: {}
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: GCPManagedMachinePoolTemplate
+metadata:
+  name: gke-default-worker
+spec:
+  template:
+    spec: {}
+---
+# GKEConfigTemplates are the GKE-native bootstrap templates introduced in
+# https://github.com/kubernetes-sigs/cluster-api-provider-gcp/pull/1442
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: GKEConfigTemplate
+metadata:
+  name: gke-bootstrap-system
+spec:
+  template:
+    spec: {}
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+kind: GKEConfigTemplate
+metadata:
+  name: gke-bootstrap-worker
+spec:
+  template:
+    spec: {}

internal/controllers/clusterctl/config-prime.yaml

@@ -22,7 +22,7 @@ data:
       url:          "https://github.com/rancher-sandbox/cluster-api-provider-azure/releases/v1.22.0/infrastructure-components.yaml"
       type:         "InfrastructureProvider"
     - name:         "gcp"
-      url:          "https://github.com/rancher-sandbox/cluster-api-provider-gcp/releases/v1.11.0/infrastructure-components.yaml"
+      url:          "https://github.com/rancher-sandbox/cluster-api-provider-gcp/releases/v1.11.1/infrastructure-components.yaml"
       type:         "InfrastructureProvider"
     - name:         "vsphere"
       url:          "https://github.com/rancher-sandbox/cluster-api-provider-vsphere/releases/v1.15.2/infrastructure-components.yaml"

internal/controllers/clusterctl/config_test.go

@@ -66,7 +66,7 @@ data:
         url: https://github.com/rancher-sandbox/cluster-api/releases/v1.12.2/core-components.yaml
       - name: gcp
         type: InfrastructureProvider
-        url: https://github.com/rancher-sandbox/cluster-api-provider-gcp/releases/v1.11.0/infrastructure-components.yaml
+        url: https://github.com/rancher-sandbox/cluster-api-provider-gcp/releases/v1.11.1/infrastructure-components.yaml
       - name: rke2
         type: ControlPlaneProvider
         url: https://github.com/rancher/cluster-api-provider-rke2/releases/v0.23.1/control-plane-components.yaml

test/e2e/README.md

@@ -76,12 +76,12 @@ Note that `SOURCE_REPO` needs to point to your forked repository, and `GITHUB_HE
 The E2E suite installs the `rancher-turtles-providers` Helm chart via `test/testenv/providers.go`.
 
 Inputs:
+
 - HELM_BINARY_PATH: Path to the Helm binary used by the installer.
 - TURTLES_PROVIDERS_URL: Helm repo URL for the providers chart.
 - TURTLES_PROVIDERS_PATH: Local path to the `rancher-turtles-providers` chart.
 - TURTLES_PROVIDERS_REPO_NAME: Helm repo name to register.
 - TURTLES_PROVIDERS: Comma separated providers to enable on first install (note: this is only specific to e2e and not a helm chart option). Default "all".
-- TURTLES_MIGRATION_SCRIPT_PATH: Path to the providers ownership migration script.
 
 Enable providers:
 

test/e2e/const.go

@@ -99,8 +99,8 @@ var (
 	//go:embed data/cluster-templates/aws-kubeadm-topology.yaml
 	CAPIAwsKubeadmTopology []byte
 
-	//go:embed data/cluster-templates/gcp-gke.yaml
-	CAPIGCPGKE []byte
+	//go:embed data/cluster-templates/gcp-gke-topology.yaml
+	CAPIGCPGKETopology []byte
 
 	//go:embed data/cluster-templates/gcp-kubeadm-topology.yaml
 	CAPIGCPKubeadmTopology []byte
@@ -195,18 +195,13 @@ const (
 	KubeadmTestLabel = "kubeadm"
 	Rke2TestLabel    = "rke2"
 
-	CapiClusterOwnerLabel          = "cluster-api.cattle.io/capi-cluster-owner"
-	CapiClusterOwnerNamespaceLabel = "cluster-api.cattle.io/capi-cluster-owner-ns"
-	OwnedLabelName                 = "cluster-api.cattle.io/owned"
-
 	GCPImageIDVar          = "GCP_IMAGE_ID"
 	GCPImageIDFormattedVar = "GCP_IMAGE_ID_FORMATTED"
 	GCPProjectIDVar        = "GCP_PROJECT"
 )
 
 const (
-	CAPIVersion     = "v1.12.2"
-	CAPIVersionBump = "CAPI_VERSION_TEST_BUMP"
+	CAPIVersion = "v1.12.2"
 )
 
 const (

test/e2e/data/capi-operator/capa-identity-secret.yaml

@@ -1,9 +1,4 @@
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: capa-system
----
-apiVersion: v1
 kind: Secret
 metadata:
   name: cluster-identity