Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Misc] Add missing labels to CAP Operator Manager resources #43

Merged
merged 2 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions config/busola/capapplication_configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions config/busola/capapplicationversion_configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions config/busola/capoperator_configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions config/busola/captenant_configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions config/busola/captenantoperation_configMap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions config/crd/operator.sme.sap.com_capoperators.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
29 changes: 9 additions & 20 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -102,5 +91,5 @@ spec:
requests:
cpu: 10m
memory: 64Mi
serviceAccountName: controller-manager
serviceAccountName: cap-operator-controller-manager
terminationGracePeriodSeconds: 10
8 changes: 3 additions & 5 deletions config/rbac/leader_election_role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 5 additions & 7 deletions config/rbac/leader_election_role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 5 additions & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- ""
Expand Down
12 changes: 5 additions & 7 deletions config/rbac/role_binding.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 4 additions & 6 deletions config/rbac/service_account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions config/samples/operator_v1alpha1_capoperator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading