Skip to content

pkg/asset/manifests/infrastructure: Set status.platformStatus.aws.region #1725

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

Closed
wking wants to merge 2 commits into from
Closed

pkg/asset/manifests/infrastructure: Set status.platformStatus.aws.region #1725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54d03d2
vendor/github.com/openshift/api: Bump to pick up AWS Region
wking May 7, 2019
8b3b375
pkg/asset/manifests/infrastructure: Set status.platformStatus.aws.region
wking 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
4 changes: 2 additions & 2 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.

41 changes: 22 additions & 19 deletions pkg/asset/manifests/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,24 +53,6 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
cloudproviderconfig := &CloudProviderConfig{}
dependencies.Get(clusterID, installConfig, cloudproviderconfig)

var platform configv1.PlatformType
switch installConfig.Config.Platform.Name() {
case aws.Name:
platform = configv1.AWSPlatformType
case none.Name:
platform = configv1.NonePlatformType
case libvirt.Name:
platform = configv1.LibvirtPlatformType
case openstack.Name:
platform = configv1.OpenStackPlatformType
case vsphere.Name:
platform = configv1.VSpherePlatformType
case azure.Name:
platform = configv1.AzurePlatformType
default:
platform = configv1.NonePlatformType
}

config := &configv1.Infrastructure{
TypeMeta: metav1.TypeMeta{
APIVersion: configv1.SchemeGroupVersion.String(),
Expand All @@ -82,13 +64,34 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
},
Status: configv1.InfrastructureStatus{
InfrastructureName: clusterID.InfraID,
Platform: platform,
APIServerURL: getInternalAPIServerURL(installConfig.Config),
APIServerInternalURL: getInternalAPIServerURL(installConfig.Config),
EtcdDiscoveryDomain: getEtcdDiscoveryDomain(installConfig.Config),
PlatformStatus: &configv1.PlatformStatus{},
},
}

switch installConfig.Config.Platform.Name() {
case aws.Name:
config.Status.PlatformStatus.Type = configv1.AWSPlatformType
config.Status.PlatformStatus.AWS = &configv1.AWSPlatformStatus{
Region: installConfig.Config.Platform.AWS.Region,
}
case none.Name:
config.Status.PlatformStatus.Type = configv1.NonePlatformType
case libvirt.Name:
config.Status.PlatformStatus.Type = configv1.LibvirtPlatformType
case openstack.Name:
config.Status.PlatformStatus.Type = configv1.OpenStackPlatformType
case vsphere.Name:
config.Status.PlatformStatus.Type = configv1.VSpherePlatformType
case azure.Name:
config.Status.PlatformStatus.Type = configv1.AzurePlatformType
Copy link

@dmage dmage May 23, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

We also need LocationID for Azure, so that we know in which region we should create Storage Account.

default:
config.Status.PlatformStatus.Type = configv1.NonePlatformType
}
config.Status.Platform = config.Status.PlatformStatus.Type

if cloudproviderconfig.ConfigMap != nil {
// set the configmap reference.
config.Spec.CloudConfig = configv1.ConfigMapFileReference{Name: cloudproviderconfig.ConfigMap.Name, Key: cloudProviderConfigDataKey}
Expand Down
41 changes: 33 additions & 8 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.

44 changes: 43 additions & 1 deletion vendor/github.com/openshift/api/config/v1/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.

22 changes: 21 additions & 1 deletion 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.