Merge pull request #1797 from alexander-demicev/cherrypick-v025

Cherry pick commits to release/v0.25

Author: alexander-demicev

.envrc.example

@@ -10,7 +10,6 @@ export VSPHERE_PASSWORD=""
 export VSPHERE_USERNAME=""
 export VSPHERE_SSH_AUTHORIZED_KEY=""
 export CONTROL_PLANE_ENDPOINT_IP=""
-export CPI_IMAGE_K8S_VERSION=""
 export EXP_CLUSTER_RESOURCE_SET="true/false"
 export GOVC_URL=""
 export GOVC_USERNAME=""

.github/dependabot.yaml

@@ -60,64 +60,6 @@ updates:
       - dependency-name: "go.etcd.io/*"
       - dependency-name: "google.golang.org/grpc"
 
-  # ETCD backup/restore module
-  - package-ecosystem: "gomod"
-    directory: "exp/day2/"
-    schedule:
-      interval: "weekly"
-    labels:
-      - "kind/cleanup"
-      - "area/dependency"
-    groups:
-      testing-dependencies:
-        patterns:
-          - "github.com/onsi/ginkgo/v2"
-          - "github.com/onsi/gomega"
-      provider-dependencies:
-        patterns:
-          - "*cluster-api-provider*"
-      other-dependencies:
-        patterns:
-          - "*"
-    ignore:
-      # Ignore Cluster-API as its upgraded manually.
-      - dependency-name: "sigs.k8s.io/cluster-api"
-      # Ignore controller-runtime as its upgraded manually.
-      - dependency-name: "sigs.k8s.io/controller-runtime"
-      # Ignore k8s and its transitives modules as they are upgraded manually
-      # together with controller-runtime.
-      - dependency-name: "k8s.io/*"
-      - dependency-name: "go.etcd.io/*"
-      - dependency-name: "google.golang.org/grpc"
-
-  # Clusterclass progressive rebase implementation
-  - package-ecosystem: "gomod"
-    directory: "/exp/clusterclass"
-    schedule:
-      interval: "weekly"
-    labels:
-      - "kind/cleanup"
-      - "area/dependency"
-    groups:
-      testing-dependencies:
-        patterns:
-          - "github.com/onsi/ginkgo/v2"
-          - "github.com/onsi/gomega"
-      provider-dependencies:
-        patterns:
-          - "*cluster-api-provider*"
-      other-dependencies:
-        patterns:
-          - "*"
-    ignore:
-      # Ignore controller-runtime as its upgraded manually.
-      - dependency-name: "sigs.k8s.io/controller-runtime"
-      # Ignore k8s and its transitives modules as they are upgraded manually
-      # together with controller-runtime.
-      - dependency-name: "k8s.io/*"
-      - dependency-name: "go.etcd.io/*"
-      - dependency-name: "google.golang.org/grpc"
-
   # Examples package
   - package-ecosystem: "gomod"
     directory: "/examples"

.github/workflows/test_chart.yaml

@@ -56,11 +56,16 @@ jobs:
       - name: Run chart-testing (lint)
         run: ct lint --validate-maintainers=false --charts out/charts/rancher-turtles/
 
+      - name: Install kind
+        run: |
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.30.0/kind-$(uname)-amd64
+          chmod +x ./kind
+          sudo mv ./kind /usr/local/bin/kind
+
       - name: Create kind cluster
-        uses: helm/[email protected]
-        with:
-          cluster_name: kind
-          node_image: kindest/node:v1.31.4
+        run: |
+          kind create cluster --name kind \
+            --image kindest/node@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
 
       - name: Display kind version
         run: kind version
@@ -96,25 +101,9 @@ jobs:
             exit 1
           fi
 
-      - name: Wait for RKE2 bootstrap provider rollout
-        run: sleep 30 && kubectl rollout status deployment rke2-bootstrap-controller-manager -n rke2-bootstrap-system --timeout=10m
-
-      - name: Wait for RKE2 control plane provider rollout
-        run: sleep 30 && kubectl rollout status deployment rke2-control-plane-controller-manager -n rke2-control-plane-system --timeout=10m
-
-      - name: Wait for CAAPF provider rollout
-        run: sleep 30 && kubectl rollout status deployment caapf-controller-manager -n rancher-turtles-system --timeout=10m
-
       - name: Run chart-testing (un-install)
         run: helm uninstall rancher-turtles -n rancher-turtles-system --cascade foreground --wait --debug --timeout=10m
 
-      - name: Verify CAPIProvider CRs persist after uninstall
-        run: |
-          set -euo pipefail
-          kubectl get capiprovider rke2-bootstrap -n rke2-bootstrap-system
-          kubectl get capiprovider rke2-control-plane -n rke2-control-plane-system
-          kubectl get capiprovider fleet -n rancher-turtles-system
-
       - name: Run chart re-install
         run: helm install rancher-turtles out/charts/rancher-turtles/ -n rancher-turtles-system --create-namespace --wait --debug
 
@@ -142,11 +131,16 @@ jobs:
       - name: Package operator chart
         run: make release-chart
 
+      - name: Install kind
+        run: |
+          curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.30.0/kind-$(uname)-amd64
+          chmod +x ./kind
+          sudo mv ./kind /usr/local/bin/kind
+
       - name: Create kind cluster
-        uses: helm/[email protected]
-        with:
-          cluster_name: kind
-          node_image: kindest/node:v1.31.4
+        run: |
+          kind create cluster --name kind \
+            --image kindest/node@sha256:abd489f042d2b644e2d033f5c2d900bc707798d075e8186cb65e3f1367a9d5a1
 
       - name: Display kind version
         run: kind version

.golangci.yml

@@ -119,22 +119,12 @@ linters:
       - linters:
           - dupl
         path: internal/controllers/import_controller(_v3)?\.go
-      - linters:
-          - dupl
-        path: exp/day2/controllers/.*.go
       - linters:
           - revive
         text: var-naming
       - linters:
           - staticcheck
         text: ST1003
-      - linters:
-          - revive
-        path: exp/day2/controllers/.*.go
-        text: 'exported: exported method .*\.(Reconcile|SetupWithManager|SetupWebhookWithManager) should have comment or be unexported'
-      - linters:
-          - unused
-        path: exp/day2/controllers/.*.go
       - linters:
           - revive
         text: 'package-comments: should have a package comment'

Dockerfile

@@ -39,59 +39,12 @@ RUN --mount=type=cache,target=/go/pkg/mod \
     go build -trimpath -tags "${go_build_tags}" -ldflags "${ldflags} -extldflags '-static'" \
     -o manager ${package}
 
-
-FROM --platform=$BUILDPLATFORM ${builder_image} as day2-operations-builder
-WORKDIR /workspace
-
-# Run this with docker build --build-arg goproxy=$(go env GOPROXY) to override the goproxy
-ARG goproxy=https://proxy.golang.org
-# Run this with docker build --build-arg package=./exp/day2
-ENV GOPROXY=$goproxy
-
-# Copy the sources
-COPY ./ ./
-
-# Build
-ARG ldflags
-ARG go_build_tags=""
-ARG TARGETOS TARGETARCH
-
-# Do not force rebuild of up-to-date packages (do not use -a) and use the compiler cache folder
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg/mod \
-    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
-    sh -c "cd exp/day2 && ls && go build -trimpath -tags \"${go_build_tags}\" -ldflags \"${ldflags} -extldflags '-static'\" -o manager ${package}"
-
-FROM --platform=$BUILDPLATFORM ${builder_image} as clusterclass-operations-builder
-WORKDIR /workspace
-
-# Run this with docker build --build-arg goproxy=$(go env GOPROXY) to override the goproxy
-ARG goproxy=https://proxy.golang.org
-# Run this with docker build --build-arg package=./exp/etcdrestore
-ENV GOPROXY=$goproxy
-
-# Copy the sources
-COPY ./ ./
-
-# Build
-ARG ldflags
-ARG go_build_tags=""
-ARG TARGETOS TARGETARCH
-
-# Do not force rebuild of up-to-date packages (do not use -a) and use the compiler cache folder
-RUN --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg/mod \
-    CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH \
-    sh -c "cd exp/clusterclass && ls && go build -trimpath -tags \"${go_build_tags}\" -ldflags \"${ldflags} -extldflags '-static'\" -o manager ${package}"
-
 # Use distroless as minimal base image to package the manager binary
 # Refer to https://github.com/GoogleContainerTools/distroless for more details
 FROM gcr.io/distroless/static:nonroot
 LABEL org.opencontainers.image.source=https://github.com/rancher/turtles
 WORKDIR /
 COPY --from=builder /workspace/manager .
-COPY --from=day2-operations-builder /workspace/exp/day2/manager turtles-day2-operations
-COPY --from=clusterclass-operations-builder /workspace/exp/clusterclass/manager turtles-clusterclass-operations
 # Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies
 USER 65532
 ENTRYPOINT ["/manager"]

Makefile

@@ -59,8 +59,6 @@ BIN_DIR := bin
 TEST_DIR := test
 TOOLS_DIR := hack/tools
 TOOLS_BIN_DIR := $(abspath $(TOOLS_DIR)/$(BIN_DIR))
-EXP_DAY2_DIR := exp/day2
-EXP_CLUSTERCLASS_DIR := exp/clusterclass
 
 $(TOOLS_BIN_DIR):
 	mkdir -p $@
@@ -157,7 +155,7 @@ HELM_VER := v3.18.4
 HELM_BIN := helm
 HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
 
-CLUSTERCTL_VER := v1.10.5
+CLUSTERCTL_VER := v1.10.6
 CLUSTERCTL_BIN := clusterctl
 CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)
 
@@ -230,8 +228,6 @@ generate: vendor ## Run all generators
 	$(MAKE) vendor
 	$(MAKE) generate-modules
 	$(MAKE) generate-manifests-api
-	$(MAKE) generate-exp-day2-manifests-api
-	$(MAKE) generate-exp-clusterclass-manifests-api
 	$(MAKE) generate-manifests-external
 	$(MAKE) generate-go-deepcopy
 	$(MAKE) vendor-clean
@@ -252,37 +248,16 @@ generate-manifests-api: controller-gen ## Generate ClusterRole and CustomResourc
 			output:crd:artifacts:config=./config/crd/bases \
 			output:rbac:dir=./config/rbac \
 
-.PHONY: generate-exp-day2-manifests-api
-generate-exp-day2-manifests-api: controller-gen ## Generate ClusterRole and CustomResourceDefinition objects for experimental API.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd paths="./exp/day2/api/v1alpha1/..." \
-			paths=./exp/day2/controllers/... \
-			paths=./exp/day2/webhooks/... \
-			output:crd:artifacts:config=./exp/day2/config/crd/bases \
-			output:rbac:dir=./exp/day2/config/rbac \
-			output:webhook:dir=./exp/day2/config/webhook \
-			webhook
-
-.PHONY: generate-exp-clusterclass-manifests-api
-generate-exp-clusterclass-manifests-api: controller-gen ## Generate ClusterRole and CustomResourceDefinition objects for experimental API.
-	$(CONTROLLER_GEN) rbac:roleName=manager-role crd paths="./exp/clusterclass/api/v1alpha1/..." \
-			paths=./exp/clusterclass/internal/controller/... \
-			output:crd:artifacts:config=./exp/clusterclass/config/crd/bases \
-			output:rbac:dir=./exp/clusterclass/config/rbac
-
 .PHONY: generate-modules
 generate-modules: ## Run go mod tidy to ensure modules are up to date
 	go mod tidy
 	cd $(TEST_DIR); go mod tidy
-	cd $(EXP_DAY2_DIR); go mod tidy
-	cd $(EXP_CLUSTERCLASS_DIR); go mod tidy
 
 .PHONY: generate-go-deepcopy
 generate-go-deepcopy:  ## Run deepcopy generation
 	$(CONTROLLER_GEN) \
 		object:headerFile=./hack/boilerplate.go.txt \
-		paths=./api/... \
-		paths=./exp/day2/api/...
-		paths=./exp/clusterclass/api/...
+		paths=./api/... 
 
 # Run go mod
 .PHONY: vendor
@@ -334,18 +309,10 @@ updatecli-apply: $(UPDATECLI)
 KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use --use-env -p path $(KUBEBUILDER_ENVTEST_KUBERNETES_VERSION))
 
 .PHONY: test
-test: $(SETUP_ENVTEST) manifests test-exp-day2 test-exp-clusterclass ## Run all generators and exp tests.
+test: $(SETUP_ENVTEST) manifests ## Run all generators and tests.
 	go clean -testcache
 	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -tags $(TARGET_BUILD) ./... $(TEST_ARGS)
 
-.PHONY: test-exp-day2
-test-exp-day2: $(SETUP_ENVTEST) ## Run tests for experimental day2 API.
-	cd $(EXP_DAY2_DIR); KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -tags $(TARGET_BUILD) ./... $(TEST_ARGS)
-
-.PHONY: test-exp-clusterclass
-test-exp-clusterclass: $(SETUP_ENVTEST) ## Run tests for experimental clusterclass API.
-	cd $(EXP_CLUSTERCLASS_DIR); KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -tags $(TARGET_BUILD) ./... $(TEST_ARGS)
-
 ##@ Build
 
 .PHONY: build
@@ -591,26 +558,13 @@ release: clean-release $(RELEASE_DIR)  ## Builds and push container images using
 build-chart: $(HELM) $(KUSTOMIZE) $(RELEASE_DIR) $(CHART_RELEASE_DIR) $(CHART_PACKAGE_DIR) ## Builds the chart to publish with a release
 	$(KUSTOMIZE) build ./config/chart > $(CHART_DIR)/templates/rancher-turtles-components.yaml
 	$(KUSTOMIZE) build ./config/operatorchart > $(CHART_DIR)/templates/operator-crds.yaml
-	$(KUSTOMIZE) build ./exp/day2/config/chart > $(CHART_DIR)/templates/rancher-turtles-exp-day2-components.yaml
-	$(KUSTOMIZE) build ./exp/clusterclass/config/default > $(CHART_DIR)/templates/rancher-turtles-exp-clusterclass-components.yaml
-	./scripts/process-manifests.sh day2operations $(CHART_DIR)/templates/rancher-turtles-exp-day2-components.yaml
-	./scripts/process-manifests.sh clusterclass-operations $(CHART_DIR)/templates/rancher-turtles-exp-clusterclass-components.yaml
+
 	cp -rf $(CHART_DIR)/* $(CHART_RELEASE_DIR)
 
 	sed -i -e 's/tag:.*/tag: '${RELEASE_TAG}'/' $(CHART_RELEASE_DIR)/values.yaml
 	sed -i -e 's/imagePullPolicy:.*/imagePullPolicy: '$(PULL_POLICY)'/' $(CHART_RELEASE_DIR)/values.yaml
 	sed -i -e 's|repository:.*|repository: '${CONTROLLER_IMG}'|' $(CHART_RELEASE_DIR)/values.yaml
 
-	# day2operations
-	sed -i -e '/day2operations:/,/^[^[:space:]]/ s@^\([[:space:]]*image:\).*@\1 '"${CONTROLLER_IMG}"'@' $(CHART_RELEASE_DIR)/values.yaml
-	sed -i -e '/day2operations:/,/^[^[:space:]]/ s@^\([[:space:]]*imageVersion:\).*@\1 '"${RELEASE_TAG}"'@' $(CHART_RELEASE_DIR)/values.yaml
-	sed -i -e '/day2operations:/,/^[^[:space:]]/ s@^\([[:space:]]*imagePullPolicy:\).*@\1 '"${PULL_POLICY}"'@' $(CHART_RELEASE_DIR)/values.yaml
-
-	# clusterclass-operations
-	sed -i -e '/clusterclass-operations:/,/^[^[:space:]]/ s@^\([[:space:]]*image:\).*@\1 '"${CONTROLLER_IMG}"'@' $(CHART_RELEASE_DIR)/values.yaml
-	sed -i -e '/clusterclass-operations:/,/^[^[:space:]]/ s@^\([[:space:]]*imageVersion:\).*@\1 '"${RELEASE_TAG}"'@' $(CHART_RELEASE_DIR)/values.yaml
-	sed -i -e '/clusterclass-operations:/,/^[^[:space:]]/ s@^\([[:space:]]*imagePullPolicy:\).*@\1 '"${PULL_POLICY}"'@' $(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)
 

PROJECT

@@ -17,31 +17,4 @@ resources:
   kind: CAPIProvider
   path: github.com/rancher/turtles/api/v1alpha1
   version: v1alpha1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: cattle.io
-  group: turtles-capi
-  kind: ETCDMachineSnapshot
-  path: github.com/rancher/turtles/exp/day2/api/v1alpha1
-  version: v1alpha1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: cattle.io
-  group: turtles-capi
-  kind: ETCDSnapshotRestore
-  path: github.com/rancher/turtles/exp/day2/api/v1alpha1
-  version: v1alpha1
-- api:
-    crdVersion: v1
-    namespaced: true
-  controller: true
-  domain: cattle.io
-  group: turtles-capi
-  kind: RKE2EtcdMachineSnapshotConfig
-  path: github.com/rancher/turtles/exp/day2/api/v1alpha1
-  version: v1alpha1
 version: "3"