Skip to content

Commit ec2bfc3

Browse files
sky333999sky333999
committed
Remove changes to v1alpha1
1 parent 48f9ab7 commit ec2bfc3

9 files changed

+11
-342
lines changed

‎apis/v1alpha1/convert.go‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,11 @@ func tov1beta1(in OpenTelemetryCollector) (v1beta1.OpenTelemetryCollector, error
103103
StatefulSetCommonFields: v1beta1.StatefulSetCommonFields{
104104
VolumeClaimTemplates: copy.Spec.VolumeClaimTemplates,
105105
},
106-
Autoscaler: tov1beta1Autoscaler(copy.Spec.Autoscaler, copy.Spec.MinReplicas, copy.Spec.MaxReplicas),
107-
TargetAllocator: tov1beta1TA(copy.Spec.TargetAllocator),
108-
Mode: v1beta1.Mode(copy.Spec.Mode),
109-
UpgradeStrategy: v1beta1.UpgradeStrategy(copy.Spec.UpgradeStrategy),
110-
Config: *cfg,
111-
Service: tov1beta1ServiceSpec(copy.Spec.Service),
112-
HeadlessService: tov1beta1ServiceSpec(copy.Spec.HeadlessService),
113-
MonitoringService: tov1beta1ServiceSpec(copy.Spec.MonitoringService),
114-
ExtensionService: tov1beta1ServiceSpec(copy.Spec.ExtensionService),
106+
Autoscaler: tov1beta1Autoscaler(copy.Spec.Autoscaler, copy.Spec.MinReplicas, copy.Spec.MaxReplicas),
107+
TargetAllocator: tov1beta1TA(copy.Spec.TargetAllocator),
108+
Mode: v1beta1.Mode(copy.Spec.Mode),
109+
UpgradeStrategy: v1beta1.UpgradeStrategy(copy.Spec.UpgradeStrategy),
110+
Config: *cfg,
115111
Ingress: v1beta1.Ingress{
116112
Type: v1beta1.IngressType(copy.Spec.Ingress.Type),
117113
RuleType: v1beta1.IngressRuleType(copy.Spec.Ingress.RuleType),
@@ -254,13 +250,6 @@ func tov1beta1Probe(in *Probe) *v1beta1.Probe {
254250
}
255251
}
256252

257-
func tov1beta1ServiceSpec(in ServiceSpec) v1beta1.ServiceSpec {
258-
return v1beta1.ServiceSpec{
259-
Enabled: in.Enabled,
260-
Name: in.Name,
261-
}
262-
}
263-
264253
func tov1beta1ConfigMaps(in []ConfigMapsSpec) []v1beta1.ConfigMapsSpec {
265254
var mapsSpecs []v1beta1.ConfigMapsSpec
266255
for _, m := range in {
@@ -347,10 +336,6 @@ func tov1alpha1(in v1beta1.OpenTelemetryCollector) (*OpenTelemetryCollector, err
347336
Termination: TLSRouteTerminationType(copy.Spec.Ingress.Route.Termination),
348337
},
349338
},
350-
Service: tov1alpha1ServiceSpec(copy.Spec.Service),
351-
HeadlessService: tov1alpha1ServiceSpec(copy.Spec.HeadlessService),
352-
MonitoringService: tov1alpha1ServiceSpec(copy.Spec.MonitoringService),
353-
ExtensionService: tov1alpha1ServiceSpec(copy.Spec.ExtensionService),
354339
HostNetwork: copy.Spec.HostNetwork,
355340
ShareProcessNamespace: copy.Spec.ShareProcessNamespace,
356341
PriorityClassName: copy.Spec.PriorityClassName,
@@ -398,13 +383,6 @@ func tov1alpha1Probe(in *v1beta1.Probe) *Probe {
398383
}
399384
}
400385

401-
func tov1alpha1ServiceSpec(in v1beta1.ServiceSpec) ServiceSpec {
402-
return ServiceSpec{
403-
Enabled: in.Enabled,
404-
Name: in.Name,
405-
}
406-
}
407-
408386
func tov1alpha1Autoscaler(in *v1beta1.AutoscalerSpec) *AutoscalerSpec {
409387
if in == nil {
410388
return nil

‎apis/v1alpha1/opentelemetrycollector_types.go‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -239,22 +239,6 @@ type OpenTelemetryCollectorSpec struct {
239239
// +optional
240240
ServiceName string `json:"serviceName,omitempty"`
241241

242-
// Service to override configuration of the generated Collector Service.
243-
// +optional
244-
Service ServiceSpec `json:"service,omitempty"`
245-
246-
// HeadlessService to override configuration of the generated Collector HeadlessService.
247-
// +optional
248-
HeadlessService ServiceSpec `json:"headlessService,omitempty"`
249-
250-
// MonitoringService to override configuration of the generated Collector MonitoringService.
251-
// +optional
252-
MonitoringService ServiceSpec `json:"monitoringService,omitempty"`
253-
254-
// ExtensionService to override configuration of the generated Collector ExtensionService.
255-
// +optional
256-
ExtensionService ServiceSpec `json:"extensionService,omitempty"`
257-
258242
// AdditionalContainers allows injecting additional containers into the Collector's pod definition.
259243
// These sidecar containers can be used for authentication proxies, log shipping sidecars, agents for shipping
260244
// metrics to their cloud, or in general sidecars that do not support automatic injection. This option only
@@ -616,20 +600,3 @@ type ConfigMapsSpec struct {
616600
func init() {
617601
SchemeBuilder.Register(&OpenTelemetryCollector{}, &OpenTelemetryCollectorList{})
618602
}
619-
620-
type ServiceSpec struct {
621-
// Enabled indicates whether the Service should be created.
622-
// nil means not set (defaults to enabled for backward compatibility)
623-
// +optional
624-
Enabled *bool `json:"enabled,omitempty"`
625-
626-
// Name to override the default Service name
627-
// +optional
628-
Name string `json:"name,omitempty"`
629-
}
630-
631-
// IsEnabled returns true if the service should be created.
632-
// nil (not set) defaults to true for backward compatibility.
633-
func (s *ServiceSpec) IsEnabled() bool {
634-
return s.Enabled == nil || *s.Enabled
635-
}

‎apis/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2025-08-06T20:58:08Z"
102+
createdAt: "2025-08-07T21:06:48Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

‎bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,20 +1454,6 @@ spec:
14541454
x-kubernetes-map-type: atomic
14551455
type: object
14561456
type: array
1457-
extensionService:
1458-
properties:
1459-
enabled:
1460-
type: boolean
1461-
name:
1462-
type: string
1463-
type: object
1464-
headlessService:
1465-
properties:
1466-
enabled:
1467-
type: boolean
1468-
name:
1469-
type: string
1470-
type: object
14711457
hostNetwork:
14721458
type: boolean
14731459
image:
@@ -2360,13 +2346,6 @@ spec:
23602346
- sidecar
23612347
- statefulset
23622348
type: string
2363-
monitoringService:
2364-
properties:
2365-
enabled:
2366-
type: boolean
2367-
name:
2368-
type: string
2369-
type: object
23702349
nodeSelector:
23712350
additionalProperties:
23722351
type: string
@@ -2617,13 +2596,6 @@ spec:
26172596
type: string
26182597
type: object
26192598
type: object
2620-
service:
2621-
properties:
2622-
enabled:
2623-
type: boolean
2624-
name:
2625-
type: string
2626-
type: object
26272599
serviceAccount:
26282600
type: string
26292601
serviceName:

‎bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2025-08-06T20:58:09Z"
102+
createdAt: "2025-08-07T21:07:12Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3

‎bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,20 +1454,6 @@ spec:
14541454
x-kubernetes-map-type: atomic
14551455
type: object
14561456
type: array
1457-
extensionService:
1458-
properties:
1459-
enabled:
1460-
type: boolean
1461-
name:
1462-
type: string
1463-
type: object
1464-
headlessService:
1465-
properties:
1466-
enabled:
1467-
type: boolean
1468-
name:
1469-
type: string
1470-
type: object
14711457
hostNetwork:
14721458
type: boolean
14731459
image:
@@ -2360,13 +2346,6 @@ spec:
23602346
- sidecar
23612347
- statefulset
23622348
type: string
2363-
monitoringService:
2364-
properties:
2365-
enabled:
2366-
type: boolean
2367-
name:
2368-
type: string
2369-
type: object
23702349
nodeSelector:
23712350
additionalProperties:
23722351
type: string
@@ -2617,13 +2596,6 @@ spec:
26172596
type: string
26182597
type: object
26192598
type: object
2620-
service:
2621-
properties:
2622-
enabled:
2623-
type: boolean
2624-
name:
2625-
type: string
2626-
type: object
26272599
serviceAccount:
26282600
type: string
26292601
serviceName:

‎config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,20 +1440,6 @@ spec:
14401440
x-kubernetes-map-type: atomic
14411441
type: object
14421442
type: array
1443-
extensionService:
1444-
properties:
1445-
enabled:
1446-
type: boolean
1447-
name:
1448-
type: string
1449-
type: object
1450-
headlessService:
1451-
properties:
1452-
enabled:
1453-
type: boolean
1454-
name:
1455-
type: string
1456-
type: object
14571443
hostNetwork:
14581444
type: boolean
14591445
image:
@@ -2346,13 +2332,6 @@ spec:
23462332
- sidecar
23472333
- statefulset
23482334
type: string
2349-
monitoringService:
2350-
properties:
2351-
enabled:
2352-
type: boolean
2353-
name:
2354-
type: string
2355-
type: object
23562335
nodeSelector:
23572336
additionalProperties:
23582337
type: string
@@ -2603,13 +2582,6 @@ spec:
26032582
type: string
26042583
type: object
26052584
type: object
2606-
service:
2607-
properties:
2608-
enabled:
2609-
type: boolean
2610-
name:
2611-
type: string
2612-
type: object
26132585
serviceAccount:
26142586
type: string
26152587
serviceName:

0 commit comments

Comments
 (0)