Merge pull request #1868 from valaparthvi/externally-managed-annotation

Add check for externalFleet annotation

Author: valaparthvi

test/e2e/specs/import_gitops.go

@@ -150,6 +150,13 @@ func CreateUsingGitOpsSpec(ctx context.Context, inputGetter func() CreateUsingGi
 			return found
 		}, input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-rancher")...).Should(BeTrue())
 
+		By("Rancher cluster should have the 'provisioning.cattle.io/externally-managed' annotation")
+		Eventually(func() bool {
+			Eventually(komega.Get(rancherCluster), input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-rancher")...).Should(Succeed())
+			_, found := rancherCluster.Annotations[turtlesannotations.ExternalFleetAnnotation]
+			return found
+		}, input.E2EConfig.GetIntervals(input.BootstrapClusterProxy.GetName(), "wait-rancher")...).Should(BeTrue())
+
 		By("Waiting for the CAPI cluster to be connectable using Rancher kubeconfig")
 		turtlesframework.RancherGetClusterKubeconfig(ctx, turtlesframework.RancherGetClusterKubeconfigInput{
 			ClusterProxy:     input.BootstrapClusterProxy,

util/annotations/helpers.go

@@ -29,6 +29,8 @@ const (
 	// This is required so that logs don't get flooded with errors when project handler and cluster handler
 	// attempt to create `ClusterOwner` and `ProjectOwner` roles.
 	NoCreatorRBACAnnotation = "field.cattle.io/no-creator-rbac"
+	// ExternalFleetAnnotation represents cluster provisioned and managed by external fleet.
+	ExternalFleetAnnotation = "provisioning.cattle.io/externally-managed"
 	// EtcdAutomaticSnapshot represents automatically generated etcd snapshot.
 	EtcdAutomaticSnapshot = "etcd.turtles.cattle.io/automatic-snapshot"
 	// UpstreamSystemAgentAnnotation is a cluster annotation, allowing to pull the agent binary from the github repo instead of rancher url.