Skip to content

Commit 74ec8be

Browse files
committed
remove mtls config option from v1alpha1 as it's going to be removed shortly
Signed-off-by: Praful Khanduri <holiodin@gmail.com>
1 parent 3837127 commit 74ec8be

28 files changed

Lines changed: 69 additions & 195 deletions

.github/workflows/e2e-reusable.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
- group: e2e-metadata-filters
9797
setup: "add-operator-arg OPERATOR_ARG='--annotations-filter=.*filter.out --annotations-filter=config.*.gke.io.* --labels-filter=.*filter.out' prepare-e2e"
9898
- group: e2e-ta-collector-mtls
99-
setup: "add-operator-arg OPERATOR_ARG='--feature-gates=operator.targetallocator.mtls' add-certmanager-permissions prepare-e2e"
99+
setup: "add-certmanager-permissions prepare-e2e"
100100
- group: e2e-automatic-rbac
101101
setup: "add-rbac-permissions-to-operator prepare-e2e"
102102

apis/v1alpha1/convert.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,6 @@ func tov1beta1Ports(in []PortsSpec) []v1beta1.PortsSpec {
174174
}
175175

176176
func tov1beta1TA(in OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedded {
177-
var mtls *v1beta1.TargetAllocatorMTLS
178-
if in.Mtls != nil {
179-
mtls = &v1beta1.TargetAllocatorMTLS{
180-
Enabled: in.Mtls.Enabled,
181-
}
182-
}
183-
184177
return v1beta1.TargetAllocatorEmbedded{
185178
Replicas: in.Replicas,
186179
NodeSelector: in.NodeSelector,
@@ -215,7 +208,6 @@ func tov1beta1TA(in OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedde
215208
},
216209
},
217210
PodDisruptionBudget: tov1beta1PodDisruptionBudget(in.PodDisruptionBudget),
218-
Mtls: mtls,
219211
}
220212
}
221213

@@ -453,12 +445,6 @@ func tov1alpha1TA(in v1beta1.TargetAllocatorEmbedded) OpenTelemetryTargetAllocat
453445
if in.PrometheusCR.ServiceMonitorSelector != nil {
454446
serviceMonitorSelector = in.PrometheusCR.ServiceMonitorSelector.MatchLabels
455447
}
456-
var mtls *TargetAllocatorMTLS
457-
if in.Mtls != nil {
458-
mtls = &TargetAllocatorMTLS{
459-
Enabled: in.Mtls.Enabled,
460-
}
461-
}
462448

463449
return OpenTelemetryTargetAllocator{
464450
Replicas: in.Replicas,
@@ -489,7 +475,6 @@ func tov1alpha1TA(in v1beta1.TargetAllocatorEmbedded) OpenTelemetryTargetAllocat
489475
},
490476
},
491477
PodDisruptionBudget: tov1alpha1PodDisruptionBudget(in.PodDisruptionBudget),
492-
Mtls: mtls,
493478
}
494479
}
495480

apis/v1alpha1/opentelemetrycollector_types.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -381,9 +381,6 @@ type OpenTelemetryTargetAllocator struct {
381381
//
382382
// +optional
383383
PodDisruptionBudget *PodDisruptionBudgetSpec `json:"podDisruptionBudget,omitempty"`
384-
385-
// Mtls defines the mTLS configuration for the target allocator. If enabled, the target allocator will communicate with the collector over mTLS.
386-
Mtls *TargetAllocatorMTLS `json:"mtls,omitempty"`
387384
}
388385

389386
type OpenTelemetryTargetAllocatorPrometheusCR struct {
@@ -616,9 +613,3 @@ type ConfigMapsSpec struct {
616613
Name string `json:"name"`
617614
MountPath string `json:"mountpath"`
618615
}
619-
620-
type TargetAllocatorMTLS struct {
621-
// Enabled indicates whether to enable mTLS between the target allocator and the collector.
622-
// +optional
623-
Enabled bool `json:"enabled,omitempty"`
624-
}

apis/v1alpha1/targetallocator_types.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ type TargetAllocatorSpec struct {
9393
// +kubebuilder:default:="30s"
9494
// +kubebuilder:validation:Format:=duration
9595
CollectorNotReadyGracePeriod *metav1.Duration `json:"collectorNotReadyGracePeriod,omitempty"`
96-
// Mtls defines the mTLS configuration for the target allocator. If enabled, the target allocator will communicate with the collector over mTLS.
97-
// +optional
98-
Mtls *TargetAllocatorMTLS `json:"mtls,omitempty"`
9996
// LivenessProbe defines the liveness probe configuration for the Target Allocator container.
10097
// +optional
10198
LivenessProbe *corev1.Probe `json:"livenessProbe,omitempty"`

apis/v1alpha1/zz_generated.deepcopy.go

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

bundle/community/manifests/opentelemetry.io_opentelemetrycollectors.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3255,11 +3255,6 @@ spec:
32553255
type: string
32563256
image:
32573257
type: string
3258-
mtls:
3259-
properties:
3260-
enabled:
3261-
type: boolean
3262-
type: object
32633258
nodeSelector:
32643259
additionalProperties:
32653260
type: string

bundle/community/manifests/opentelemetry.io_targetallocators.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,11 +2299,6 @@ spec:
22992299
- managed
23002300
- unmanaged
23012301
type: string
2302-
mtls:
2303-
properties:
2304-
enabled:
2305-
type: boolean
2306-
type: object
23072302
networkPolicy:
23082303
properties:
23092304
enabled:

bundle/openshift/manifests/opentelemetry.io_opentelemetrycollectors.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3254,11 +3254,6 @@ spec:
32543254
type: string
32553255
image:
32563256
type: string
3257-
mtls:
3258-
properties:
3259-
enabled:
3260-
type: boolean
3261-
type: object
32623257
nodeSelector:
32633258
additionalProperties:
32643259
type: string

bundle/openshift/manifests/opentelemetry.io_targetallocators.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2299,11 +2299,6 @@ spec:
22992299
- managed
23002300
- unmanaged
23012301
type: string
2302-
mtls:
2303-
properties:
2304-
enabled:
2305-
type: boolean
2306-
type: object
23072302
networkPolicy:
23082303
properties:
23092304
enabled:

config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3241,11 +3241,6 @@ spec:
32413241
type: string
32423242
image:
32433243
type: string
3244-
mtls:
3245-
properties:
3246-
enabled:
3247-
type: boolean
3248-
type: object
32493244
nodeSelector:
32503245
additionalProperties:
32513246
type: string

0 commit comments

Comments
 (0)