From 8679a4af558985479f67b9a694e693862303469c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20=C5=9Awi=C4=85tek?= Date: Wed, 3 Jul 2024 12:26:24 +0200 Subject: [PATCH] Don't unnecessarily take ownership of PersistentVolumes and PersistentVolumeClaims # Conflicts: # bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml --- .chloggen/fix_dont-own-volumes.yaml | 16 ++++++++++++++++ ...telemetry-operator.clusterserviceversion.yaml | 4 +--- ...telemetry-operator.clusterserviceversion.yaml | 4 +--- config/rbac/role.yaml | 2 -- controllers/opentelemetrycollector_controller.go | 4 +--- 5 files changed, 19 insertions(+), 11 deletions(-) create mode 100755 .chloggen/fix_dont-own-volumes.yaml diff --git a/.chloggen/fix_dont-own-volumes.yaml b/.chloggen/fix_dont-own-volumes.yaml new file mode 100755 index 0000000000..5430eaa680 --- /dev/null +++ b/.chloggen/fix_dont-own-volumes.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action) +component: collector + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Don't unnecessarily take ownership of PersistentVolumes and PersistentVolumeClaims + +# One or more tracking issues related to the change +issues: [3042] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: diff --git a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml index 99cd4823de..037171d74a 100644 --- a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -99,7 +99,7 @@ metadata: categories: Logging & Tracing,Monitoring certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2024-08-21T12:36:08Z" + createdAt: "2024-08-27T07:26:20Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -262,8 +262,6 @@ spec: - "" resources: - configmaps - - persistentvolumeclaims - - persistentvolumes - pods - serviceaccounts - services diff --git a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml index 36dc06f975..96927cf2be 100644 --- a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -99,7 +99,7 @@ metadata: categories: Logging & Tracing,Monitoring certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2024-08-21T12:36:11Z" + createdAt: "2024-08-27T07:26:23Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 @@ -262,8 +262,6 @@ spec: - "" resources: - configmaps - - persistentvolumeclaims - - persistentvolumes - pods - serviceaccounts - services diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 2f92fb087b..73632f89c8 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -8,8 +8,6 @@ rules: - "" resources: - configmaps - - persistentvolumeclaims - - persistentvolumes - pods - serviceaccounts - services diff --git a/controllers/opentelemetrycollector_controller.go b/controllers/opentelemetrycollector_controller.go index ea6f8908d6..be370ba795 100644 --- a/controllers/opentelemetrycollector_controller.go +++ b/controllers/opentelemetrycollector_controller.go @@ -199,7 +199,7 @@ func NewReconciler(p Params) *OpenTelemetryCollectorReconciler { return r } -// +kubebuilder:rbac:groups="",resources=pods;configmaps;services;serviceaccounts;persistentvolumeclaims;persistentvolumes,verbs=get;list;watch;create;update;patch;delete +// +kubebuilder:rbac:groups="",resources=pods;configmaps;services;serviceaccounts,verbs=get;list;watch;create;update;patch;delete // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch // +kubebuilder:rbac:groups=apps,resources=daemonsets;deployments;statefulsets,verbs=get;list;watch;create;update;patch;delete // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=get;list;watch;create;update;patch;delete @@ -297,8 +297,6 @@ func (r *OpenTelemetryCollectorReconciler) SetupWithManager(mgr ctrl.Manager) er Owns(&appsv1.Deployment{}). Owns(&appsv1.DaemonSet{}). Owns(&appsv1.StatefulSet{}). - Owns(&corev1.PersistentVolume{}). - Owns(&corev1.PersistentVolumeClaim{}). Owns(&networkingv1.Ingress{}). Owns(&autoscalingv2.HorizontalPodAutoscaler{}). Owns(&policyV1.PodDisruptionBudget{})