From 8dfb7a56b871752f29fc662f6c4d7679aed30c6f Mon Sep 17 00:00:00 2001 From: Pavol Loffay Date: Wed, 9 Feb 2022 11:24:26 +0100 Subject: [PATCH] Use unique label and selector for operator objects (#697) Signed-off-by: Pavol Loffay --- ...perator-controller-manager-metrics-service_v1_service.yaml | 2 ++ ...trics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml | 2 ++ .../opentelemetry-operator-webhook-service_v1_service.yaml | 3 +++ .../opentelemetry-operator.clusterserviceversion.yaml | 2 ++ bundle/manifests/opentelemetry.io_instrumentations.yaml | 2 ++ .../manifests/opentelemetry.io_opentelemetrycollectors.yaml | 2 ++ config/default/kustomization.yaml | 4 ++-- 7 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/opentelemetry-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/opentelemetry-operator-controller-manager-metrics-service_v1_service.yaml index 9e8b2cbd9c..66b0879b4d 100644 --- a/bundle/manifests/opentelemetry-operator-controller-manager-metrics-service_v1_service.yaml +++ b/bundle/manifests/opentelemetry-operator-controller-manager-metrics-service_v1_service.yaml @@ -3,6 +3,7 @@ kind: Service metadata: creationTimestamp: null labels: + app.kubernetes.io/name: opentelemetry-operator control-plane: controller-manager name: opentelemetry-operator-controller-manager-metrics-service spec: @@ -12,6 +13,7 @@ spec: protocol: TCP targetPort: https selector: + app.kubernetes.io/name: opentelemetry-operator control-plane: controller-manager status: loadBalancer: {} diff --git a/bundle/manifests/opentelemetry-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml b/bundle/manifests/opentelemetry-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml index 1cf1261944..18a824a57f 100644 --- a/bundle/manifests/opentelemetry-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml +++ b/bundle/manifests/opentelemetry-operator-metrics-reader_rbac.authorization.k8s.io_v1_clusterrole.yaml @@ -2,6 +2,8 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: creationTimestamp: null + labels: + app.kubernetes.io/name: opentelemetry-operator name: opentelemetry-operator-metrics-reader rules: - nonResourceURLs: diff --git a/bundle/manifests/opentelemetry-operator-webhook-service_v1_service.yaml b/bundle/manifests/opentelemetry-operator-webhook-service_v1_service.yaml index 653d80ef11..d40a336940 100644 --- a/bundle/manifests/opentelemetry-operator-webhook-service_v1_service.yaml +++ b/bundle/manifests/opentelemetry-operator-webhook-service_v1_service.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Service metadata: creationTimestamp: null + labels: + app.kubernetes.io/name: opentelemetry-operator name: opentelemetry-operator-webhook-service spec: ports: @@ -9,6 +11,7 @@ spec: protocol: TCP targetPort: 9443 selector: + app.kubernetes.io/name: opentelemetry-operator control-plane: controller-manager status: loadBalancer: {} diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index 0974dbdfa0..172c5d6c63 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -254,11 +254,13 @@ spec: replicas: 1 selector: matchLabels: + app.kubernetes.io/name: opentelemetry-operator control-plane: controller-manager strategy: {} template: metadata: labels: + app.kubernetes.io/name: opentelemetry-operator control-plane: controller-manager spec: containers: diff --git a/bundle/manifests/opentelemetry.io_instrumentations.yaml b/bundle/manifests/opentelemetry.io_instrumentations.yaml index 7b0049cc51..666e5f0dd2 100644 --- a/bundle/manifests/opentelemetry.io_instrumentations.yaml +++ b/bundle/manifests/opentelemetry.io_instrumentations.yaml @@ -4,6 +4,8 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null + labels: + app.kubernetes.io/name: opentelemetry-operator name: instrumentations.opentelemetry.io spec: group: opentelemetry.io diff --git a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml index b22af0cee1..b596279c08 100644 --- a/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml +++ b/bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml @@ -5,6 +5,8 @@ metadata: cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert controller-gen.kubebuilder.io/version: v0.8.0 creationTimestamp: null + labels: + app.kubernetes.io/name: opentelemetry-operator name: opentelemetrycollectors.opentelemetry.io spec: group: opentelemetry.io diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index ef6a8cd16b..b5d04b59ae 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -9,8 +9,8 @@ namespace: opentelemetry-operator-system namePrefix: opentelemetry-operator- # Labels to add to all resources and selectors. -#commonLabels: -# someName: someValue +commonLabels: + app.kubernetes.io/name: opentelemetry-operator bases: - ../crd