Skip to content

Commit fa5365c

Browse files
authored
fix: [sc-118962] Unable to Retrieve TLS Parameters from Kubernetes Secrets with the Postgres Collector (#1724)
* use Data instead of StringData
1 parent b9d49d9 commit fa5365c

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

pkg/collect/util.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,20 +208,20 @@ func getTLSParamsFromSecret(ctx context.Context, client kubernetes.Interface, se
208208
return "", "", "", errors.Wrap(err, "failed to get secret")
209209
}
210210

211-
if val, ok := secret.StringData["cacert"]; ok {
212-
caCert = val
211+
if val, ok := secret.Data["cacert"]; ok {
212+
caCert = string(val)
213213
} else {
214214
return "", "", "", fmt.Errorf("failed to find 'cacert' key for CA cert data in secret")
215215
}
216216

217217
var foundClientCert, foundClientKey bool
218-
if val, ok := secret.StringData["clientCert"]; ok {
219-
clientCert = val
218+
if val, ok := secret.Data["clientCert"]; ok {
219+
clientCert = string(val)
220220
foundClientCert = true
221221
}
222222

223-
if val, ok := secret.StringData["clientKey"]; ok {
224-
clientKey = val
223+
if val, ok := secret.Data["clientKey"]; ok {
224+
clientKey = string(val)
225225
foundClientKey = true
226226
}
227227

pkg/collect/util_test.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,18 @@ func createTLSSecret(t *testing.T, client kubernetes.Interface, secretData map[s
270270
secretName := "secret-name-" + randStringRunes(20)
271271
namespace := "namespace-" + randStringRunes(20)
272272

273+
data := make(map[string][]byte)
274+
for k, v := range secretData {
275+
data[k] = []byte(v)
276+
}
277+
273278
_, err := client.CoreV1().Secrets(namespace).Create(
274279
context.Background(),
275280
&v1.Secret{
276281
ObjectMeta: metav1.ObjectMeta{
277282
Name: secretName,
278283
},
279-
StringData: secretData,
284+
Data: data,
280285
},
281286
metav1.CreateOptions{},
282287
)

0 commit comments

Comments
 (0)