nicolaferraro closed pull request #21: Add labels to all resources URL: https://github.com/apache/camel-k/pull/21
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 53d24d7..1cdbcc6 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -2,6 +2,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: integrations.camel.apache.org + labels: + app: "camel-k" spec: group: camel.apache.org names: diff --git a/deploy/operator-role-binding.yaml b/deploy/operator-role-binding.yaml index eb4c712..47f8d7c 100644 --- a/deploy/operator-role-binding.yaml +++ b/deploy/operator-role-binding.yaml @@ -2,10 +2,12 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: camel-k-operator + labels: + app: "camel-k" subjects: - kind: ServiceAccount name: camel-k-operator roleRef: kind: Role name: camel-k-operator - apiGroup: rbac.authorization.k8s.io \ No newline at end of file + apiGroup: rbac.authorization.k8s.io diff --git a/deploy/operator-role-kubernetes.yaml b/deploy/operator-role-kubernetes.yaml index ac0ab7a..d3865a8 100644 --- a/deploy/operator-role-kubernetes.yaml +++ b/deploy/operator-role-kubernetes.yaml @@ -2,6 +2,8 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: camel-k-operator + labels: + app: "camel-k" rules: - apiGroups: - camel.apache.org @@ -58,4 +60,4 @@ rules: verbs: - get - list - - watch \ No newline at end of file + - watch diff --git a/deploy/operator-role-openshift.yaml b/deploy/operator-role-openshift.yaml index c6fe09e..1cd659b 100644 --- a/deploy/operator-role-openshift.yaml +++ b/deploy/operator-role-openshift.yaml @@ -2,6 +2,8 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: camel-k-operator + labels: + app: "camel-k" rules: - apiGroups: - camel.apache.org @@ -102,4 +104,4 @@ rules: - buildconfigs/instantiatebinary - builds/clone verbs: - - create \ No newline at end of file + - create diff --git a/deploy/operator-service-account.yaml b/deploy/operator-service-account.yaml index eb771aa..6865e6f 100644 --- a/deploy/operator-service-account.yaml +++ b/deploy/operator-service-account.yaml @@ -1,4 +1,6 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: camel-k-operator \ No newline at end of file + name: camel-k-operator + labels: + app: "camel-k" diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 863b21c..426387a 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -2,6 +2,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: camel-k-operator + labels: + app: "camel-k" spec: replicas: 1 selector: diff --git a/deploy/resources.go b/deploy/resources.go index df17de5..9f21fcd 100644 --- a/deploy/resources.go +++ b/deploy/resources.go @@ -30,6 +30,8 @@ apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: integrations.camel.apache.org + labels: + app: "camel-k" spec: group: camel.apache.org names: @@ -84,6 +86,7 @@ spec: metadata: labels: name: camel-k-operator + app: "camel-k" spec: serviceAccountName: camel-k-operator containers: @@ -110,6 +113,8 @@ kind: RoleBinding apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: camel-k-operator + labels: + app: "camel-k" subjects: - kind: ServiceAccount name: camel-k-operator @@ -117,6 +122,7 @@ roleRef: kind: Role name: camel-k-operator apiGroup: rbac.authorization.k8s.io + ` Resources["operator-role-kubernetes.yaml"] = ` @@ -124,6 +130,8 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: camel-k-operator + labels: + app: "camel-k" rules: - apiGroups: - camel.apache.org @@ -181,6 +189,7 @@ rules: - get - list - watch + ` Resources["operator-role-openshift.yaml"] = ` @@ -188,6 +197,8 @@ kind: Role apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: camel-k-operator + labels: + app: "camel-k" rules: - apiGroups: - camel.apache.org @@ -289,6 +300,7 @@ rules: - builds/clone verbs: - create + ` Resources["operator-service-account.yaml"] = ` @@ -296,6 +308,9 @@ apiVersion: v1 kind: ServiceAccount metadata: name: camel-k-operator + labels: + app: "camel-k" + ` Resources["operator.yaml"] = ` @@ -303,6 +318,8 @@ apiVersion: apps/v1 kind: Deployment metadata: name: camel-k-operator + labels: + app: "camel-k" spec: replicas: 1 selector: @@ -338,6 +355,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: camel-k:edit labels: + app: "camel-k" # Add these permissions to the "admin" and "edit" default roles. rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" diff --git a/deploy/user-cluster-role.yaml b/deploy/user-cluster-role.yaml index 2fde6d1..eb981a8 100644 --- a/deploy/user-cluster-role.yaml +++ b/deploy/user-cluster-role.yaml @@ -3,6 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: camel-k:edit labels: + app: "camel-k" # Add these permissions to the "admin" and "edit" default roles. rbac.authorization.k8s.io/aggregate-to-admin: "true" rbac.authorization.k8s.io/aggregate-to-edit: "true" ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services