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.
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
Sync default-ingress-cert to the console namespace #361
Conversation
@@ -10,6 +10,7 @@ PACKAGES_TO_TEST=( | |||
"github.com/openshift/console-operator/pkg/console/operator" | |||
"github.com/openshift/console-operator/pkg/console/starter" | |||
"github.com/openshift/console-operator/pkg/console/subresource/configmap" | |||
"github.com/openshift/console-operator/pkg/console/subresource/consoleserver" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a good one to bring back.
Tempting to separate it out into a separate PR, just in case backports of this PR come into play.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean just to have the config_builder_test.go
and config_merger_test.go
disabled? cause we will need to update the config_builder.go
with the necessary logic anyway
pkg/console/operator/sync_v400.go
Outdated
@@ -82,6 +82,9 @@ func (co *consoleOperator) sync_v400(updatedOperatorConfig *operatorv1.Console, | |||
// The sync loop may not settle, we are unable to honor it in current state. | |||
status.HandleProgressingOrDegraded(updatedOperatorConfig, "CustomLogoSync", customLogoErrReason, customLogoError) | |||
|
|||
defaultIngressCertConfigMap, defaultIngressCertErrReason, defaultIngressCertError := co.ValidateDefaultIngressCertConfigMap() | |||
status.HandleProgressingOrDegraded(updatedOperatorConfig, "DefaultIngressCertValidation", defaultIngressCertErrReason, defaultIngressCertError) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One thing about bringing this back, we need to make sure we don't panic again, per this bug:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
true, we are missing error check.. need to add:
if defaultIngressCertError != nil {
return defaultIngressCertError
}
I believe we need this in |
@benjaminapetersen PR updated. |
/retest |
/lgtm thanks! |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: benjaminapetersen, jhadvig The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Reverting and renaming the revert of the #328 based on openshift/enhancements#126
/assign @benjaminapetersen