diff --git a/config/busola/capapplication_configMap.yaml b/config/busola/capapplication_configMap.yaml index 299d539..21e69d0 100644 --- a/config/busola/capapplication_configMap.yaml +++ b/config/busola/capapplication_configMap.yaml @@ -4,6 +4,8 @@ metadata: name: capapplications.sme.sap.com labels: app.kubernetes.io/name: capapplications.sme.sap.com + app.kubernetes.io/instance: capapplications.sme.sap.com + app.kubernetes.io/component: configmap busola.io/extension: resource busola.io/extension-version: '0.5' data: diff --git a/config/busola/capapplicationversion_configMap.yaml b/config/busola/capapplicationversion_configMap.yaml index e2df5c3..abc065f 100644 --- a/config/busola/capapplicationversion_configMap.yaml +++ b/config/busola/capapplicationversion_configMap.yaml @@ -4,6 +4,8 @@ metadata: name: capapplicationversions.sme.sap.com labels: app.kubernetes.io/name: capapplicationversions.sme.sap.com + app.kubernetes.io/instance: capapplicationversions.sme.sap.com + app.kubernetes.io/component: configmap busola.io/extension: resource busola.io/extension-version: '0.5' data: diff --git a/config/busola/capoperator_configMap.yaml b/config/busola/capoperator_configMap.yaml index d87499b..e62b2b6 100644 --- a/config/busola/capoperator_configMap.yaml +++ b/config/busola/capoperator_configMap.yaml @@ -4,6 +4,8 @@ metadata: name: capoperators.operator.sme.sap.com labels: app.kubernetes.io/name: capoperators.operator.sme.sap.com + app.kubernetes.io/instance: capoperators.operator.sme.sap.com + app.kubernetes.io/component: configmap busola.io/extension: resource busola.io/extension-version: '0.5' data: diff --git a/config/busola/captenant_configMap.yaml b/config/busola/captenant_configMap.yaml index 0794953..82b386f 100644 --- a/config/busola/captenant_configMap.yaml +++ b/config/busola/captenant_configMap.yaml @@ -4,6 +4,8 @@ metadata: name: captenants.sme.sap.com labels: app.kubernetes.io/name: captenants.sme.sap.com + app.kubernetes.io/instance: captenants.sme.sap.com + app.kubernetes.io/component: configmap busola.io/extension: resource busola.io/extension-version: '0.5' data: diff --git a/config/busola/captenantoperation_configMap.yaml b/config/busola/captenantoperation_configMap.yaml index b00e89a..01557b4 100644 --- a/config/busola/captenantoperation_configMap.yaml +++ b/config/busola/captenantoperation_configMap.yaml @@ -4,6 +4,8 @@ metadata: name: captenantoperations.sme.sap.com labels: app.kubernetes.io/name: captenantoperations.sme.sap.com + app.kubernetes.io/instance: captenantoperations.sme.sap.com + app.kubernetes.io/component: configmap busola.io/extension: resource busola.io/extension-version: '0.5' data: diff --git a/config/crd/operator.sme.sap.com_capoperators.yaml b/config/crd/operator.sme.sap.com_capoperators.yaml index ea37f0f..69070bc 100644 --- a/config/crd/operator.sme.sap.com_capoperators.yaml +++ b/config/crd/operator.sme.sap.com_capoperators.yaml @@ -4,6 +4,10 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.13.0 + labels: + app.kubernetes.io/name: capoperators.operator.sme.sap.com + app.kubernetes.io/instance: capoperators.operator.sme.sap.com + app.kubernetes.io/component: customresourcedefinition name: capoperators.operator.sme.sap.com spec: group: operator.sme.sap.com diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 110b95b..d8f5855 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -7,13 +7,15 @@ namespace: cap-operator-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: cap-operator- +# namePrefix: cap-operator- # Labels to add to all resources and selectors. labels: - includeSelectors: true pairs: - app.kubernetes.io/component: cap-operator.sme.sap.com + app.kubernetes.io/version: latest + kyma-project.io/module: cap-operator + app.kubernetes.io/part-of: cap-operator-manager resources: - ../crd diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 7d9af71..a5e1bfe 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -2,37 +2,26 @@ apiVersion: v1 kind: Namespace metadata: labels: - control-plane: controller-manager - app.kubernetes.io/name: namespace - app.kubernetes.io/instance: system - app.kubernetes.io/component: cap-operator.sme.sap.com - app.kubernetes.io/part-of: cap-operator-manager - app.kubernetes.io/managed-by: kustomize - name: system + app.kubernetes.io/name: cap-operator-system + app.kubernetes.io/instance: cap-operator-system + app.kubernetes.io/component: namespace + name: cap-operator-system --- apiVersion: apps/v1 kind: Deployment metadata: - name: controller-manager + name: cap-operator-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/part-of: cap-operator-manager - app.kubernetes.io/managed-by: kustomize + app.kubernetes.io/name: cap-operator-controller-manager + app.kubernetes.io/instance: cap-operator-controller-manager + app.kubernetes.io/component: controller spec: - selector: - matchLabels: - control-plane: controller-manager replicas: 1 template: metadata: annotations: kubectl.kubernetes.io/default-container: manager - labels: - control-plane: controller-manager spec: # TODO(user): Uncomment the following code to configure the nodeAffinity expression # according to the platforms which are supported by your solution. @@ -102,5 +91,5 @@ spec: requests: cpu: 10m memory: 64Mi - serviceAccountName: controller-manager + serviceAccountName: cap-operator-controller-manager terminationGracePeriodSeconds: 10 diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml index cbf0260..9ee0d8f 100644 --- a/config/rbac/leader_election_role.yaml +++ b/config/rbac/leader_election_role.yaml @@ -3,12 +3,10 @@ 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/name: cap-operator-leader-election-role + app.kubernetes.io/instance: cap-operator-leader-election-role app.kubernetes.io/component: rbac - app.kubernetes.io/part-of: cap-operator-manager - app.kubernets.io/managed-by: kustomize - name: leader-election-role + name: cap-operator-leader-election-role rules: - apiGroups: - coordination.k8s.io diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index ae505aa..4d8e469 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -2,17 +2,15 @@ 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/name: cap-operator-leader-election-rolebinding + app.kubernetes.io/instance: cap-operator-leader-election-rolebinding app.kubernetes.io/component: rbac - app.kubernetes.io/part-of: cap-operator-manager - app.kubernetes.io/managed-by: kustomize - name: leader-election-rolebinding + name: cap-operator-leader-election-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: leader-election-role + name: cap-operator-leader-election-role subjects: - kind: ServiceAccount - name: controller-manager + name: cap-operator-controller-manager namespace: system diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index fc59628..5112686 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: manager-role + name: cap-operator-manager-role + labels: + app.kubernetes.io/name: cap-operator-manager-role + app.kubernetes.io/instance: cap-operator-manager-role + app.kubernetes.io/component: rbac rules: - apiGroups: - "" diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index a8f1eaa..6ae10a0 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -2,17 +2,15 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/name: clusterrolebinding - app.kubernetes.io/instance: manager-rolebinding + app.kubernetes.io/name: cap-operator-manager-rolebinding + app.kubernetes.io/instance: cap-operator-manager-rolebinding app.kubernetes.io/component: rbac - app.kubernetes.io/part-of: cap-operator-manager - app.kubernetes.io/managed-by: kustomize - name: manager-rolebinding + name: cap-operator-manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: manager-role + name: cap-operator-manager-role subjects: - kind: ServiceAccount - name: controller-manager + name: cap-operator-controller-manager namespace: system diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index ba77b2f..4a012f1 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -2,10 +2,8 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: serviceaccount - app.kubernetes.io/instance: controller-manager-sa - app.kubernetes.io/component: rbac - app.kubernetes.io/part-of: cap-operator-manager - app.kubernetes.io/managed-by: kustomize - name: controller-manager + app.kubernetes.io/name: cap-operator-controller-manager + app.kubernetes.io/instance: cap-operator-controller-manager + app.kubernetes.io/component: serviceaccount + name: cap-operator-controller-manager namespace: system diff --git a/config/samples/operator_v1alpha1_capoperator.yaml b/config/samples/operator_v1alpha1_capoperator.yaml index da1ed95..972c8a1 100644 --- a/config/samples/operator_v1alpha1_capoperator.yaml +++ b/config/samples/operator_v1alpha1_capoperator.yaml @@ -2,6 +2,13 @@ apiVersion: operator.sme.sap.com/v1alpha1 kind: CAPOperator metadata: name: cap-operator + labels: + app.kubernetes.io/name: cap-operator + app.kubernetes.io/instance: cap-operator + app.kubernetes.io/component: cap-operator-manager + app.kubernetes.io/version: latest + kyma-project.io/module: cap-operator + app.kubernetes.io/part-of: cap-operator-manager spec: subscriptionServer: subDomain: cap-op