Skip to content

Bug 1734599: pkg/operator/sync.go: udpate the namespace for trust configmap #1045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Aug 8, 2019
Merged

Bug 1734599: pkg/operator/sync.go: udpate the namespace for trust configmap #1045

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdf1a82
pkg/operator/sync.go: udpate the namespace for trust configmap
abhinavdahiya Aug 7, 2019
c227d5d
pkg/operator/sync.go: ensure proxy spec's trust ca is respected
abhinavdahiya Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,34 @@ func (optr *Operator) syncRenderConfig(_ *renderConfig) error {
return err
}

additionalTrustBundle, err := optr.getCAsFromConfigMap("openshift-config-managed", "user-ca-bundle", "ca-bundle.crt")
var trustBundle []byte
certPool := x509.NewCertPool()
// this is the generic trusted bundle for things like self-signed registries.
additionalTrustBundle, err := optr.getCAsFromConfigMap("openshift-config", "user-ca-bundle", "ca-bundle.crt")
if err != nil && !apierrors.IsNotFound(err) {
return err
}
spec.AdditionalTrustBundle = additionalTrustBundle
if len(additionalTrustBundle) > 0 {
if !certPool.AppendCertsFromPEM(additionalTrustBundle) {
return fmt.Errorf("configmap %s/%s doesn't have a valid PEM bundle", "openshift-config", "user-ca-bundle")
}
trustBundle = append(trustBundle, additionalTrustBundle...)
}

// this is the trusted bundle specific for proxy things and can differ from the generic one above.
if proxy != nil && proxy.Spec.TrustedCA.Name != "" && proxy.Spec.TrustedCA.Name != "user-ca-bundle" {
proxyTrustBundle, err := optr.getCAsFromConfigMap("openshift-config", proxy.Spec.TrustedCA.Name, "ca-bundle.crt")
if err != nil {
return err
}
if len(proxyTrustBundle) > 0 {
if !certPool.AppendCertsFromPEM(proxyTrustBundle) {
return fmt.Errorf("configmap %s/%s doesn't have a valid PEM bundle", "openshift-config", proxy.Spec.TrustedCA.Name)
}
trustBundle = append(trustBundle, proxyTrustBundle...)
}
}
spec.AdditionalTrustBundle = trustBundle

// if the cloudConfig is set in infra read the cloud config reference
if infra.Spec.CloudConfig.Name != "" {
Expand Down