MLE-19900: fix to update k8 objs name in helm chart (#63)

* fix to update k8 objectss name in helm chart

Author: barkhachoithani

Makefile

@@ -362,7 +362,7 @@ $(HELMIFY): $(LOCALBIN)
 	test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@latest
 
 helm: manifests kustomize helmify
-	$(KUSTOMIZE) build config/default | $(HELMIFY) -image-pull-secrets charts/marklogic-operator
+	$(KUSTOMIZE) build config/default | $(HELMIFY) -image-pull-secrets -original-name charts/marklogic-operator
 
 .PHONY: image-scan
 image-scan: docker-build

charts/marklogic-operator/templates/deployment.yaml

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-controller-manager
+  name: marklogic-operator-controller-manager
   labels:
     app.kubernetes.io/component: manager
     app.kubernetes.io/created-by: marklogic-kubernetes-operator
@@ -66,5 +66,5 @@ spec:
       imagePullSecrets: {{ .Values.imagePullSecrets | default list | toJson }}
       securityContext: {{- toYaml .Values.controllerManager.podSecurityContext | nindent
         8 }}
-      serviceAccountName: {{ include "marklogic-operator.fullname" . }}-controller-manager
+      serviceAccountName: marklogic-operator-controller-manager
       terminationGracePeriodSeconds: 10

charts/marklogic-operator/templates/leader-election-rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-leader-election-role
+  name: marklogic-operator-leader-election-role
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: marklogic-kubernetes-operator
@@ -43,7 +43,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-leader-election-rolebinding
+  name: marklogic-operator-leader-election-rolebinding
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: marklogic-kubernetes-operator
@@ -52,8 +52,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: '{{ include "marklogic-operator.fullname" . }}-leader-election-role'
+  name: marklogic-operator-leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "marklogic-operator.fullname" . }}-controller-manager'
+  name: marklogic-operator-controller-manager
   namespace: '{{ .Release.Namespace }}'

charts/marklogic-operator/templates/manager-rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-manager-role
+  name: marklogic-operator-manager-role
   labels:
   {{- include "marklogic-operator.labels" . | nindent 4 }}
 rules:
@@ -80,7 +80,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-manager-rolebinding
+  name: marklogic-operator-manager-rolebinding
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: marklogic-kubernetes-operator
@@ -89,8 +89,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "marklogic-operator.fullname" . }}-manager-role'
+  name: marklogic-operator-manager-role
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "marklogic-operator.fullname" . }}-controller-manager'
+  name: marklogic-operator-controller-manager
   namespace: '{{ .Release.Namespace }}'

charts/marklogic-operator/templates/metrics-reader-rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-metrics-reader
+  name: marklogic-operator-metrics-reader
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: marklogic-kubernetes-operator

charts/marklogic-operator/templates/metrics-service.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-controller-manager-metrics-service
+  name: marklogic-operator-controller-manager-metrics-service
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: marklogic-kubernetes-operator

charts/marklogic-operator/templates/proxy-rbac.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-proxy-role
+  name: marklogic-operator-proxy-role
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: marklogic-kubernetes-operator
@@ -24,7 +24,7 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-proxy-rolebinding
+  name: marklogic-operator-proxy-rolebinding
   labels:
     app.kubernetes.io/component: kube-rbac-proxy
     app.kubernetes.io/created-by: marklogic-kubernetes-operator
@@ -33,8 +33,8 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: '{{ include "marklogic-operator.fullname" . }}-proxy-role'
+  name: marklogic-operator-proxy-role
 subjects:
 - kind: ServiceAccount
-  name: '{{ include "marklogic-operator.fullname" . }}-controller-manager'
+  name: marklogic-operator-controller-manager
   namespace: '{{ .Release.Namespace }}'

charts/marklogic-operator/templates/serviceaccount.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "marklogic-operator.fullname" . }}-controller-manager
+  name: marklogic-operator-controller-manager
   labels:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: marklogic-kubernetes-operator