Skip to content

err msg: fix secret.spec.data typo #787

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

err msg: fix secret.spec.data typo #787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions pkg/controllers/routercerts/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,13 +190,13 @@ func (c *routerCertsDomainValidationController) validateRouterCertificates() ope
// cert data should exist
data := secret.Data[ingressDomain]
if len(data) == 0 {
return newRouterCertsDegradedf("MissingRouterCertsPEM", "secret/%v.spec.data[%v] -n %v: not found", c.defaultSecretName, ingressDomain, c.secretNamespace)
return newRouterCertsDegradedf("MissingRouterCertsPEM", "secret/%v.data[%v] -n %v: not found", c.defaultSecretName, ingressDomain, c.secretNamespace)
}

// certificates should be parse-able
certificates, err := crypto.CertsFromPEM(data)
if err != nil {
return newRouterCertsDegradedf("MalformedRouterCertsPEM", "secret/%v.spec.data[%v] -n %v: certificates could not be parsed: %v", c.defaultSecretName, ingressDomain, c.secretNamespace, err)
return newRouterCertsDegradedf("MalformedRouterCertsPEM", "secret/%v.data[%v] -n %v: certificates could not be parsed: %v", c.defaultSecretName, ingressDomain, c.secretNamespace, err)
}

// get default router CA cert cm
Expand Down Expand Up @@ -232,12 +232,12 @@ func (c *routerCertsDomainValidationController) validateRouterCertificates() ope

serverCerts := populateVerifyOptionsFromCertSlice(&verifyOptions, certificates)
if len(serverCerts) == 0 {
return newRouterCertsDegradedf("NoServerCertRouterCerts", "secret/%v.spec.data[%v] -n %v: no server certificates found", c.defaultSecretName, ingressDomain, c.secretNamespace)
return newRouterCertsDegradedf("NoServerCertRouterCerts", "secret/%v.data[%v] -n %v: no server certificates found", c.defaultSecretName, ingressDomain, c.secretNamespace)
}

// verify certificate chain
if err := verifyWithAnyCertificate(serverCerts, verifyOptions); err != nil {
return newRouterCertsDegradedf("InvalidServerCertRouterCerts", "secret/%v.spec.data[%v] -n %v: certificate could not validate route hostname %v: %v", c.defaultSecretName, ingressDomain, c.secretNamespace, verifyOptions.DNSName, err)
return newRouterCertsDegradedf("InvalidServerCertRouterCerts", "secret/%v.data[%v] -n %v: certificate could not validate route hostname %v: %v", c.defaultSecretName, ingressDomain, c.secretNamespace, verifyOptions.DNSName, err)
}

// we made it this far without a problem
Expand Down