Delete logic to publish router-ca configmap#377
Conversation
|
/retest |
|
OpenShift Console is failing to get a token from the OAuth issuer endpoint because of an "x509: certificate signed by unknown authority" error. |
You suspect that's because of this change? |
openshift/console-operator#403 should fix it. |
|
Installer still seems to be adding the router-ca to the kubeconfig - https://github.com/openshift/installer/blob/406e9079e5430950b7c256e0ccf98d0e625f8d9d/cmd/openshift-install/create.go#L196-L243 |
|
Thanks! I made openshift/installer#3380 to update the installer to use |
|
/retest |
benjaminapetersen
left a comment
There was a problem hiding this comment.
LGTM, just thinking about how much of a cushion you want. 4.5 or right away in 4.6.
15a193a to
da7871e
Compare
Delete logic to publish the "router-ca" configmap in the "openshift-config-managed" namespace; the "router-ca" configmap is superseded by the "default-ingress-cert" configmap in the same namespace. Follow-up to commit 9640767. * pkg/operator/controller/certificate/controller.go (New): Delete initialization of cache; only the client is still needed after this commit. (reconciler): Delete cache field. (Reconcile): Delete call to ensureRouterCAConfigMap. * pkg/operator/controller/certificate/publish_ca.go (ensureRouterCAConfigMap, desiredRouterCAConfigMap, shouldPublishRouterCA): Delete. * pkg/operator/controller/certificate/publish_ca_test.go: Delete file. (TestShouldPublishRouterCA): Delete test. * pkg/operator/controller/names.go (RouterCAConfigMapName): Delete function. * test/e2e/operator_test.go (TestUpdateDefaultIngressController): Delete checks for the "router-ca" configmap. (TestRouterCACertificate): Rename... (TestDefaultIngressCertificate): ...to this. Check for the "default-ingress-cert" configmap instead of the "router-ca" configmap.
da7871e to
605c5c4
Compare
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: benjaminapetersen, ironcladlou, Miciah The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
|
Delete logic to publish the
router-caconfigmap in theopenshift-config-managednamespace; therouter-caconfigmap is superseded by thedefault-ingress-certconfigmap in the same namespace.Follow-up to #331. Fixes #378.
pkg/operator/controller/certificate/controller.go(New): Delete initialization ofcache; only the client is still needed after this commit.(
reconciler): Deletecachefield.(
Reconcile): Delete call toensureRouterCAConfigMap.pkg/operator/controller/certificate/publish_ca.go(ensureRouterCAConfigMap,desiredRouterCAConfigMap,shouldPublishRouterCA): Delete.pkg/operator/controller/certificate/publish_ca_test.go: Delete file.(
TestShouldPublishRouterCA): Delete test.pkg/operator/controller/names.go(RouterCAConfigMapName): Delete function.test/e2e/operator_test.go(TestUpdateDefaultIngressController): Delete checks for therouter-caconfigmap.(
TestRouterCACertificate): Rename...(
TestDefaultIngressCertificate): ...to this. Check for thedefault-ingress-certconfigmap instead of therouter-caconfigmap.@deads2k, @benjaminapetersen, the plan was to stop publishing
router-cain 4.4.0, so this change is past due; is it safe to do so yet? Let's see whether CI passes...