ClusterRegistry diagnostic: fix address mismatch #16188
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci-robot
added
the
size/XS
openshift-merge-robot
added
the
approved
sosiouxme
added
component/diagnostics
kind/bug
liggitt
reviewed
Sep 7, 2017
pkg/diagnostics/cluster/registry.go
Outdated
| serviceIpPort := fmt.Sprintf("%s:%d", service.Spec.ClusterIP, service.Spec.Ports[0].Port) | ||
| serviceHostPort := fmt.Sprintf("%s.%s.svc:%d", registryName, service.ObjectMeta.Namespace, service.Spec.Ports[0].Port) | ||
| if cacheHost != serviceIpPort && cacheHost != serviceHostPort { | ||
| r.Error("DClu1019", nil, fmt.Sprintf(clRegISMismatch, registryName, serviceIpPort, cacheHost)) |
Contributor
There was a problem hiding this comment.
Should the message say something about serviceHostPort?
Member
Author
There was a problem hiding this comment.
I guess that would make sense, thanks.
The registry for imagestreams was previously recorded as an IP, which could change if the registry service were re-created. Now it is a cluster hostname, which should be unchanging even if re-created. Just ensure it is the right hostname. fixes bug 1488059 https://bugzilla.redhat.com/show_bug.cgi?id=1488059
sosiouxme
force-pushed
the
20170906-oadm-diag-clusterregistry-bz1488059
branch
from
17065ca to
5bbe044
Compare
openshift-ci-robot
added
size/M
Member
Author
|
@liggitt addressed that. Is there a magic bot command to indicate this should be cherry-picked to 3.6? |
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: liggitt, sosiouxme The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
Contributor
|
Automatic merge from submit-queue (batch tested with PRs 14825, 15756, 16178, 16188, 16189) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The registry for imagestreams was previously recorded as an IP, which
could change if the registry service were re-created. Now it is a
cluster hostname, which should be unchanging even if re-created. Just
ensure it is the right hostname.
fix bug 1488059
https://bugzilla.redhat.com/show_bug.cgi?id=1488059