Skip to content

CORS-4549: gcp: set universe domain in Infrastructure status for GCD #10759

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-bot merged 3 commits into from
Aug 13, 2026
Merged

CORS-4549: gcp: set universe domain in Infrastructure status for GCD #10759

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
c845e7f
gcp: set universe domain in Infrastructure status for GCD
patrickdillon Aug 10, 2026
83cb331
go.mod: bump openshift/api
patrickdillon Aug 13, 2026
1a0c7cc
vendori: openshift/api bump
patrickdillon Aug 13, 2026
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ require (
github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.10.3
github.com/nutanix-cloud-native/prism-go-client v0.8.0
github.com/onsi/gomega v1.42.1
github.com/openshift/api v0.0.0-20260806145859-7f3965b4f603
github.com/openshift/api v0.0.0-20260812104507-9d7eaabdfe05
github.com/openshift/assisted-image-service v0.0.0-20260428115106-2b81dd8e7120
github.com/openshift/assisted-service/api v0.0.0-20260722223301-f50c5b20c7e1
github.com/openshift/assisted-service/client v0.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,8 +879,8 @@ github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJw
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
github.com/opencontainers/runtime-spec v1.2.1 h1:S4k4ryNgEpxW1dzyqffOmhI1BHYcjzU8lpJfSlR0xww=
github.com/opencontainers/runtime-spec v1.2.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/openshift/api v0.0.0-20260806145859-7f3965b4f603 h1:4RHgmb/icrh6C8+Ofgr79KRqds2GjcUpjuHtADIPrAQ=
github.com/openshift/api v0.0.0-20260806145859-7f3965b4f603/go.mod h1:k6qH5QOVa5GDln2VVm8Jz4NV3Z7R2SATHFLwGS6Wh3M=
github.com/openshift/api v0.0.0-20260812104507-9d7eaabdfe05 h1:Ti5JDaDKqhnB0xFb/y/ZeOPR+v+GZANAkZZ7shVLKWA=
github.com/openshift/api v0.0.0-20260812104507-9d7eaabdfe05/go.mod h1:k6qH5QOVa5GDln2VVm8Jz4NV3Z7R2SATHFLwGS6Wh3M=
github.com/openshift/assisted-image-service v0.0.0-20260428115106-2b81dd8e7120 h1:fxnvVDuqfnAz9jCuritFrsb6IK33dxc/MxC9Gtv+nlk=
github.com/openshift/assisted-image-service v0.0.0-20260428115106-2b81dd8e7120/go.mod h1:eLxB7EHTDEvuJHobsVZsyMKOFkVATz4aGAwNtSGMdyM=
github.com/openshift/assisted-service/api v0.0.0-20260722223301-f50c5b20c7e1 h1:CQULurVWElnk8kTQflgNZcu82xcw4DQzwvv2PPC33i4=
Expand Down
16 changes: 16 additions & 0 deletions pkg/asset/manifests/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ import (
"sigs.k8s.io/yaml"

configv1 "github.com/openshift/api/config/v1"
"github.com/openshift/api/features"
"github.com/openshift/installer/pkg/asset"
"github.com/openshift/installer/pkg/asset/installconfig"
gcpic "github.com/openshift/installer/pkg/asset/installconfig/gcp"
externalinfra "github.com/openshift/installer/pkg/asset/manifests/external"
gcpmanifests "github.com/openshift/installer/pkg/asset/manifests/gcp"
nutanixinfra "github.com/openshift/installer/pkg/asset/manifests/nutanix"
Expand Down Expand Up @@ -222,6 +224,20 @@ func (i *Infrastructure) Generate(ctx context.Context, dependencies asset.Parent
config.Status.PlatformStatus.GCP.ResourceTags = resourceTags
}

if installConfig.Config.Enabled(features.FeatureGateGCPSovereignCloudInstall) {
ssn, err := gcpic.GetSession(ctx)
if err != nil {
return fmt.Errorf("could not get GCP session: %w", err)
}
ud, err := ssn.Credentials.GetUniverseDomain()
if err != nil {
return fmt.Errorf("could not get GCP universe domain: %w", err)
}
if gcp.IsNonDefaultUniverseDomain(ud) {
config.Status.PlatformStatus.GCP.UniverseDomain = ud
}
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

// If the user has requested the use of a DNS provisioned by them, then OpenShift needs to
// start an in-cluster DNS for the installation to succeed. The user can then configure their
// DNS post-install.
Expand Down
21 changes: 21 additions & 0 deletions vendor/github.com/openshift/api/config/v1alpha1/types_cluster_monitoring.go
View file
Open in desktop

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

17 changes: 17 additions & 0 deletions vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions vendor/github.com/openshift/api/config/v1alpha1/zz_generated.model_name.go
View file
Open in desktop

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

10 changes: 10 additions & 0 deletions vendor/github.com/openshift/api/config/v1alpha1/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.

10 changes: 5 additions & 5 deletions vendor/github.com/openshift/api/features/features.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ github.com/opencontainers/image-spec/specs-go/v1
# github.com/opencontainers/runtime-spec v1.2.1
## explicit
github.com/opencontainers/runtime-spec/specs-go
# github.com/openshift/api v0.0.0-20260806145859-7f3965b4f603
# github.com/openshift/api v0.0.0-20260812104507-9d7eaabdfe05
## explicit; go 1.26.0
github.com/openshift/api/annotations
github.com/openshift/api/config/v1
Expand Down