Move the metacontroller installation back to the Makefile (OctoConsulting#2)

Author: jhunzik

operator/Makefile

@@ -7,10 +7,17 @@ KUBECTL_DELETE := $(KUBECTL) delete --ignore-not-found
 CONTROLLER_NAMESPACE := keip
 
 .PHONY: all
-all: controller/deploy
+all: metacontroller/deploy controller/deploy
+
 
 .PHONY: clean
-clean: controller/undeploy
+clean: controller/undeploy metacontroller/undeploy
+
+metacontroller/deploy:
+	$(KUBECTL) apply -k metacontroller
+
+metacontroller/undeploy:
+	-$(KUBECTL_DELETE) -k metacontroller
 
 controller/deploy: crd/deploy
 	$(KUBECTL) apply -k controller

operator/controller/kustomization.yaml

@@ -1,9 +1,3 @@
 resources:
-  # Metacontroller
-  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.5/metacontroller-crds-v1.yaml
-  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.5/metacontroller-namespace.yaml
-  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.5/metacontroller-rbac.yaml
-  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.5/metacontroller.yaml
-
   - integrationroute-controller.yaml
   - integrationroute-privileges.yaml

operator/metacontroller/kustomization.yaml

@@ -0,0 +1,9 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.6/metacontroller-crds-v1.yaml
+  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.6/metacontroller-namespace.yaml
+  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.6/metacontroller-rbac.yaml
+  - https://github.com/metacontroller/metacontroller/releases/download/v4.11.6/metacontroller.yaml