fix: Move kustomize (#145)

* Move kustomize manifests

* Remove sample files

* Add note when running run-helmify

* Update go tests with new kustomize path

.gitignore

@@ -1,7 +1,5 @@
 bin/
 tmp/
 
-config
-
 # Downloaded chart dependencies
 **/charts/*.tgz

Makefile

@@ -226,13 +226,14 @@ generate: controller-gen ## Generate stuff
 .PHONY: manifests
 manifests: generate controller-gen
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) webhook paths="./..." \
-	  rbac:roleName=manager-role output:rbac:artifacts:config=tests/kustomize/rbac \
-	  output:webhook:artifacts:config=tests/kustomize/webhook \
-	  output:crd:artifacts:config=tests/kustomize/crd/bases \
+	  rbac:roleName=manager-role output:rbac:artifacts:config=config/rbac \
+	  output:webhook:artifacts:config=config/webhook \
+	  output:crd:artifacts:config=config/crd/bases \
 	  output:stdout
 
 .PHONY: run-helmify
 run-helmify: manifests helmify kustomize ## Generate the CRD with kustomize and helmify from the manifests
 	@# could we do more here?
-	$(KUSTOMIZE) build tests/kustomize/default | $(HELMIFY) tmp/k8s-agents-operator
+	$(KUSTOMIZE) build config/default | $(HELMIFY) tmp/k8s-agents-operator
 	cp ./tmp/k8s-agents-operator/templates/instrumentation-crd.yaml ./charts/k8s-agents-operator/templates/instrumentation-crd.yaml
+	printf "\nIMPORTANT: The generated chart needs to be transformed!\n- deployment.yaml is split into deployment.yaml and service-account.yaml\n- mutating-webhook-configuration.yaml and validating-webhook-configuration.yaml are merged into service-account.yaml\n- Documents generated are missing several config options (i.e. labels)\n"

tests/kustomize/README.md → config/README.md

@@ -1,6 +1,6 @@
 ## Structure
 
-The `kustomize` folder contains the Kustomize resources that are used to assemble the operator's deployment units for testing
+The `config` folder contains the Kustomize resources that are used to assemble the operator's deployment units for testing
 
 ```
 .

src/api/v1alpha2/webhook_suite_test.go

@@ -63,10 +63,10 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "tests", "kustomize", "crd", "bases")},
+		CRDDirectoryPaths:     []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
 		ErrorIfCRDPathMissing: false,
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "..", "tests", "kustomize", "webhook")},
+			Paths: []string{filepath.Join("..", "..", "..", "config", "webhook")},
 		},
 	}
 

src/instrumentation/instrumentation_suite_test.go

@@ -17,7 +17,7 @@ var k8sClient client.Client
 
 func TestMain(m *testing.M) {
 	testEnv := &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "tests", "kustomize", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")},
 	}
 
 	cfg, err := testEnv.Start()

src/instrumentation/upgrade/upgrade_suite_test.go

@@ -38,7 +38,7 @@ var cfg *rest.Config
 func TestMain(m *testing.M) {
 	testEnv = &envtest.Environment{
 		CRDDirectoryPaths: []string{
-			filepath.Join("..", "..", "..", "tests", "kustomize", "crd", "bases"),
+			filepath.Join("..", "..", "..", "config", "crd", "bases"),
 		},
 	}
 

src/internal/webhookhandler/webhookhandler_suite_test.go

@@ -83,7 +83,7 @@ func TestMain(m *testing.M) {
 	logger := zap.New(zap.UseDevMode(true), zap.WriteTo(&fakeWriter{}))
 
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "tests", "kustomize", "crd", "bases")},
+		CRDDirectoryPaths: []string{filepath.Join("..", "..", "..", "config", "crd", "bases")},
 
 		ErrorIfCRDPathMissing: false,
 
@@ -96,7 +96,7 @@ func TestMain(m *testing.M) {
 			fmt.Sprintf("1.29.0-%s-%s", stdruntime.GOOS, stdruntime.GOARCH)),
 
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
-			Paths: []string{filepath.Join("..", "..", "..", "tests", "kustomize", "webhook")},
+			Paths: []string{filepath.Join("..", "..", "..", "config", "webhook")},
 		},
 	}
 	cfg, err = testEnv.Start()