fix: Remove providers dependency and verify E2E only with operator chart

Signed-off-by: kahirokunn <[email protected]>

Author: kahirokunn

.github/workflows/smoke-test.yaml

@@ -16,14 +16,11 @@ env:
   KUBERNETES_VERSION: v1.33.0
   CONTROLLER_IMG: cluster-api-operator
   TAG: smoke-test
+  ARCH: amd64
 
 jobs:
   smoke-test:
-    name: Smoke Test (${{ matrix.install-method }})
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        install-method: [legacy, recommended]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -38,24 +35,26 @@ jobs:
       - name: Install tools
         run: |
           # kubectl
-          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+          curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/${ARCH}/kubectl"
           chmod +x kubectl && sudo mv kubectl /usr/local/bin/
 
           # yq
-          wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O yq
+          wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_${ARCH} -O yq
           chmod +x yq && sudo mv yq /usr/local/bin/
 
           # helm
           curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
 
           # clusterctl
-          curl -L https://github.com/kubernetes-sigs/cluster-api/releases/latest/download/clusterctl-linux-amd64 -o clusterctl
-          chmod +x clusterctl && sudo mv clusterctl /usr/local/bin/
+          VERSION=v1.10.5
+          curl -L "https://github.com/kubernetes-sigs/cluster-api/releases/download/${VERSION}/clusterctl-linux-${ARCH}" -o clusterctl
+          sudo install -o root -g root -m 0755 clusterctl /usr/local/bin/clusterctl
+          clusterctl version
 
       - name: Build Docker image
         run: |
           make docker-build
-          docker tag ${CONTROLLER_IMG}-amd64:${TAG} ${CONTROLLER_IMG}:${TAG}
+          docker tag ${CONTROLLER_IMG}-${ARCH}:${TAG} ${CONTROLLER_IMG}:${TAG}
 
       - name: Build charts
         run: |
@@ -97,8 +96,7 @@ jobs:
             --wait \
             --timeout 5m
 
-      - name: Install Cluster API Operator (Recommended)
-        if: matrix.install-method == 'recommended'
+      - name: Install Cluster API Operator
         run: |
           CHART_PACKAGE="out/package/cluster-api-operator-${HELM_CHART_TAG}.tgz"
           helm install capi-operator "$CHART_PACKAGE" \
@@ -110,7 +108,7 @@ jobs:
             --wait \
             --timeout 90s
 
-      - name: Prepare providers values
+      - name: Deploy providers
         run: |
           cat <<EOF > /tmp/providers-values.yaml
           core:
@@ -138,40 +136,13 @@ jobs:
                 ClusterTopology: true
           EOF
 
-          # Add cluster-api-operator configuration for legacy installation
-          if [ "${{ matrix.install-method }}" = "legacy" ]; then
-            cat <<EOF >> /tmp/providers-values.yaml
-          cluster-api-operator:
-            install: true
-            image:
-              manager:
-                repository: ${CONTROLLER_IMG}
-                tag: ${TAG}
-                pullPolicy: IfNotPresent
-          EOF
-          fi
-
-      - name: Deploy providers (Recommended)
-        if: matrix.install-method == 'recommended'
-        run: |
           PROVIDERS_CHART_PACKAGE="out/package/cluster-api-operator-providers-${HELM_CHART_TAG}.tgz"
           helm install capi-providers "$PROVIDERS_CHART_PACKAGE" \
             -f /tmp/providers-values.yaml \
             --set cluster-api-operator.install=false \
             --set enableHelmHook=false \
             --wait
 
-      - name: Deploy providers (Legacy)
-        if: matrix.install-method == 'legacy'
-        run: |
-          PROVIDERS_CHART_PACKAGE="out/package/cluster-api-operator-providers-${HELM_CHART_TAG}.tgz"
-          helm install capi-providers "$PROVIDERS_CHART_PACKAGE" \
-            --create-namespace \
-            -n capi-operator-system \
-            -f /tmp/providers-values.yaml \
-            --wait \
-            --timeout 300s
-
       - name: Wait for providers
         run: |
           kubectl wait --for=condition=Ready --timeout=300s -n capi-system coreprovider/cluster-api
@@ -233,7 +204,6 @@ jobs:
       - name: Collect logs on failure
         if: failure()
         run: |
-          echo "=== Installation Method: ${{ matrix.install-method }} ==="
           echo "=== Recent Events ==="
           kubectl get events -A --sort-by='.lastTimestamp' | tail -50
 

Makefile

@@ -149,7 +149,7 @@ PROD_REGISTRY ?= registry.k8s.io/capi-operator
 
 # Image name
 IMAGE_NAME ?= cluster-api-operator
-PACKAGE_NAME = cluster-api-operator-providers
+PACKAGE_NAME = cluster-api-operator
 CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
 CONTROLLER_IMG_TAG ?= $(CONTROLLER_IMG)-$(ARCH):$(TAG)
 
@@ -497,7 +497,6 @@ release-chart: $(HELM) $(KUSTOMIZE) $(RELEASE_DIR) $(CHART_DIR) $(CHART_PROVIDER
 
 	# Processing the cluster-api-operator-providers chart
 	cp -rf $(ROOT)/hack/charts/cluster-api-operator-providers/. $(CHART_PROVIDERS_DIR)
-	$(HELM) dependency update $(CHART_PROVIDERS_DIR)
 	$(HELM) package $(CHART_PROVIDERS_DIR) --app-version=$(HELM_CHART_TAG) --version=$(HELM_CHART_TAG) --destination=$(CHART_PACKAGE_DIR)
 
 .PHONY: release-staging
@@ -571,7 +570,7 @@ test-e2e-run: $(GINKGO) $(ENVSUBST) $(HELM) ## Run e2e tests
 		-e2e.artifacts-folder="$(ARTIFACTS)" \
 		-e2e.config="$(E2E_CONF_FILE_ENVSUBST)"  -e2e.components=$(RELEASE_DIR)/operator-components.yaml \
 		-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) \
-		-e2e.helm-binary-path=$(HELM) -e2e.chart-path=$(CHART_PACKAGE_DIR)/cluster-api-operator-providers-$(HELM_CHART_TAG).tgz $(E2E_ARGS)
+		-e2e.helm-binary-path=$(HELM) -e2e.chart-path=$(CHART_PACKAGE_DIR)/cluster-api-operator-$(HELM_CHART_TAG).tgz $(E2E_ARGS)
 
 go-version: ## Print the go version we use to compile our binaries and images
 	@echo $(GO_VERSION)

hack/charts/cluster-api-operator-providers/Chart.yaml

@@ -4,8 +4,3 @@ description: Cluster API Provider Custom Resources
 type: application
 version: 0.0.0
 appVersion: "0.0.0"
-dependencies:
-  - name: cluster-api-operator
-    repository: file://../cluster-api-operator
-    version: 0.0.0
-    condition: cluster-api-operator.install