Skip to content

Commit 7975ca1

Browse files
authored
Merge pull request #58314 from xenolinux/separate-label
OCPBUGS#9166: Use a separate config map to contain the`service-ca.crt`
2 parents 89e2709 + 5dcf568 commit 7975ca1

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

modules/certificate-injection-using-operators.adoc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ Cluster Network Operator merges the user-provided and system CA certificates
1010
into a single bundle and injects the merged bundle into the Operator requesting
1111
the trust bundle injection.
1212

13+
[IMPORTANT]
14+
====
15+
After adding a `config.openshift.io/inject-trusted-cabundle="true"` label to the config map, existing data in it is deleted. The Cluster Network Operator takes ownership of a config map and only accepts `ca-bundle` as data.
16+
You must use a separate config map to store `service-ca.crt` by using the `service.beta.openshift.io/inject-cabundle=true` annotation or a similar configuration. Adding a `config.openshift.io/inject-trusted-cabundle="true"` label and `service.beta.openshift.io/inject-cabundle=true` annotation on the same config map can cause issues.
17+
====
18+
1319
Operators request this injection by creating an empty ConfigMap with the
1420
following label:
1521

0 commit comments

Comments
 (0)