Skip to content

Commit

Permalink
Merge pull request #2425 from danehans/remove_ext_api
Browse files Browse the repository at this point in the history
Fixes Bug 1757975: asset/manifests: Removes external api server from default noProxy
  • Loading branch information
openshift-merge-robot authored Oct 8, 2019
2 parents 28f4cbd + 0ac4b5a commit c1e0bab
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions pkg/asset/manifests/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ func (p *Proxy) Generate(dependencies asset.Parents) error {
// https://docs.microsoft.com/en-us/azure/virtual-machines/windows/instance-metadata-service
// https://cloud.google.com/compute/docs/storing-retrieving-metadata
func createNoProxy(installConfig *installconfig.InstallConfig, network *Networking) (string, error) {
apiServerURL, err := url.Parse(getAPIServerURL(installConfig.Config))
if err != nil {
return "", errors.New("failed parsing API server when creating Proxy manifest")
}
internalAPIServer, err := url.Parse(getInternalAPIServerURL(installConfig.Config))
if err != nil {
return "", errors.New("failed parsing internal API server when creating Proxy manifest")
Expand All @@ -129,7 +125,6 @@ func createNoProxy(installConfig *installconfig.InstallConfig, network *Networki
".svc",
".cluster.local",
network.Config.Spec.ServiceNetwork[0],
apiServerURL.Hostname(),
internalAPIServer.Hostname(),
installConfig.Config.Networking.MachineCIDR.String(),
)
Expand Down

0 comments on commit c1e0bab

Please sign in to comment.