removed usage of our ccm fork.

Untested. First #1772 (Go Updates), then #1771 (Tooling Updates), then this PR.

Author: guettli

.github/actions/e2e/action.yaml

@@ -78,7 +78,7 @@ runs:
         HETZNER_SSH_PUB: ${{ inputs.e2e_ssh_pub }}
         HETZNER_SSH_PRIV: ${{ inputs.e2e_ssh_priv }}
         SKIP_IMAGE_BUILD: "1"
-        CAPH_LATEST_VERSION: "v1.0.1"
+        CAPH_LATEST_VERSION: "v1.0.1" # Looks outdated.
       run: make ${{ inputs.e2e_make_target }}
 
     - name: Upload artifact

docs/caph/02-topics/05-baremetal/03-creating-workload-cluster.md

@@ -75,19 +75,12 @@ If you have configured your secret correctly in the previous step then you alrea
 Let's deploy the hetzner CCM helm chart.
 
 ```shell
-helm repo add syself https://charts.syself.com
-helm repo update syself
-
-$ helm upgrade --install ccm syself/ccm-hetzner --version 2.0.1 \
-              --namespace kube-system \
-              --kubeconfig workload-kubeconfig
-Release "ccm" does not exist. Installing it now.
-NAME: ccm
-LAST DEPLOYED: Thu Apr  4 21:09:25 2024
-NAMESPACE: kube-system
-STATUS: deployed
-REVISION: 1
-TEST SUITE: None
+helm repo add hcloud https://charts.hetzner.cloud
+helm repo update hcloud
+
+helm upgrade --install ccm \
+    --namespace kube-system \
+    --kubeconfig workload-kubeconfig
 ```
 
 ### Installing CNI

test/e2e/Makefile

@@ -67,26 +67,17 @@ e2e-cilium-templates:
 	sed -i '1s/^/# Created by `make e2e-cilium-templates`\n/' $(REPO_ROOT)/test/e2e/data/cni/cilium/cilium.yaml
 
 e2e-ccm-templates:
-	helm repo add syself https://charts.syself.com
+	helm repo add hcloud https://charts.hetzner.cloud
+	helm repo update hcloud
 
-	helm template ccm syself/ccm-hcloud --version 1.0.11 \
-	--namespace kube-system \
-	--set pdb.enabled=false \
-	--set secret.name=hetzner \
-	--set secret.tokenKeyName=hcloud \
-	--set privateNetwork.enabled=false > $(REPO_ROOT)/test/e2e/data/ccm/hcloud-ccm.yaml
+	echo "# Autogenerated by 'make e2e-ccm-templates'" \
+		> $(REPO_ROOT)/test/e2e/data/ccm/ccm.yaml
 
-	helm template ccm syself/ccm-hcloud --version 1.0.11 \
-	--namespace kube-system \
-	--set pdb.enabled=false \
-	--set secret.name=hetzner \
-	--set secret.tokenKeyName=hcloud \
-	--set privateNetwork.enabled=true > $(REPO_ROOT)/test/e2e/data/ccm/hcloud-ccm-network.yaml
+	helm template hccm hcloud/hcloud-cloud-controller-manager \
+		--version v1.29.1 \
+		--namespace kube-system \
+		>> $(REPO_ROOT)/test/e2e/data/ccm/ccm.yaml
 
-	helm template ccm syself/ccm-hetzner --version 2.0.1 \
-	--namespace kube-system \
-	--set pdb.enabled=false \
-	--set privateNetwork.enabled=false > $(REPO_ROOT)/test/e2e/data/ccm/hcloud-ccm-hetzner.yaml
 
 .PHONY: cluster-templates
 cluster-templates: $(KUSTOMIZE) cluster-templates-v1beta1 ## Generate cluster templates for all versions

test/e2e/cluster-templates-v1beta1.sh

@@ -57,8 +57,6 @@ kustomize build "$HETZNER_TEMPLATES"/v1beta1/cluster-template-hcloud-feature-loa
 
 kustomize build "$HETZNER_TEMPLATES"/v1beta1/cluster-template-hcloud-feature-placement-groups --load-restrictor LoadRestrictionsNone >"$HETZNER_TEMPLATES"/v1beta1/cluster-template-hcloud-feature-placement-groups.yaml
 
-kustomize build "$HETZNER_TEMPLATES"/v1beta1/cluster-template-network --load-restrictor LoadRestrictionsNone >"$HETZNER_TEMPLATES"/v1beta1/cluster-template-network.yaml
-
 kustomize build "$HETZNER_TEMPLATES"/v1beta1/cluster-template-kcp-remediation --load-restrictor LoadRestrictionsNone >"$HETZNER_TEMPLATES"/v1beta1/cluster-template-kcp-remediation.yaml
 
 kustomize build "$HETZNER_TEMPLATES"/v1beta1/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone >"$HETZNER_TEMPLATES"/v1beta1/cluster-template-md-remediation.yaml

test/e2e/common.go

@@ -44,12 +44,8 @@ const (
 	// Currently (in this context) "hetzner" means the syself-ccm,
 	// and "hcloud" means the hcloud ccm (which now supports bare-metal, too)
 	// Nevertheless, the hcloud/hetzner ccm is not supported.
-	CCMPath             = "CCM"
-	CCMResources        = "CCM_RESOURCES"
-	CCMNetworkPath      = "CCM_NETWORK"
-	CCMNetworkResources = "CCM_RESOURCES_NETWORK"
-	CCMHetznerPath      = "CCM_HETZNER"
-	CCMHetznerResources = "CCM_RESOURCES_HETZNER"
+	CCMPath      = "CCM"
+	CCMResources = "CCM_RESOURCES"
 )
 
 // Byf implements Ginkgo's By with fmt.Sprintf.

test/e2e/config/hetzner.yaml

@@ -76,7 +76,6 @@ providers:
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-load-balancer-extra-services.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-placement-groups.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-loadbalancer-off.yaml"
-          - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-network.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-node-drain.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-md-remediation.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-kcp-remediation.yaml"
@@ -100,7 +99,6 @@ providers:
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-load-balancer-extra-services.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-placement-groups.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-loadbalancer-off.yaml"
-          - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-network.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-node-drain.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-md-remediation.yaml"
           - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-kcp-remediation.yaml"
@@ -126,7 +124,6 @@ providers:
       #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-load-balancer-extra-services.yaml"
       #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-placement-groups.yaml"
       #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-hcloud-feature-loadbalancer-off.yaml"
-      #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-network.yaml"
       #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-node-drain.yaml"
       #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-md-remediation.yaml"
       #     - sourcePath: "../data/infrastructure-hetzner/v1beta1/cluster-template-kcp-remediation.yaml"
@@ -156,9 +153,7 @@ variables:
 
   # Cluster Addons
   CILIUM: "./data/cni/cilium/cilium.yaml"
-  CCM: "./data/ccm/hcloud-ccm.yaml"
-  CCM_NETWORK: "./data/ccm/hcloud-ccm-network.yaml"
-  CCM_HETZNER: "./data/ccm/hcloud-ccm-hetzner.yaml"
+  CCM: "./data/ccm/ccm.yaml"
 
   # Conformance testing variables
   CONFORMANCE_WORKER_MACHINE_COUNT: 3