feat(helm): Allow multiple versions of the operator to be installed

Signed-off-by: Jonathan Stacks <[email protected]>

Author: jonstacks

helm/ngrok-operator/templates/controller-rbac.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: ngrok-operator-leader-election-role
+  name: {{ include "ngrok-operator.fullname" . }}-leader-election-role
   namespace: {{ .Release.Namespace }}
 rules:
 - apiGroups:
@@ -40,7 +40,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: ngrok-operator-proxy-role
+  name: {{ include "ngrok-operator.fullname" . }}-proxy-role
 rules:
 - apiGroups:
   - authentication.k8s.io
@@ -58,12 +58,12 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: ngrok-operator-leader-election-rolebinding
+  name: {{ include "ngrok-operator.fullname" . }}-leader-election-rolebinding
   namespace: {{ .Release.Namespace }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: ngrok-operator-leader-election-role
+  name: {{ include "ngrok-operator.fullname" . }}-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: {{ template "ngrok-operator.serviceAccountName" . }}
@@ -72,11 +72,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: ngrok-operator-manager-rolebinding
+  name: {{ include "ngrok-operator.fullname" . }}-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: ngrok-operator-manager-role
+  name: {{ include "ngrok-operator.fullname" . }}-manager-role
 subjects:
 - kind: ServiceAccount
   name: {{ template "ngrok-operator.serviceAccountName" . }}
@@ -85,11 +85,11 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: ngrok-operator-proxy-rolebinding
+  name: {{ include "ngrok-operator.fullname" . }}-proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: ngrok-operator-proxy-role
+  name: {{ include "ngrok-operator.fullname" . }}-proxy-role
 subjects:
 - kind: ServiceAccount
   name: {{ template "ngrok-operator.serviceAccountName" . }}

helm/ngrok-operator/templates/rbac/role.yaml

@@ -63,7 +63,7 @@ deploy_with_bindings: _deploy-check-env-vars docker-build manifests _helm_setup
 		$(HELM_DESCRIPTION_FLAG)
 
 .PHONY: deploy_for_e2e
-deploy_for_e2e: _deploy-check-env-vars docker-build manifests _helm_setup kind-load-image ## Deploy controller to the K8s cluster specified in ~/.kube.config.
+deploy_for_e2e: _deploy-check-env-vars docker-build manifests _helm_setup kind-load-image ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	helm upgrade $(HELM_RELEASE_NAME) $(HELM_CHART_DIR) --install \
 		--namespace $(KUBE_NAMESPACE) \
 		--create-namespace \
@@ -85,7 +85,52 @@ deploy_for_e2e: _deploy-check-env-vars docker-build manifests _helm_setup kind-l
 		--set bindings.serviceLabels.label1="val1"
 
 .PHONY: deploy_multi_namespace
+## 1. We want to install the CRDs only once at the beginning
+## 2. We want to make a namespace-a and namespace-b
+## 3. We want to install the helm chart twice, watching only the namespace belonging to each one
 deploy_multi_namespace: _deploy-check-env-vars docker-build manifests _helm_setup kind-load-image ## Deploy multiple copies of the controller to the K8s cluster specified in ~/.kube/config.
+	helm upgrade ngrok-operator-crds $(CRD_CHART_DIR) --install \
+		--kube-context=kind-$(KIND_CLUSTER_NAME) \
+	    --namespace kube-system \
+		--create-namespace
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) create namespace namespace-a || true
+	kubectl --context=kind-$(KIND_CLUSTER_NAME) create namespace namespace-b || true
+
+	helm upgrade ngrok-operator-a $(HELM_CHART_DIR) --install \
+		--kube-context=kind-$(KIND_CLUSTER_NAME) \
+		--namespace namespace-a \
+		--set installCRDs=false \
+		--set image.repository=$(IMG) \
+		--set image.tag="latest" \
+		--set ingress.controllerName="k8s.ngrok.com/ingress-controller-a" \
+		--set ingress.ingressClass.name="ngrok-a" \
+		--set ingress.watchNamespace="namespace-a" \
+		--set watchNamespace=namespace-a \
+		--set credentials.apiKey=$(NGROK_API_KEY) \
+		--set credentials.authtoken=$(NGROK_AUTHTOKEN) \
+		--set log.format=console \
+		--set-string log.level="8" \
+		--set log.stacktraceLevel=panic \
+		--set metaData.env=local,metaData.from=makefile \
+		$(HELM_DESCRIPTION_FLAG)
+
+	helm upgrade ngrok-operator-b $(HELM_CHART_DIR) --install \
+		--kube-context=kind-$(KIND_CLUSTER_NAME) \
+		--namespace namespace-b \
+		--set installCRDs=false \
+		--set ingress.controllerName="k8s.ngrok.com/ingress-controller-b" \
+		--set ingress.ingressClass.name="ngrok-b" \
+		--set ingress.watchNamespace="namespace-b" \
+		--set image.repository=$(IMG) \
+		--set image.tag="latest" \
+		--set watchNamespace=namespace-b \
+		--set credentials.apiKey=$(NGROK_API_KEY) \
+		--set credentials.authtoken=$(NGROK_AUTHTOKEN) \
+		--set log.format=console \
+		--set-string log.level="8" \
+		--set log.stacktraceLevel=panic \
+		--set metaData.env=local,metaData.from=makefile \
+		$(HELM_DESCRIPTION_FLAG)
 
 .PHONY: kind-load-image
 kind-load-image: ## Load the locally built image into the kind cluster.

helm/ngrok-operator/tests/__snapshot__/controller-deployment_test.yaml.snap

@@ -10,7 +10,7 @@ generate-mocks:
 
 .PHONY: manifests
 manifests: ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
-	controller-gen rbac:roleName=ngrok-operator-manager-role crd webhook paths="$(CONTROLLER_GEN_PATHS)" \
+	controller-gen rbac:roleName='"{{ include \"ngrok-operator.fullname\" . }}-manager-role"' crd webhook paths="$(CONTROLLER_GEN_PATHS)" \
 		output:crd:artifacts:config=$(CRD_TEMPLATES_DIR) \
 		output:rbac:artifacts:config=$(HELM_TEMPLATES_DIR)/rbac