Skip to content

Commit

Permalink
UPSTREAM: <drop>: use the legacy service-ca.crt content for clusters …
Browse files Browse the repository at this point in the history
…started in 4.7 or before
  • Loading branch information
deads2k authored and soltysh committed Sep 8, 2021
1 parent 357c257 commit 8a3a591
Showing 1 changed file with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ func (c *Publisher) syncNamespace(ns string) (err error) {
annotations := map[string]string{
// This annotation prompts the service ca operator to inject
// the service ca bundle into the configmap.
"service.beta.openshift.io/inject-cabundle": "true",
// We ONLY inject the vulnerable CA bundle in 4.7 because we want consistency on injected files on upgraded clusters.
"service.alpha.openshift.io/inject-vulnerable-legacy-cabundle": "true",
}

cm, err := c.cmLister.ConfigMaps(ns).Get(ServiceCACertConfigMapName)
Expand Down

0 comments on commit 8a3a591

Please sign in to comment.