Remove Kustomize namePrefix and hardcode spark-operator- prefix in resource names

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

Author: RobuRishabh

config/default/kustomization.yaml

@@ -14,9 +14,6 @@ kind: Kustomization
 # Default namespace for standalone deployment
 namespace: spark-operator
 
-# Name prefix for all resources
-namePrefix: spark-operator-
-
 # Resources to include
 resources:
   - ../crd
@@ -46,7 +43,7 @@ replacements:
     targets:
       - select:
           kind: Deployment
-          name: controller
+          name: spark-operator-controller
         fieldPaths:
           - spec.template.spec.containers.[name=controller].image
   - source:
@@ -56,6 +53,6 @@ replacements:
     targets:
       - select:
           kind: Deployment
-          name: webhook
+          name: spark-operator-webhook
         fieldPaths:
           - spec.template.spec.containers.[name=webhook].image

config/manager/manager.yaml

@@ -16,7 +16,7 @@ metadata:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: controller
+  name: spark-operator-controller
   namespace: system
   labels:
     app.kubernetes.io/name: spark-operator
@@ -44,7 +44,7 @@ spec:
         prometheus.io/port: "8080"
         prometheus.io/path: /metrics
     spec:
-      serviceAccountName: controller
+      serviceAccountName: spark-operator-controller
       automountServiceAccountToken: true
       securityContext:
         runAsNonRoot: true

config/manager/serviceaccount.yaml

@@ -4,7 +4,7 @@ apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: true
 metadata:
-  name: controller
+  name: spark-operator-controller
   namespace: system
   labels:
     app.kubernetes.io/name: spark-operator

config/rbac/clusterrolebinding.yaml

@@ -9,7 +9,7 @@ metadata:
     app.kubernetes.io/component: controller
 subjects:
   - kind: ServiceAccount
-    name: controller
+    name: spark-operator-controller
     namespace: system
 roleRef:
   apiGroup: rbac.authorization.k8s.io

config/rbac/leader-election-role.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: controller
+  name: spark-operator-controller
   namespace: system
   labels:
     app.kubernetes.io/name: spark-operator

config/rbac/rolebinding.yaml

@@ -2,17 +2,17 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: controller  # References leader-election-role.yaml
+  name: spark-operator-controller  # References leader-election-role.yaml
   namespace: system
   labels:
     app.kubernetes.io/name: spark-operator
     app.kubernetes.io/instance: spark-operator
     app.kubernetes.io/component: controller
 subjects:
   - kind: ServiceAccount
-    name: controller
+    name: spark-operator-controller
     namespace: system
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: controller
+  name: spark-operator-controller

config/rbac/scheduledsparkapplication_editor_role.yaml

@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: scheduledsparkapplication-editor-role
+  name: spark-operator-scheduledsparkapplication-editor-role
   labels:
     app.kubernetes.io/name: spark-operator
     app.kubernetes.io/managed-by: kustomize

config/rbac/scheduledsparkapplication_viewer_role.yaml

@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: scheduledsparkapplication-viewer-role
+  name: spark-operator-scheduledsparkapplication-viewer-role
   labels:
     app.kubernetes.io/name: spark-operator
     app.kubernetes.io/managed-by: kustomize

config/rbac/spark-application-rbac.yaml

@@ -13,15 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# After Kustomize namePrefix (spark-operator-):
-#   - ServiceAccount: spark-operator-spark
-#   - Role: spark-operator-role
-#   - RoleBinding: spark-operator-rolebinding
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: true
 metadata:
-  name: spark
+  name: spark-operator-spark
   namespace: system
   labels:
     app.kubernetes.io/name: spark-operator
@@ -31,7 +27,7 @@ metadata:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  name: role
+  name: spark-operator-role
   namespace: system
 rules:
 - apiGroups:
@@ -56,17 +52,17 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: rolebinding
+  name: spark-operator-rolebinding
   namespace: system
   labels:
     app.kubernetes.io/name: spark-operator
     app.kubernetes.io/instance: spark-operator
     app.kubernetes.io/component: spark
 subjects:
   - kind: ServiceAccount
-    name: spark
+    name: spark-operator-spark
     namespace: system
 roleRef:
   kind: Role
-  name: role
+  name: spark-operator-role
   apiGroup: rbac.authorization.k8s.io

config/rbac/sparkapplication_editor_role.yaml

@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: sparkapplication-editor-role
+  name: spark-operator-sparkapplication-editor-role
   labels:
     app.kubernetes.io/name: spark-operator
     app.kubernetes.io/managed-by: kustomize