Fix up resources

- Remove unnecessary labels on resources
- Rename namePrefix and namespace to match the repo rename
- Ensure labels and selectors are unique to the provider
  (for when they run in the same namespace)

Author: carbonin

Diff for: bootstrap/config/default/kustomization.yaml

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: capi-agent-bootstrap-system
+namespace: capoa-bootstrap-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: capi-agent-bootstrap
+namePrefix: capoa-bootstrap-
 
 # Labels to add to all resources and selectors.
 #labels:

Diff for: bootstrap/config/manager/manager.yaml

@@ -1,70 +1,27 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller-manager
   namespace: system
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: deployment
-    app.kubernetes.io/instance: controller-manager
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: capoa-bootstrap-controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: capoa-bootstrap-controller-manager
     spec:
-      # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution.
-      # It is considered best practice to support multiple architectures. You can
-      # build your manager image using the makefile target docker-buildx.
-      # affinity:
-      #   nodeAffinity:
-      #     requiredDuringSchedulingIgnoredDuringExecution:
-      #       nodeSelectorTerms:
-      #         - matchExpressions:
-      #           - key: kubernetes.io/arch
-      #             operator: In
-      #             values:
-      #               - amd64
-      #               - arm64
-      #               - ppc64le
-      #               - s390x
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
       securityContext:
         runAsNonRoot: true
-        # TODO(user): For common cases that do not require escalating privileges
-        # it is recommended to ensure that all your Pods/Containers are restrictive.
-        # More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
-        # Please uncomment the following code if your project does NOT have to work on old Kubernetes
-        # versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
-        # seccompProfile:
-        #   type: RuntimeDefault
       containers:
       - command:
         - /manager
@@ -95,8 +52,6 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
-        # TODO(user): Configure the resources accordingly based on the project requirements.
-        # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
         resources:
           limits:
             cpu: 500m

Diff for: bootstrap/config/prometheus/monitor.yaml

@@ -2,14 +2,6 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: servicemonitor
-    app.kubernetes.io/instance: controller-manager-metrics-monitor
-    app.kubernetes.io/component: metrics
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-monitor
   namespace: system
 spec:
@@ -22,4 +14,4 @@ spec:
         insecureSkipVerify: true
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: capoa-bootstrap-controller-manager

Diff for: bootstrap/config/rbac/auth_proxy_client_clusterrole.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: metrics-reader
-    app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: metrics-reader
 rules:
 - nonResourceURLs:

Diff for: bootstrap/config/rbac/auth_proxy_role.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: proxy-role
-    app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: proxy-role
 rules:
 - apiGroups:

Diff for: bootstrap/config/rbac/auth_proxy_role_binding.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrolebinding
-    app.kubernetes.io/instance: proxy-rolebinding
-    app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: proxy-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

Diff for: bootstrap/config/rbac/auth_proxy_service.yaml

@@ -1,14 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: service
-    app.kubernetes.io/instance: controller-manager-metrics-service
-    app.kubernetes.io/component: kube-rbac-proxy
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: controller-manager-metrics-service
   namespace: system
 spec:
@@ -18,4 +10,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-    control-plane: controller-manager
+    control-plane: capoa-bootstrap-controller-manager

Diff for: bootstrap/config/rbac/leader_election_role.yaml

@@ -2,13 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
-  labels:
-    app.kubernetes.io/name: role
-    app.kubernetes.io/instance: leader-election-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: leader-election-role
 rules:
 - apiGroups:

Diff for: bootstrap/config/rbac/leader_election_role_binding.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  labels:
-    app.kubernetes.io/name: rolebinding
-    app.kubernetes.io/instance: leader-election-rolebinding
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: leader-election-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

Diff for: bootstrap/config/rbac/openshiftassistedconfig_editor_role.yaml

@@ -2,13 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: openshiftassistedconfig-editor-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: openshiftassistedconfig-editor-role
 rules:
 - apiGroups:

Diff for: bootstrap/config/rbac/openshiftassistedconfig_viewer_role.yaml

@@ -2,13 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: openshiftassistedconfig-viewer-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: openshiftassistedconfig-viewer-role
 rules:
 - apiGroups:

Diff for: bootstrap/config/rbac/openshiftassistedconfigtemplate_editor_role.yaml

@@ -2,13 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: openshiftassistedconfigtemplate-editor-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: openshiftassistedconfigtemplate-editor-role
 rules:
 - apiGroups:

Diff for: bootstrap/config/rbac/openshiftassistedconfigtemplate_viewer_role.yaml

@@ -2,13 +2,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrole
-    app.kubernetes.io/instance: openshiftassistedconfigtemplate-viewer-role
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: openshiftassistedconfigtemplate-viewer-role
 rules:
 - apiGroups:

Diff for: bootstrap/config/rbac/role_binding.yaml

@@ -1,13 +1,6 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  labels:
-    app.kubernetes.io/name: clusterrolebinding
-    app.kubernetes.io/instance: manager-rolebinding
-    app.kubernetes.io/component: rbac
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io

Diff for: bootstrap/config/rbac/service_account.yaml

@@ -1,8 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  labels:
-    app.kubernetes.io/name: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: controller-manager
   namespace: system

Diff for: controlplane/config/default/kustomization.yaml

@@ -1,12 +1,12 @@
 # Adds namespace to all resources.
-namespace: capi-agent-controlplane-system
+namespace: capoa-controlplane-system
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
 # "wordpress" becomes "alices-wordpress".
 # Note that it should also match with the prefix (text before '-') of the namespace
 # field above.
-namePrefix: capi-agent-controlplane
+namePrefix: capoa-controlplane-
 
 # Labels to add to all resources and selectors.
 #labels:

Diff for: controlplane/config/manager/manager.yaml

@@ -1,70 +1,27 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: namespace
-    app.kubernetes.io/instance: system
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
   name: system
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: controller-manager
   namespace: system
-  labels:
-    control-plane: controller-manager
-    app.kubernetes.io/name: deployment
-    app.kubernetes.io/instance: controller-manager
-    app.kubernetes.io/component: manager
-    app.kubernetes.io/created-by: cluster-api-agent
-    app.kubernetes.io/part-of: cluster-api-agent
-    app.kubernetes.io/managed-by: kustomize
 spec:
   selector:
     matchLabels:
-      control-plane: controller-manager
+      control-plane: capoa-controlplane-controller-manager
   replicas: 1
   template:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
-        control-plane: controller-manager
+        control-plane: capoa-controlplane-controller-manager
     spec:
-      # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution.
-      # It is considered best practice to support multiple architectures. You can
-      # build your manager image using the makefile target docker-buildx.
-      # affinity:
-      #   nodeAffinity:
-      #     requiredDuringSchedulingIgnoredDuringExecution:
-      #       nodeSelectorTerms:
-      #         - matchExpressions:
-      #           - key: kubernetes.io/arch
-      #             operator: In
-      #             values:
-      #               - amd64
-      #               - arm64
-      #               - ppc64le
-      #               - s390x
-      #           - key: kubernetes.io/os
-      #             operator: In
-      #             values:
-      #               - linux
       securityContext:
         runAsNonRoot: true
-        # TODO(user): For common cases that do not require escalating privileges
-        # it is recommended to ensure that all your Pods/Containers are restrictive.
-        # More info: https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted
-        # Please uncomment the following code if your project does NOT have to work on old Kubernetes
-        # versions < 1.19 or on vendors versions which do NOT support this field by default (i.e. Openshift < 4.11 ).
-        # seccompProfile:
-        #   type: RuntimeDefault
       containers:
       - command:
         - /manager
@@ -90,8 +47,6 @@ spec:
             port: 8081
           initialDelaySeconds: 5
           periodSeconds: 10
-        # TODO(user): Configure the resources accordingly based on the project requirements.
-        # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
         resources:
           limits:
             cpu: 500m