Add helm generate into makefile (#2351)

* Add helm generate into makefile

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

* helm template and generated manifest

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

* removed hardcode namespace

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

* make .Values.namespace for each helm charts

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

* transfer meta namesapce to all RB subjects service account namespace

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

* substitute CERTIFICATE_NAMESPACE in webhook annotation

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

* add helm chart for service account

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

* make SA namespace as variable

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

* add env vars into deployment

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

* remove webhook configuration

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

* create standard helm folder for test

Signed-off-by: Allen Li <[email protected]>

* move clusterrole to namespace-scoped

Signed-off-by: Allen Li <[email protected]>

* update filename

Signed-off-by: Allen Li <[email protected]>

* update helm file

Signed-off-by: Allen Li <[email protected]>

* update watch_namespace

Signed-off-by: Allen Li <[email protected]>

* typo

Signed-off-by: Allen Li <[email protected]>

* update deployment

Signed-off-by: Allen Li <[email protected]>

* typo in entitlement key

Signed-off-by: Allen Li <[email protected]>

* change watch_namespace for now

Signed-off-by: Allen Li <[email protected]>

* add edb image configmap

---------

Signed-off-by: YuChen <[email protected]>
Signed-off-by: Allen Li <[email protected]>
Co-authored-by: Allen Li <[email protected]>
Co-authored-by: Allen Li <[email protected]>

Author: YCShen1010

Makefile

@@ -20,8 +20,8 @@ OPERATOR_SDK ?= $(shell which operator-sdk)
 CONTROLLER_GEN ?= $(shell which controller-gen)
 KUSTOMIZE ?= $(shell which kustomize)
 YQ_VERSION=v4.27.3
-KUSTOMIZE_VERSION=v3.8.7
-OPERATOR_SDK_VERSION=v1.31.0
+KUSTOMIZE_VERSION=v5.0.0
+OPERATOR_SDK_VERSION=v1.38.0
 CONTROLLER_TOOLS_VERSION ?= v0.14.0
 
 CSV_PATH=bundle/manifests/ibm-common-service-operator.clusterserviceversion.yaml
@@ -79,6 +79,8 @@ REGISTRY ?= "docker-na-public.artifactory.swg-devops.com/hyc-cloud-private-scrat
 OPERATOR_IMAGE_NAME ?= common-service-operator
 # Current Operator bundle image name
 BUNDLE_IMAGE_NAME ?= common-service-operator-bundle
+# Current Operator image with registry
+IMG ?= icr.io/cpopen/common-service-operator:latest
 
 CHANNELS := v4.11
 DEFAULT_CHANNEL := v4.11
@@ -102,6 +104,11 @@ include hack/keycloak-themes/Makefile
 
 ##@ Development
 
+## Location to install dependencies to
+LOCALBIN ?= $(shell pwd)/bin
+$(LOCALBIN):
+	mkdir -p $(LOCALBIN)
+
 clis: yq kustomize operator-sdk
 
 yq: ## Install yq, a yaml processor
@@ -239,6 +246,31 @@ generate-all: yq kustomize operator-sdk generate manifests cloudpak-theme-versio
 	$(OPERATOR_SDK) generate kustomize manifests -q
 	- make bundle-manifests CHANNELS=v4.11 DEFAULT_CHANNEL=v4.11
 
+##@ Helm Chart Generation
+
+.PHONY: deploy-dryrun
+deploy-dryrun: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
+	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	$(KUSTOMIZE) build config/default --output config/ibm-common-service-operator.yaml
+
+.PHONY: helm
+helm: deploy-dryrun kustohelmize
+	$(KUSTOHELMIZE) create --from=config/ibm-common-service-operator.yaml helm/ibm-common-service-operator
+	helm lint helm/ibm-common-service-operator
+
+KUBERNETES-SPLIT-YAML ?= $(LOCALBIN)/kubernetes-split-yaml
+KUSTOHELMIZE ?= $(LOCALBIN)/kustohelmize
+
+.PHONY: kubernetes-split-yaml
+kubernetes-split-yaml: $(KUBERNETES-SPLIT-YAML) ## Download kubernetes-split-yaml locally if necessary.
+$(KUBERNETES-SPLIT-YAML): $(LOCALBIN)
+	GOBIN=$(LOCALBIN) go install github.com/mogensen/[email protected]
+
+.PHONY: kustohelmize
+kustohelmize: $(KUSTOHELMIZE) ## Download kustohelmize locally if necessary.
+$(KUSTOHELMIZE): $(LOCALBIN) kubernetes-split-yaml
+	GOBIN=$(LOCALBIN) go install github.com/yeahdongcn/[email protected]
+
 ##@ Test
 
 test: ## Run unit test on prow

config/certmanager/certificate.yaml

@@ -5,15 +5,15 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: selfsigned-issuer
-  namespace: ibm-common-services
+  # namespace: ibm-common-services
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: serving-cert  # this name should match the one appeared in kustomizeconfig.yaml
-  namespace: ibm-common-services
+  # namespace: ibm-common-services
 spec:
   # $(SERVICE_NAME) and $(SERVICE_NAMESPACE) will be substituted by kustomize
   dnsNames:

config/default/kustomization.yaml

@@ -1,5 +1,17 @@
 # Adds namespace to all resources.
-namespace: system
+transformers:
+- |-
+  apiVersion: builtin
+  kind: NamespaceTransformer
+  metadata:
+    name: notImportantHere
+    namespace: custom-namespace
+  setRoleBindingSubjects: allServiceAccounts
+  fieldSpecs:
+    - path: metadata/namespace
+      create: true
+
+namespace: custom-namespace
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
@@ -23,6 +35,7 @@ bases:
 - ../certmanager
 # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. 
 #- ../prometheus
+- ../service_account
 
 patchesStrategicMerge:
   # Protect the /metrics endpoint by putting it behind auth.
@@ -32,7 +45,7 @@ patchesStrategicMerge:
 
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in 
 # crd/kustomization.yaml
-- manager_webhook_patch.yaml
+# - manager_webhook_patch.yaml
 
 # [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'.
 # Uncomment 'CERTMANAGER' sections in crd/kustomization.yaml to enable the CA injection in the admission webhooks.

config/default/manager_auth_proxy_patch.yaml

@@ -4,7 +4,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ibm-common-service-operator
-  namespace: ibm-common-services
+  # namespace: ibm-common-services
 spec:
   template:
     spec:

config/default/manager_webhook_patch.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ibm-common-service-operator
-  namespace: ibm-common-services
+  # namespace: ibm-common-services
 spec:
   template:
     spec: