makefile fixes

Signed-off-by: jamesmilligan <[email protected]>

Author: james-milligan

Makefile

@@ -114,7 +114,7 @@ release-manifests: manifests kustomize
     fi
 	@if [ ${KUSTOMIZE_OVERLAY} = HELM ]; then\
 		echo building helm overlay;\
-        $(KUSTOMIZE) build config/overlays/helm > config/rendered/release.yaml;\
+        $(KUSTOMIZE) build config/overlays/helm > chart/templates/rendered.yaml;\
     fi
 
 .PHONY: deploy
@@ -178,10 +178,9 @@ $(HELM): $(LOCALBIN)
 
 .PHONY: set-helm-overlay
 set-helm-overlay:
-	KUSTOMIZE_OVERLAY=HELM
+	${eval KUSTOMIZE_OVERLAY = HELM}
 
 helm-package: set-helm-overlay generate release-manifests helm
-	cp config/rendered/release.yaml chart/templates/rendered.yaml
 	$(HELM) package --version $(CHART_VERSION) chart 
 	mkdir -p charts && mv ofo-*.tgz charts
 	$(HELM) repo index --url https://open-feature.github.io/open-feature-operator/charts charts

chart/templates/rendered.yaml

@@ -1,10 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  labels:
-    control-plane: controller-manager
-  name: open-feature-operator-system
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
@@ -262,13 +255,13 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: open-feature-operator-controller-manager
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: open-feature-operator-leader-election-role
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 rules:
 - apiGroups:
   - ""
@@ -419,15 +412,15 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: open-feature-operator-leader-election-rolebinding
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
   name: open-feature-operator-leader-election-role
 subjects:
 - kind: ServiceAccount
   name: open-feature-operator-controller-manager
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -441,7 +434,7 @@ subjects:
 - apiGroup: ""
   kind: ServiceAccount
   name: open-feature-operator-controller-manager
-  namespace: system
+  namespace: '{{ include "chart.namespace" . }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -454,7 +447,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: open-feature-operator-controller-manager
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -467,7 +460,7 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: open-feature-operator-controller-manager
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 ---
 apiVersion: v1
 data:
@@ -486,15 +479,15 @@ data:
 kind: ConfigMap
 metadata:
   name: open-feature-operator-manager-config
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 ---
 apiVersion: v1
 kind: Service
 metadata:
   labels:
     control-plane: controller-manager
   name: open-feature-operator-controller-manager-metrics-service
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 spec:
   ports:
   - name: https
@@ -510,7 +503,7 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: open-feature-operator-system/webhook-cert
   name: open-feature-operator-webhook-service
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 spec:
   ports:
   - port: 443
@@ -525,7 +518,7 @@ metadata:
   labels:
     control-plane: controller-manager
   name: open-feature-operator-controller-manager
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 spec:
   replicas: 1
   selector:
@@ -612,11 +605,11 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: open-feature-operator-serving-cert
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 spec:
   dnsNames:
-  - open-feature-operator-webhook-service.open-feature-operator-system.svc
-  - open-feature-operator-webhook-service.open-feature-operator-system.svc.cluster.local
+  - open-feature-operator-webhook-service.{{ include "chart.namespace" . }}.svc
+  - open-feature-operator-webhook-service.{{ include "chart.namespace" . }}.svc.cluster.local
   issuerRef:
     kind: Issuer
     name: open-feature-operator-selfsigned-issuer
@@ -626,23 +619,23 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: open-feature-operator-selfsigned-issuer
-  namespace: open-feature-operator-system
+  namespace: '{{ include "chart.namespace" . }}'
 spec:
   selfSigned: {}
 ---
 apiVersion: admissionregistration.k8s.io/v1
 kind: MutatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: open-feature-operator-system/open-feature-operator-serving-cert
+    cert-manager.io/inject-ca-from: '{{ include "chart.namespace" . }}/open-feature-operator-serving-cert'
   name: open-feature-operator-mutating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: open-feature-operator-webhook-service
-      namespace: open-feature-operator-system
+      namespace: '{{ include "chart.namespace" . }}'
       path: /mutate-v1-pod
   failurePolicy: Ignore
   name: mutate.openfeature.dev
@@ -662,15 +655,15 @@ apiVersion: admissionregistration.k8s.io/v1
 kind: ValidatingWebhookConfiguration
 metadata:
   annotations:
-    cert-manager.io/inject-ca-from: open-feature-operator-system/open-feature-operator-serving-cert
+    cert-manager.io/inject-ca-from: '{{ include "chart.namespace" . }}/open-feature-operator-serving-cert'
   name: open-feature-operator-validating-webhook-configuration
 webhooks:
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: open-feature-operator-webhook-service
-      namespace: open-feature-operator-system
+      namespace: '{{ include "chart.namespace" . }}'
       path: /validate-v1alpha1-featureflagconfiguration
   failurePolicy: Fail
   name: validate.featureflagconfiguration.openfeature.dev