Skip to content

Commit

Permalink
manifests: restore setting of etcdDiscoveryDomain in infrastructure
Browse files Browse the repository at this point in the history
With openshift#4067, the etcdDiscoveryDomain
field is no longer set in the infrastructure.config.openshift.io manifest.
However, the cluster-network-operator relies on that field when syncing the
status of proxy.config.openshift.io [1].

[1] https://github.com/openshift/cluster-network-operator/blob/c23495cf6e6ffeffc0290c85ee4608102f7b47d1/pkg/util/proxyconfig/no_proxy.go#L113
  • Loading branch information
staebler committed Dec 9, 2020
1 parent 3029699 commit e37bacb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkg/asset/manifests/infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
InfrastructureName: clusterID.InfraID,
APIServerURL: getAPIServerURL(installConfig.Config),
APIServerInternalURL: getInternalAPIServerURL(installConfig.Config),
EtcdDiscoveryDomain: getEtcdDiscoveryDomain(installConfig.Config),
PlatformStatus: &configv1.PlatformStatus{},
},
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/asset/manifests/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ func getAPIServerURL(ic *types.InstallConfig) string {
func getInternalAPIServerURL(ic *types.InstallConfig) string {
return fmt.Sprintf("https://api-int.%s:6443", ic.ClusterDomain())
}

func getEtcdDiscoveryDomain(ic *types.InstallConfig) string {
return ic.ClusterDomain()
}

0 comments on commit e37bacb

Please sign in to comment.