Skip to content
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

Jump to bottom

Bug 1813012: Remove unused etcd discovery domain #4067

Merged
merged 1 commit into from
Nov 19, 2020
+0 −8
Merged

Bug 1813012: Remove unused etcd discovery domain #4067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion data/data/bootstrap/files/usr/local/bin/bootkube.sh.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ then
--etcd-ca=/assets/tls/etcd-ca-bundle.crt \
--etcd-ca-key=/assets/tls/etcd-signer.key \
--manifest-etcd-image="${MACHINE_CONFIG_ETCD_IMAGE}" \
--etcd-discovery-domain={{.ClusterDomain}} \
retroflexer marked this conversation as resolved.
Show resolved Hide resolved
--manifest-cluster-etcd-operator-image="${CLUSTER_ETCD_OPERATOR_IMAGE}" \
--manifest-setup-etcd-env-image="${MACHINE_CONFIG_OPERATOR_IMAGE}" \
--manifest-kube-client-agent-image="${MACHINE_CONFIG_KUBE_CLIENT_AGENT_IMAGE}" \
Expand Down
2 changes: 0 additions & 2 deletions pkg/asset/ignition/bootstrap/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ type bootstrapTemplateData struct {
Proxy *configv1.ProxyStatus
Registries []sysregistriesv2.Registry
BootImage string
ClusterDomain string
PlatformData platformTemplateData
}

Expand Down Expand Up @@ -259,7 +258,6 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig, releaseI
Proxy: &proxy.Status,
Registries: registries,
BootImage: string(*rhcosImage),
ClusterDomain: installConfig.ClusterDomain(),
PlatformData: platformData,
}, nil
}
Expand Down
1 change: 0 additions & 1 deletion pkg/asset/manifests/infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ func (i *Infrastructure) Generate(dependencies asset.Parents) error {
InfrastructureName: clusterID.InfraID,
APIServerURL: getAPIServerURL(installConfig.Config),
APIServerInternalURL: getInternalAPIServerURL(installConfig.Config),
EtcdDiscoveryDomain: getEtcdDiscoveryDomain(installConfig.Config),
Copy link
Contributor

Choose a reason for hiding this comment

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

And i think we need to also update the API https://github.com/openshift/api/blob/master/config/v1/types_infrastructure.go#L67 to be //+optional

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Created a PR to make EtcdDiscoveryDomain optional:

openshift/api#767

PlatformStatus: &configv1.PlatformStatus{},
},
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/asset/manifests/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,3 @@ 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()
}