refactor(collector): moves 'hostPID' from common types to collector

olandr · olandr · commit fa6d1643b04a · 2025-08-26T16:42:44.000+02:00
fields in v1beta1/common.go area for all component types. for now the hostPID support is only for the collector --------- on-behalf-of: @SAP Simon Olander (simon.olander@sap.com)
diff --git a/apis/v1alpha1/convert.go b/apis/v1alpha1/convert.go
@@ -95,7 +95,6 @@ func tov1beta1(in OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error
 				TerminationGracePeriodSeconds: copy.Spec.TerminationGracePeriodSeconds,
 				TopologySpreadConstraints:     copy.Spec.TopologySpreadConstraints,
 				HostNetwork:                   copy.Spec.HostNetwork,
-				HostPID:                       copy.Spec.HostPID,
 				ShareProcessNamespace:         copy.Spec.ShareProcessNamespace,
 				PriorityClassName:             copy.Spec.PriorityClassName,
 				InitContainers:                copy.Spec.InitContainers,
@@ -338,7 +337,6 @@ func tov1alpha1(in v1beta1.OpenTelemetryCollector) (*OpenTelemetryCollector, err
 				},
 			},
 			HostNetwork:                   copy.Spec.HostNetwork,
-			HostPID:                       copy.Spec.HostPID,
 			ShareProcessNamespace:         copy.Spec.ShareProcessNamespace,
 			PriorityClassName:             copy.Spec.PriorityClassName,
 			Affinity:                      copy.Spec.Affinity,
diff --git a/apis/v1beta1/common.go b/apis/v1beta1/common.go
@@ -186,9 +186,6 @@ type OpenTelemetryCommonFields struct {
 	// HostNetwork indicates if the pod should run in the host networking namespace.
 	// +optional
 	HostNetwork bool `json:"hostNetwork,omitempty"`
-	// HostPID indicates if the pod should have access to the host process ID namespace.
-	// +optional
-	HostPID bool `json:"hostPID,omitempty"`
 	// ShareProcessNamespace indicates if the pod's containers should share process namespace.
 	// +optional
 	ShareProcessNamespace bool `json:"shareProcessNamespace,omitempty"`
diff --git a/apis/v1beta1/opentelemetrycollector_types.go b/apis/v1beta1/opentelemetrycollector_types.go
@@ -143,6 +143,9 @@ type OpenTelemetryCollectorSpec struct {
 	// If not specified, it will default to "<name>-headless".
 	// +optional
 	ServiceName string `json:"serviceName,omitempty"`
+	// HostPID indicates if the pod should have access to the host process ID namespace.
+	// +optional
+	HostPID bool `json:"hostPID,omitempty"`
 }
 
 // TargetAllocatorEmbedded defines the configuration for the Prometheus target allocator, embedded in the
diff --git 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: "2025-08-15T13:11:29Z"
+    createdAt: "2025-08-26T14:39:19Z"
     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
@@ -540,7 +540,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0-18-gc38ec617
+                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0-36-ga732ae06
                 livenessProbe:
                   httpGet:
                     path: /healthz
diff --git a/bundle/community/manifests/opentelemetry.io_targetallocators.yaml b/bundle/community/manifests/opentelemetry.io_targetallocators.yaml
@@ -1275,8 +1275,6 @@ spec:
                 type: object
               hostNetwork:
                 type: boolean
-              hostPID:
-                type: boolean
               image:
                 type: string
               imagePullPolicy:
diff --git 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: "2025-08-15T13:11:30Z"
+    createdAt: "2025-08-26T14:39:25Z"
     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
@@ -545,7 +545,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0-18-gc38ec617
+                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.131.0-36-ga732ae06
                 livenessProbe:
                   httpGet:
                     path: /healthz
diff --git a/bundle/openshift/manifests/opentelemetry.io_targetallocators.yaml b/bundle/openshift/manifests/opentelemetry.io_targetallocators.yaml
@@ -1275,8 +1275,6 @@ spec:
                 type: object
               hostNetwork:
                 type: boolean
-              hostPID:
-                type: boolean
               image:
                 type: string
               imagePullPolicy:
diff --git a/config/crd/bases/opentelemetry.io_targetallocators.yaml b/config/crd/bases/opentelemetry.io_targetallocators.yaml
@@ -1272,8 +1272,6 @@ spec:
                 type: object
               hostNetwork:
                 type: boolean
-              hostPID:
-                type: boolean
               image:
                 type: string
               imagePullPolicy:
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: docker.io/pavolloffay/opentelemetry-operator
-  newTag: dev-e6d96f00-1755261473
+  newName: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
+  newTag: 0.131.0-36-ga732ae06
diff --git a/docs/api/targetallocators.md b/docs/api/targetallocators.md
@@ -178,13 +178,6 @@ For more info, see https://prometheus.io/docs/prometheus/latest/configuration/co
           HostNetwork indicates if the pod should run in the host networking namespace.<br/>
         </td>
         <td>false</td>
-      </tr><tr>
-        <td><b>hostPID</b></td>
-        <td>boolean</td>
-        <td>
-          HostPID indicates if the pod should have access to the host process ID namespace.<br/>
-        </td>
-        <td>false</td>
       </tr><tr>
         <td><b>image</b></td>
         <td>string</td>
diff --git a/internal/manifests/collector/daemonset_test.go b/internal/manifests/collector/daemonset_test.go
@@ -692,9 +692,7 @@ func TestDaemonSetHostPIDIgnoredWhenFeatureFlagDisabled(t *testing.T) {
 			Name: "my-instance-terminationGracePeriodSeconds",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
-			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-				HostPID: true,
-			},
+			HostPID: true,
 		},
 	}
 
@@ -743,9 +741,7 @@ func TestDaemonSetHostPIDOnlyWhenFeatureFlagEnabled(t *testing.T) {
 			Name: "my-instance-terminationGracePeriodSeconds",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
-			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-				HostPID: true,
-			},
+			HostPID: true,
 		},
 	}
 
diff --git a/internal/manifests/collector/deployment_test.go b/internal/manifests/collector/deployment_test.go
@@ -841,9 +841,7 @@ func TestDeploymentHostPIDIgnoredWhenFeatureFlagDisabled(t *testing.T) {
 			Name: "my-instance-hostnetwork",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
-			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-				HostPID: true,
-			},
+			HostPID: true,
 		},
 	}
 
@@ -890,9 +888,7 @@ func TestDeploymentHostPIDOnlyWhenFeatureFlagEnabled(t *testing.T) {
 			Name: "my-instance-hostnetwork",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
-			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-				HostPID: true,
-			},
+			HostPID: true,
 		},
 	}
 
diff --git a/internal/manifests/collector/statefulset_test.go b/internal/manifests/collector/statefulset_test.go
@@ -859,9 +859,7 @@ func TestStatefulSetHostPIDIgnoredWhenFeatureFlagDisabled(t *testing.T) {
 			Name: "my-instance-HostPID",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
-			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-				HostPID: true,
-			},
+			HostPID: true,
 		},
 	}
 
@@ -908,9 +906,7 @@ func TestStatefulSetHostPIDOnlyWhenFeatureFlagEnabled(t *testing.T) {
 			Name: "my-instance-HostPID",
 		},
 		Spec: v1beta1.OpenTelemetryCollectorSpec{
-			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
-				HostPID: true,
-			},
+			HostPID: true,
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,9 @@ type OpenTelemetryCollectorSpec struct {`
`143`	`143`	`// If not specified, it will default to "<name>-headless".`
`144`	`144`	`// +optional`
`145`	`145`	ServiceName string `json:"serviceName,omitempty"`
	`146`	`+ // HostPID indicates if the pod should have access to the host process ID namespace.`
	`147`	`+ // +optional`
	`148`	+ HostPID bool `json:"hostPID,omitempty"`
`146`	`149`	`}`
`147`	`150`
`148`	`151`	`// TargetAllocatorEmbedded defines the configuration for the Prometheus target allocator, embedded in the`