Takeover a bootstrapped cluster

Signed-off-by: Stefan Prodan <[email protected]>

Makefile

@@ -123,6 +123,10 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~
 uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
 	$(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f -
 
+.PHONY: load-image
+load-image: ## Load image into a Kind cluster.
+	kind load docker-image ${IMG}
+
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	mkdir -p config/dev && cp config/default/* config/dev

cmd/main.go

@@ -30,7 +30,7 @@ import (
 	// +kubebuilder:scaffold:imports
 )
 
-const controllerName = "fluxcd-controller"
+const controllerName = "flux-controller"
 
 var (
 	scheme   = runtime.NewScheme()

internal/builder/build.go

@@ -66,6 +66,10 @@ func generate(base string, options Options) error {
 		return fmt.Errorf("generate namespace failed: %w", err)
 	}
 
+	if err := execTemplate(options, annotationsTmpl, path.Join(base, "annotations.yaml")); err != nil {
+		return fmt.Errorf("generate annotations failed: %w", err)
+	}
+
 	if err := execTemplate(options, labelsTmpl, path.Join(base, "labels.yaml")); err != nil {
 		return fmt.Errorf("generate labels failed: %w", err)
 	}

internal/builder/build_test.go

@@ -15,7 +15,6 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-//nolint:goconst
 func TestBuild_Defaults(t *testing.T) {
 	g := NewWithT(t)
 	const version = "v2.3.0"
@@ -36,7 +35,7 @@ func TestBuild_Defaults(t *testing.T) {
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(result.Objects).NotTo(BeEmpty())
 
-	if os.Getenv("GEN_GOLDEN") == "true" {
+	if shouldGenGolden() {
 		err = cp.Copy(filepath.Join(dstDir, "kustomization.yaml"), goldenFile)
 		g.Expect(err).NotTo(HaveOccurred())
 	}
@@ -50,7 +49,6 @@ func TestBuild_Defaults(t *testing.T) {
 	g.Expect(string(genK)).To(Equal(string(goldenK)))
 }
 
-//nolint:goconst
 func TestBuild_Patches(t *testing.T) {
 	g := NewWithT(t)
 	const version = "v2.3.0"
@@ -89,7 +87,7 @@ func TestBuild_Patches(t *testing.T) {
 	g.Expect(result.Objects).NotTo(BeEmpty())
 	g.Expect(result.Revision).To(HavePrefix(version + "@sha256:"))
 
-	if os.Getenv("GEN_GOLDEN") == "true" {
+	if shouldGenGolden() {
 		err = cp.Copy(filepath.Join(dstDir, "kustomization.yaml"), goldenFile)
 		g.Expect(err).NotTo(HaveOccurred())
 	}
@@ -115,7 +113,6 @@ func TestBuild_Patches(t *testing.T) {
 	g.Expect(found).To(BeTrue())
 }
 
-//nolint:goconst
 func TestBuild_Profiles(t *testing.T) {
 	g := NewWithT(t)
 	const version = "v2.3.0"
@@ -139,7 +136,7 @@ func TestBuild_Profiles(t *testing.T) {
 	g.Expect(result.Objects).NotTo(BeEmpty())
 	g.Expect(result.Revision).To(HavePrefix(version + "@sha256:"))
 
-	if os.Getenv("GEN_GOLDEN") == "true" {
+	if shouldGenGolden() {
 		err = cp.Copy(filepath.Join(dstDir, "kustomization.yaml"), goldenFile)
 		g.Expect(err).NotTo(HaveOccurred())
 	}
@@ -154,17 +151,17 @@ func TestBuild_Profiles(t *testing.T) {
 
 	found := false
 	for _, obj := range result.Objects {
+		labels := obj.GetLabels()
 		if obj.GetKind() == "Namespace" {
 			found = true
-			labels := obj.GetLabels()
 			g.Expect(labels).NotTo(HaveKey("pod-security.kubernetes.io/warn"))
 			g.Expect(labels).NotTo(HaveKey("pod-security.kubernetes.io/warn-version"))
 		}
+		g.Expect(obj.GetLabels()).To(HaveKeyWithValue("app.kubernetes.io/managed-by", "flux-operator"))
 	}
 	g.Expect(found).To(BeTrue())
 }
 
-//nolint:goconst
 func TestBuild_ArtifactStorage(t *testing.T) {
 	g := NewWithT(t)
 	const version = "v2.3.0"
@@ -191,7 +188,7 @@ func TestBuild_ArtifactStorage(t *testing.T) {
 	g.Expect(result.Objects).NotTo(BeEmpty())
 	g.Expect(result.Revision).To(HavePrefix(version + "@sha256:"))
 
-	if os.Getenv("GEN_GOLDEN") == "true" {
+	if shouldGenGolden() {
 		err = cp.Copy(filepath.Join(dstDir, "kustomization.yaml"), goldenFile)
 		g.Expect(err).NotTo(HaveOccurred())
 	}
@@ -210,11 +207,11 @@ func TestBuild_ArtifactStorage(t *testing.T) {
 			found = true
 			g.Expect(obj.GetName()).To(Equal("source-controller"))
 		}
+		g.Expect(obj.GetAnnotations()).To(HaveKeyWithValue("kustomize.toolkit.fluxcd.io/ssa", "Ignore"))
 	}
 	g.Expect(found).To(BeTrue())
 }
 
-//nolint:goconst
 func TestBuild_InvalidPatches(t *testing.T) {
 	g := NewWithT(t)
 	const version = "v2.3.0"
@@ -259,3 +256,7 @@ func testTempDir(t *testing.T) (string, error) {
 
 	return tmpDir, err
 }
+
+func shouldGenGolden() bool {
+	return os.Getenv("GEN_GOLDEN") == "true"
+}

internal/builder/templates.go

@@ -23,6 +23,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: {{$namespace}}
 transformers:
+  - annotations.yaml
   - labels.yaml
 resources:
   - namespace.yaml
@@ -165,6 +166,18 @@ fieldSpecs:
     create: true
 `
 
+var annotationsTmpl = `---
+apiVersion: builtin
+kind: AnnotationsTransformer
+metadata:
+  name: annotations
+annotations:
+  kustomize.toolkit.fluxcd.io/ssa: Ignore
+fieldSpecs:
+  - path: metadata/annotations
+    create: true
+`
+
 var namespaceTmpl = `---
 apiVersion: v1
 kind: Namespace

internal/builder/testdata/v2.3.0-golden/default.kustomization.yaml

@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: flux-system
 transformers:
+  - annotations.yaml
   - labels.yaml
 resources:
   - namespace.yaml

internal/builder/testdata/v2.3.0-golden/patches.kustomization.yaml

@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: flux-system
 transformers:
+  - annotations.yaml
   - labels.yaml
 resources:
   - namespace.yaml

internal/builder/testdata/v2.3.0-golden/profiles.kustomization.yaml

@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: flux-system
 transformers:
+  - annotations.yaml
   - labels.yaml
 resources:
   - namespace.yaml

internal/builder/testdata/v2.3.0-golden/storage.kustomization.yaml

@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: flux-system
 transformers:
+  - annotations.yaml
   - labels.yaml
 resources:
   - namespace.yaml