Skip to content

Commit 97c8d51

Browse files
authored
Align insrumentation TLS config with collector (#3358)
Signed-off-by: Pavol Loffay <[email protected]>
1 parent 9a1b585 commit 97c8d51

9 files changed

+23
-23
lines changed

.chloggen/inst-tls.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ subtext: |
2323
secretName: otel-tls-certs
2424
configMapName: otel-ca-bundle
2525
# otel-ca-bundle
26-
ca: ca.crt
26+
ca_file: ca.crt
2727
# present in otel-tls-certs
28-
cert: tls.crt
28+
cert_file: tls.crt
2929
# present in otel-tls-certs
30-
key: tls.key
30+
key_file: tls.key
3131
```
3232
3333
* Propagating secrets across namespaces can be done with https://github.com/EmberStack/kubernetes-reflector or https://github.com/zakkg3/ClusterSecret

apis/v1alpha1/instrumentation_types.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ type TLS struct {
121121
// CA defines the key of certificate (e.g. ca.crt) in the configmap map, secret or absolute path to a certificate.
122122
// The absolute path can be used when certificate is already present on the workload filesystem e.g.
123123
// /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
124-
CA string `json:"ca,omitempty"`
124+
CA string `json:"ca_file,omitempty"`
125125
// Cert defines the key (e.g. tls.crt) of the client certificate in the secret or absolute path to a certificate.
126126
// The absolute path can be used when certificate is already present on the workload filesystem.
127-
Cert string `json:"cert,omitempty"`
127+
Cert string `json:"cert_file,omitempty"`
128128
// Key defines a key (e.g. tls.key) of the private key in the secret or absolute path to a certificate.
129129
// The absolute path can be used when certificate is already present on the workload filesystem.
130-
Key string `json:"key,omitempty"`
130+
Key string `json:"key_file,omitempty"`
131131
}
132132

133133
// Sampler defines sampling configuration.

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

+1-1
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: "2024-10-10T15:31:51Z"
102+
createdAt: "2024-10-16T10:10:50Z"
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_instrumentations.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,13 @@ spec:
411411
type: string
412412
tls:
413413
properties:
414-
ca:
414+
ca_file:
415415
type: string
416-
cert:
416+
cert_file:
417417
type: string
418418
configMapName:
419419
type: string
420-
key:
420+
key_file:
421421
type: string
422422
secretName:
423423
type: string

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

+1-1
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: "2024-10-10T15:31:51Z"
102+
createdAt: "2024-10-16T10:10:50Z"
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_instrumentations.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -411,13 +411,13 @@ spec:
411411
type: string
412412
tls:
413413
properties:
414-
ca:
414+
ca_file:
415415
type: string
416-
cert:
416+
cert_file:
417417
type: string
418418
configMapName:
419419
type: string
420-
key:
420+
key_file:
421421
type: string
422422
secretName:
423423
type: string

config/crd/bases/opentelemetry.io_instrumentations.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,13 @@ spec:
409409
type: string
410410
tls:
411411
properties:
412-
ca:
412+
ca_file:
413413
type: string
414-
cert:
414+
cert_file:
415415
type: string
416416
configMapName:
417417
type: string
418-
key:
418+
key_file:
419419
type: string
420420
secretName:
421421
type: string

docs/api.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,7 @@ TLS needs to be enabled by specifying https:// scheme in the Endpoint.
16591659
</tr>
16601660
</thead>
16611661
<tbody><tr>
1662-
<td><b>ca</b></td>
1662+
<td><b>ca_file</b></td>
16631663
<td>string</td>
16641664
<td>
16651665
CA defines the key of certificate (e.g. ca.crt) in the configmap map, secret or absolute path to a certificate.
@@ -1668,7 +1668,7 @@ The absolute path can be used when certificate is already present on the workloa
16681668
</td>
16691669
<td>false</td>
16701670
</tr><tr>
1671-
<td><b>cert</b></td>
1671+
<td><b>cert_file</b></td>
16721672
<td>string</td>
16731673
<td>
16741674
Cert defines the key (e.g. tls.crt) of the client certificate in the secret or absolute path to a certificate.
@@ -1684,7 +1684,7 @@ used from the secret defined in SecretName.<br/>
16841684
</td>
16851685
<td>false</td>
16861686
</tr><tr>
1687-
<td><b>key</b></td>
1687+
<td><b>key_file</b></td>
16881688
<td>string</td>
16891689
<td>
16901690
Key defines a key (e.g. tls.key) of the private key in the secret or absolute path to a certificate.

tests/e2e-instrumentation/instrumentation-java-tls/00-install-instrumentation.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ spec:
88
tls:
99
secretName: client-certs
1010
configMapName: ca
11-
ca: ca.crt
12-
cert: tls.crt
13-
key: tls.key
11+
ca_file: ca.crt
12+
cert_file: tls.crt
13+
key_file: tls.key
1414
propagators:
1515
- tracecontext
1616
- baggage

0 commit comments

Comments
 (0)