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.

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

Jump to bottom

Bug 1853270: Update console config on change #445

Merged
merged 1 commit into from Jul 10, 2020
Merged

Bug 1853270: Update console config on change #445

merged 1 commit into from Jul 10, 2020

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Jul 2, 2020

We should be updating the console config status only when the consoleURL change

/assign @spadgett

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Jul 2, 2020
@openshift-ci-robot
Copy link
Contributor

@jhadvig: This pull request references Bugzilla bug 1853270, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1853270: Update console config on change

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Jul 2, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2020
spadgett
spadgett approved these changes Jul 2, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2020
spadgett
spadgett reviewed Jul 2, 2020
View reviewed changes
pkg/console/operator/sync_v400.go Outdated
@@ -200,12 +200,13 @@ func (co *consoleOperator) sync_v400(updatedOperatorConfig *operatorv1.Console,
func (co *consoleOperator) SyncConsoleConfig(consoleConfig *configv1.Console, consoleURL string) (*configv1.Console, error) {
oldURL := consoleConfig.Status.ConsoleURL
updated := consoleConfig.DeepCopy()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could move this inside the if since we only need to copy if we're doing an update

spadgett
spadgett reviewed Jul 2, 2020
View reviewed changes
pkg/console/operator/sync_v400.go Outdated
Comment on lines 202 to 207
updated := consoleConfig.DeepCopy()
metrics.HandleConsoleURL(oldURL, consoleURL)
if updated.Status.ConsoleURL != consoleURL {
klog.V(4).Infof("updating console.config.openshift.io with url: %v", consoleURL)
updated.Status.ConsoleURL = consoleURL
return co.consoleConfigClient.UpdateStatus(co.ctx, updated, metav1.UpdateOptions{})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
updated := consoleConfig.DeepCopy()
metrics.HandleConsoleURL(oldURL, consoleURL)
if updated.Status.ConsoleURL != consoleURL {
klog.V(4).Infof("updating console.config.openshift.io with url: %v", consoleURL)
updated.Status.ConsoleURL = consoleURL
return co.consoleConfigClient.UpdateStatus(co.ctx, updated, metav1.UpdateOptions{})
metrics.HandleConsoleURL(oldURL, consoleURL)
if oldURL != consoleURL {
klog.V(4).Infof("updating console.config.openshift.io with url: %v", consoleURL)
updated := consoleConfig.DeepCopy()
updated.Status.ConsoleURL = consoleURL
return co.consoleConfigClient.UpdateStatus(co.ctx, updated, metav1.UpdateOptions{})

pkg/console/operator/sync_v400.go Show resolved Hide resolved
@spadgett
Copy link
Member

spadgett commented Jul 2, 2020

/hold
since i asked some questions after tagging :)

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 2, 2020
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2020
@jhadvig
Copy link
Member Author

jhadvig commented Jul 3, 2020

@spadgett comment addressed. PTAL

@jhadvig
Copy link
Member Author

jhadvig commented Jul 3, 2020

/retest

@spadgett
Copy link
Member

spadgett commented Jul 6, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 6, 2020
@spadgett
Copy link
Member

spadgett commented Jul 6, 2020

/retest

1 similar comment
@jhadvig
Copy link
Member Author

jhadvig commented Jul 7, 2020

/retest

@jhadvig
Copy link
Member Author

jhadvig commented Jul 7, 2020

/test e2e-gcp

@spadgett
Copy link
Member

spadgett commented Jul 7, 2020

/retest

3 similar comments
@spadgett
Copy link
Member

spadgett commented Jul 7, 2020

/retest

@jhadvig
Copy link
Member Author

jhadvig commented Jul 7, 2020

/retest

@spadgett
Copy link
Member

spadgett commented Jul 9, 2020

/retest

spadgett
spadgett approved these changes Jul 9, 2020
View reviewed changes
Copy link
Member

@spadgett spadgett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 9, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, spadgett

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

6 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit eb91db7 into openshift:master Jul 10, 2020
@openshift-ci-robot
Copy link
Contributor

@jhadvig: All pull requests linked via external trackers have merged: openshift/console-operator#445. Bugzilla bug 1853270 has been moved to the MODIFIED state.

In response to this:

Bug 1853270: Update console config on change

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@vrutkovs
Copy link
Member

/cherry-pick release-4.5

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jul 10, 2020
Merged
@openshift-cherrypick-robot
Copy link

@vrutkovs: new pull request created: #446

In response to this:

/cherry-pick release-4.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spadgett spadgett spadgett approved these changes

@bparees bparees Awaiting requested review from bparees

Assignees

@spadgett spadgett

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@jhadvig @openshift-ci-robot @spadgett @openshift-bot @vrutkovs @openshift-cherrypick-robot @openshift-merge-robot