Skip to content
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

Merged
merged 1 commit into from Dec 13, 2019

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Dec 10, 2019

Reverting and renaming the revert of the #328 based on openshift/enhancements#126

/assign @benjaminapetersen

@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 10, 2019
@@ -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"
Copy link
Contributor

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.

Copy link
Member Author

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

@@ -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)
Copy link
Contributor

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:

https://bugzilla.redhat.com/show_bug.cgi?id=1778930

Copy link
Member Author

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
}

@benjaminapetersen
Copy link
Contributor

I believe we need this in 4.4,4.3,4.2,4.1. Backporting with 11 file changes may be fun :) Gonna verify that.

@jhadvig
Copy link
Member Author

jhadvig commented Dec 11, 2019

@benjaminapetersen PR updated.
Regarding the splitting of the PR, it doesn't make sense since we will have to do it manually for 4.0 and 4.1 completely, since we are missing the subresources dir. For 4.2 we need to change just two files manually.

@jhadvig
Copy link
Member Author

jhadvig commented Dec 12, 2019

/retest

@benjaminapetersen
Copy link
Contributor

/lgtm

thanks!

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 13, 2019
@openshift-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2019
@openshift-merge-robot openshift-merge-robot merged commit a4d4eb9 into openshift:master Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants