Skip to content

Bug 1706689: asset/manifests: internal api server URL for infrastructure #1718

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

Merged
openshift-merge-robot merged 3 commits into from
May 8, 2019
Merged

Bug 1706689: asset/manifests: internal api server URL for infrastructure #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a61cd1
vendor: bump openshift/api
abhinavdahiya May 7, 2019
32ee8da
asset/manifests: set internal api server URL for infrastructure
abhinavdahiya May 7, 2019
7aa6482
cmd: catch up to openshift/api dropping failing condition
abhinavdahiya May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions cmd/openshift-install/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,7 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
clusterVersionContext, cancel := context.WithTimeout(ctx, timeout)
defer cancel()

failing := configv1.ClusterStatusConditionType("Failing")
Copy link
Member

@wking wking May 7, 2019

Choose a reason for hiding this comment

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

Is this just until the CVO moves to Degraded?

Copy link
Contributor Author

@abhinavdahiya abhinavdahiya May 7, 2019

Choose a reason for hiding this comment

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

no plans for CVO to move to Degraded

Copy link
Member

@wking wking May 7, 2019

Choose a reason for hiding this comment

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

We're just going to translate operator Degradeds into CVO Failings forever?

Copy link
Contributor Author

@abhinavdahiya abhinavdahiya May 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

no plans for CVO to move to Degraded
We're just going to translate operator Degradeds into CVO Failings forever?

forever i can't say ;)
for now yes

We're

the installer only cares about the fact that CVO reports failing, its only a consumer. the installer shouldn't care

Copy link
Member

@eparis eparis May 7, 2019

Choose a reason for hiding this comment

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

every team was told to move. why didn't the cvo move?

var lastError string
_, err = clientwatch.UntilWithSync(
clusterVersionContext,
Expand All @@ -343,8 +344,8 @@ func waitForInitializedCluster(ctx context.Context, config *rest.Config) error {
if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorAvailable) {
return true, nil
}
if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorFailing) {
lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, configv1.OperatorFailing).Message
if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, failing) {
lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, failing).Message
} else if cov1helpers.IsStatusConditionTrue(cv.Status.Conditions, configv1.OperatorProgressing) {
lastError = cov1helpers.FindStatusCondition(cv.Status.Conditions, configv1.OperatorProgressing).Message
}
Expand Down
9 changes: 5 additions & 4 deletions pkg/asset/manifests/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
// not namespaced
},
Status: configv1.InfrastructureStatus{
InfrastructureName: clusterID.InfraID,
Platform: platform,
APIServerURL: getAPIServerURL(installConfig.Config),
EtcdDiscoveryDomain: getEtcdDiscoveryDomain(installConfig.Config),
InfrastructureName: clusterID.InfraID,
Platform: platform,
APIServerURL: getInternalAPIServerURL(installConfig.Config),
APIServerInternalURL: getInternalAPIServerURL(installConfig.Config),
EtcdDiscoveryDomain: getEtcdDiscoveryDomain(installConfig.Config),
},
}

Expand Down
4 changes: 4 additions & 0 deletions pkg/asset/manifests/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ func configMap(namespace, name string, data genericData) *configurationObject {
}

func getAPIServerURL(ic *types.InstallConfig) string {
return fmt.Sprintf("https://api.%s:6443", ic.ClusterDomain())
}

func getInternalAPIServerURL(ic *types.InstallConfig) string {
return fmt.Sprintf("https://api-int.%s:6443", ic.ClusterDomain())
}

Expand Down
8 changes: 4 additions & 4 deletions vendor/github.com/openshift/api/config/v1/types_cluster_operator.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion vendor/github.com/openshift/api/config/v1/types_cluster_version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions vendor/github.com/openshift/api/config/v1/types_infrastructure.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading