Merge pull request #303 from syself/fix/pipeline

🐛 Fix pipeline of e2e test

templates/cluster-templates/bases/hcloud-kcp-ubuntu.yaml

@@ -133,25 +133,6 @@ spec:
                   - name: key1
                     secret: 8d7iAcg3/NwN9aijhtEXj5kL2NOHIgokGFjbIBfL6X0=
               - identity: {}
-      - path: /etc/systemd/system/sys-fs-bpf.mount
-        owner: "root:root"
-        permissions: "0744"
-        content: |
-          [Unit]
-          Description=Cilium BPF mounts
-          Documentation=https://docs.cilium.io/
-          DefaultDependencies=no
-          Before=local-fs.target umount.target
-          After=swap.target
-
-          [Mount]
-          What=bpffs
-          Where=/sys/fs/bpf
-          Type=bpf
-          Options=rw,nosuid,nodev,noexec,relatime,mode=700
-
-          [Install]
-          WantedBy=multi-user.target
       - path: /etc/sysctl.d/99-cilium.conf
         owner: "root:root"
         permissions: "0744"

templates/cluster-templates/bases/kct-md-0-ubuntu.yaml

@@ -20,25 +20,6 @@ spec:
             max-pods: "220"
             resolv-conf: /etc/kubernetes/resolv.conf
       files:
-        - path: /etc/systemd/system/sys-fs-bpf.mount
-          owner: "root:root"
-          permissions: "0744"
-          content: |
-            [Unit]
-            Description=Cilium BPF mounts
-            Documentation=https://docs.cilium.io/
-            DefaultDependencies=no
-            Before=local-fs.target umount.target
-            After=swap.target
-
-            [Mount]
-            What=bpffs
-            Where=/sys/fs/bpf
-            Type=bpf
-            Options=rw,nosuid,nodev,noexec,relatime,mode=700
-
-            [Install]
-            WantedBy=multi-user.target
         - path: /etc/sysctl.d/99-cilium.conf
           owner: "root:root"
           permissions: "0744"

test/e2e/Makefile

@@ -59,6 +59,7 @@ e2e-cilium-templates:
 	helm template cilium cilium/cilium --version 1.12.2 \
   	--namespace kube-system \
 	-f $(REPO_ROOT)/templates/cilium/cilium.yaml > $(REPO_ROOT)/test/e2e/data/cni/cilium/cilium.yaml
+	sed -i 's/$${BIN_PATH}/$$BIN_PATH/' $(REPO_ROOT)/test/e2e/data/cni/cilium/cilium.yaml
 
 e2e-ccm-templates:
 	helm repo add syself https://charts.syself.com

test/e2e/common.go

@@ -37,6 +37,8 @@ import (
 const (
 	RedactLogScriptPath = "REDACT_LOG_SCRIPT"
 	KubernetesVersion   = "KUBERNETES_VERSION"
+	CiliumPath          = "CILIUM"
+	CiliumResources     = "CILIUM_RESOURCES"
 	CCMPath             = "CCM"
 	CCMResources        = "CCM_RESOURCES"
 	CCMNetworkPath      = "CCM_NETWORK"

test/e2e/config/hetzner-ci.yaml

@@ -128,11 +128,10 @@ variables:
   INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
 
   # Cluster Addons
-  CNI: "./data/cni/cilium/cilium.yaml"
+  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"
-  BIN_PATH: "${BIN_PATH}"
 
   # Conformance testing variables
   CONFORMANCE_WORKER_MACHINE_COUNT: 3

test/e2e/config/hetzner.yaml

@@ -134,11 +134,10 @@ variables:
   INIT_WITH_INFRASTRUCTURE_PROVIDER_VERSION: ${CAPH_LATEST_VERSION:-}
 
   # Cluster Addons
-  CNI: "./data/cni/cilium/cilium.yaml"
+  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"
-  BIN_PATH: "${BIN_PATH}"
 
   # Conformance testing variables
   CONFORMANCE_WORKER_MACHINE_COUNT: 3

test/e2e/data/infrastructure-hetzner/v1beta1/bases/crs-cni.yaml

@@ -5,7 +5,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: "${CLUSTER_NAME}-crs-cni"
-data: ${CNI_RESOURCES}
+data: ${CILIUM_RESOURCES}
 binaryData:
 ---
 # ClusterResourceSet object with

test/e2e/e2e_suite_test.go

@@ -29,7 +29,6 @@ import (
 	. "github.com/onsi/gomega"
 	infrav1 "github.com/syself/cluster-api-provider-hetzner/api/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
-	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
 	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/bootstrap"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
@@ -193,11 +192,11 @@ func createClusterctlLocalRepository(ctx context.Context, config *clusterctl.E2E
 		RepositoryFolder: repositoryFolder,
 	}
 
-	// Ensuring a CNI file is defined in the config and register a FileTransformation to inject the referenced file as in place of the CNI_RESOURCES envSubst variable.
-	Expect(config.Variables).To(HaveKey(capi_e2e.CNIPath), "Missing %s variable in the config", capi_e2e.CNIPath)
-	cniPath := config.GetVariable(capi_e2e.CNIPath)
-	Expect(cniPath).To(BeAnExistingFile(), "The %s variable should resolve to an existing file", capi_e2e.CNIPath)
-	createRepositoryInput.RegisterClusterResourceSetConfigMapTransformation(cniPath, capi_e2e.CNIResources)
+	// Ensuring a CCM file is defined in the config and register a FileTransformation to inject the referenced file as in place of the CCM_RESOURCES envSubst variable.
+	Expect(config.Variables).To(HaveKey(CiliumPath), "Missing %s variable in the config", CiliumPath)
+	ciliumPath := config.GetVariable(CiliumPath)
+	Expect(ciliumPath).To(BeAnExistingFile(), "The %s variable should resolve to an existing file", CiliumPath)
+	createRepositoryInput.RegisterClusterResourceSetConfigMapTransformation(ciliumPath, CiliumResources)
 
 	// Ensuring a CCM file is defined in the config and register a FileTransformation to inject the referenced file as in place of the CCM_RESOURCES envSubst variable.
 	Expect(config.Variables).To(HaveKey(CCMPath), "Missing %s variable in the config", CCMPath)