Use fleet to deploy CNI across all providers

Danil-Grigorev · Danil-Grigorev · commit ae4993d4211e · 2025-04-14T18:08:25.000+02:00
Signed-off-by: Danil-Grigorev &lt;danil.grigorev@suse.com&gt;
diff --git a/examples/applications/cni/calico/helm-chart.yaml b/examples/applications/cni/calico/helm-chart.yaml
@@ -38,3 +38,4 @@ spec:
           - vsphere-kubeadm-example
           - docker-kubeadm-example
           - docker-rke2-example
+          - etcd-snapshot-restore
diff --git a/examples/applications/cni/kindnet/kindnet.yaml b/examples/applications/cni/kindnet/kindnet.yaml
@@ -2,7 +2,7 @@
 kind: Bundle
 apiVersion: fleet.cattle.io/v1alpha1
 metadata:
-  name: kindnet-cni-${CLUSTER_NAME}
+  name: kindnet-cni
 spec:
   resources:
   # List of all resources that will be deployed
diff --git a/examples/examples.go b/examples/examples.go
@@ -39,4 +39,7 @@ var (
 
 	//go:embed applications/ccm/vsphere/helm-chart.yaml
 	CAPIVsphereCPIHelmApp []byte
+
+	//go:embed applications/cni/kindnet/kindnet.yaml
+	CAPIKindnet []byte
 )
diff --git a/test/e2e/const.go b/test/e2e/const.go
@@ -114,18 +114,9 @@ var (
 	//go:embed data/cluster-templates/vsphere-rke2-topology.yaml
 	CAPIvSphereRKE2Topology []byte
 
-	//go:embed data/cni/kindnet.yaml
-	CAPIKindnet []byte
-
-	//go:embed data/cni/calico.yaml
-	CAPICalico []byte
-
 	//go:embed data/cpi-csi/aws.yaml
 	CAPIAWSCPICSI []byte
 
-	//go:embed data/cluster-api-addon-provider-fleet/host-network-patch.yaml
-	AddonProviderFleetHostNetworkPatch []byte
-
 	//go:embed data/gitea/ingress.yaml
 	GiteaIngress []byte
 
diff --git a/test/e2e/data/cluster-api-addon-provider-fleet/host-network-patch.yaml b/test/e2e/data/cluster-api-addon-provider-fleet/host-network-patch.yaml
diff --git a/test/e2e/data/cluster-templates/docker-rke2.yaml b/test/e2e/data/cluster-templates/docker-rke2.yaml
@@ -6,7 +6,7 @@ metadata:
   annotations:
     cluster-api.cattle.io/upstream-system-agent: "true"
   labels:
-    cni: kindnet
+    cni: calico
 spec:
   clusterNetwork:
     pods:
diff --git a/test/e2e/data/cni/calico.yaml b/test/e2e/data/cni/calico.yaml
diff --git a/test/e2e/specs/etcd_snapshot_restore.go b/test/e2e/specs/etcd_snapshot_restore.go
@@ -76,6 +76,10 @@ type ETCDSnapshotRestoreInput struct {
 
 	SkipCleanup      bool `env:"SKIP_RESOURCE_CLEANUP"`
 	SkipDeletionTest bool `env:"SKIP_DELETION_TEST"`
+
+	// AdditionalFleetGitRepos specifies additional FleetGitRepos to be created before the main GitRepo.
+	// This is useful for setting up resources like cluster classes/cni/cpi that some tests require.
+	AdditionalFleetGitRepos []turtlesframework.FleetCreateGitRepoInput
 }
 
 // CreateUsingGitOpsSpec implements a spec that will create a cluster via Fleet and test that it
@@ -174,6 +178,14 @@ func ETCDSnapshotRestore(ctx context.Context, inputGetter func() ETCDSnapshotRes
 			workerMachineCount = *input.WorkerMachineCount
 		}
 
+		for _, additionalRepo := range input.AdditionalFleetGitRepos {
+			if additionalRepo.TargetClusterNamespace {
+				additionalRepo.TargetNamespace = namespace.Name
+			}
+
+			turtlesframework.FleetCreateGitRepo(ctx, additionalRepo)
+		}
+
 		turtlesframework.AddLabelsToNamespace(ctx, turtlesframework.AddLabelsToNamespaceInput{ // Set import label to trigger fleet installation
 			ClusterProxy: input.BootstrapClusterProxy,
 			Name:         namespace.Name,
diff --git a/test/e2e/specs/import_gitops_mgmtv3.go b/test/e2e/specs/import_gitops_mgmtv3.go
@@ -235,6 +235,10 @@ func CreateMgmtV3UsingGitOpsSpec(ctx context.Context, inputGetter func() CreateM
 		}
 
 		for _, additionalRepo := range input.AdditionalFleetGitRepos {
+			if additionalRepo.TargetClusterNamespace {
+				additionalRepo.TargetNamespace = namespace.Name
+			}
+
 			turtlesframework.FleetCreateGitRepo(ctx, additionalRepo)
 		}
 
diff --git a/test/e2e/suites/etcd-snapshot-restore/etcd_snapshot_restore_test.go b/test/e2e/suites/etcd-snapshot-restore/etcd_snapshot_restore_test.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/rancher/turtles/test/e2e"
 	"github.com/rancher/turtles/test/e2e/specs"
+	turtlesframework "github.com/rancher/turtles/test/framework"
 )
 
 var _ = Describe("[Docker] [RKE2] Perform an ETCD backup and restore of the cluster", Label(e2e.ShortTestLabel), func() {
@@ -38,10 +39,17 @@ var _ = Describe("[Docker] [RKE2] Perform an ETCD backup and restore of the clus
 
 	specs.ETCDSnapshotRestore(ctx, func() specs.ETCDSnapshotRestoreInput {
 		return specs.ETCDSnapshotRestoreInput{
-			E2EConfig:                   e2e.LoadE2EConfig(),
-			BootstrapClusterProxy:       bootstrapClusterProxy,
-			ClusterTemplate:             e2e.CAPIDockerRKE2,
-			AdditionalTemplates:         [][]byte{e2e.CAPIKindnet},
+			E2EConfig:             e2e.LoadE2EConfig(),
+			BootstrapClusterProxy: bootstrapClusterProxy,
+			ClusterTemplate:       e2e.CAPIDockerRKE2,
+			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
+				{
+					Name:                   "etcd-snapshot-restore-calico",
+					Paths:                  []string{"examples/applications/cni/calico"},
+					ClusterProxy:           bootstrapClusterProxy,
+					TargetClusterNamespace: true,
+				},
+			},
 			ClusterName:                 "etcd-snapshot-restore",
 			ControlPlaneMachineCount:    ptr.To[int](1),
 			WorkerMachineCount:          ptr.To[int](0),
diff --git a/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go b/test/e2e/suites/import-gitops-v3/import_gitops_v3_test.go
@@ -335,10 +335,18 @@ var _ = Describe("[AWS] [EC2 Kubeadm] Create and delete CAPI cluster functionali
 		})
 
 		return specs.CreateMgmtV3UsingGitOpsSpecInput{
-			E2EConfig:                      e2e.LoadE2EConfig(),
-			BootstrapClusterProxy:          bootstrapClusterProxy,
-			ClusterTemplate:                e2e.CAPIAwsEC2Kubeadm,
-			AdditionalTemplates:            [][]byte{e2e.CAPICalico, e2e.CAPIAWSCPICSI},
+			E2EConfig:             e2e.LoadE2EConfig(),
+			BootstrapClusterProxy: bootstrapClusterProxy,
+			ClusterTemplate:       e2e.CAPIAwsEC2Kubeadm,
+			AdditionalTemplates:   [][]byte{e2e.CAPIAWSCPICSI},
+			AdditionalFleetGitRepos: []turtlesframework.FleetCreateGitRepoInput{
+				{
+					Name:                   "calico",
+					Paths:                  []string{"examples/applications/cni/calico"},
+					ClusterProxy:           bootstrapClusterProxy,
+					TargetClusterNamespace: true,
+				},
+			},
 			ClusterName:                    "cluster-ec2",
 			ControlPlaneMachineCount:       ptr.To(1),
 			WorkerMachineCount:             ptr.To(1),
@@ -432,7 +440,6 @@ var _ = Describe("[vSphere] [Kubeadm] Create and delete CAPI cluster from cluste
 			E2EConfig:                      e2e.LoadE2EConfig(),
 			BootstrapClusterProxy:          bootstrapClusterProxy,
 			ClusterTemplate:                e2e.CAPIvSphereKubeadmTopology,
-			AdditionalTemplates:            [][]byte{e2e.CAPICalico},
 			ClusterName:                    "cluster-vsphere-kubeadm",
 			ControlPlaneMachineCount:       ptr.To(1),
 			WorkerMachineCount:             ptr.To(1),
diff --git a/test/framework/fleet_helper.go b/test/framework/fleet_helper.go
@@ -46,12 +46,18 @@ type FleetCreateGitRepoInput struct {
 	// TargetNamespace is the namespace in which the Git repository will apply its content.
 	TargetNamespace string
 
+	// TargetClusterNamespace is defining git repo to use cluster namespace as a target namespace by default.
+	TargetClusterNamespace bool
+
 	// Repo is the URL of the Git repository.
 	Repo string
 
 	// Branch is the branch of the Git repository to use.
 	Branch string `envDefault:"main"`
 
+	// Revision is the specific commit of the Git repository to use.
+	Revision string `env:"GITHUB_SHA"`
+
 	// Paths are the paths within the Git repository to sync.
 	Paths []string
 
@@ -191,7 +197,13 @@ metadata:
   namespace: {{ .Namespace }}
 spec:
   repo: {{ .Repo }}
+  {{- if .Branch }}
   branch: {{ .Branch }}
+  {{ end -}}
+  {{- if .Revision }}
+  revision: {{ .Revision }}
+  {{ end -}}
+
   forceSyncGeneration: {{ .FleetGeneration }}
 
   paths:
diff --git a/test/framework/git_helper.go b/test/framework/git_helper.go
@@ -173,14 +173,17 @@ func defaultToCurrentGitRepo(input *FleetCreateGitRepoInput) {
 			}
 			input.Repo = httpURL
 
-			// Get the current branch
-			head, err := repo.Head()
-			Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("failed to get HEAD: %w", err))
+			if input.Revision == "" {
+				// Get the current branch
+				head, err := repo.Head()
+				Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("failed to get HEAD: %w", err))
 
-			input.Branch = head.Name().Short()
+				input.Branch = head.Name().Short()
+			}
 
 			// Unset secret name to use public repository
 			input.ClientSecretName = ""
+
 			return
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -39,4 +39,7 @@ var (`
`39`	`39`
`40`	`40`	`//go:embed applications/ccm/vsphere/helm-chart.yaml`
`41`	`41`	`CAPIVsphereCPIHelmApp []byte`
	`42`	`+`
	`43`	`+ //go:embed applications/cni/kindnet/kindnet.yaml`
	`44`	`+ CAPIKindnet []byte`
`42`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,10 @@ func CreateMgmtV3UsingGitOpsSpec(ctx context.Context, inputGetter func() CreateM`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`for _, additionalRepo := range input.AdditionalFleetGitRepos {`
	`238`	`+ if additionalRepo.TargetClusterNamespace {`
	`239`	`+ additionalRepo.TargetNamespace = namespace.Name`
	`240`	`+ }`
	`241`	`+`
`238`	`242`	`turtlesframework.FleetCreateGitRepo(ctx, additionalRepo)`
`239`	`243`	`}`
`240`	`244`