Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Gopkg.lock

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

4 changes: 3 additions & 1 deletion pkg/operator/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ func RenderBootstrap(
templatectrl.KubeClientAgentImageKey: imgs.KubeClientAgent,
}

config := getRenderConfig("", string(filesData[kubeAPIServerServingCA]), spec, imgs, infra.Status.APIServerURL)
// TODO(abhinavdahiya): remove this migration when https://github.com/openshift/installer/pull/1718 merges
apiServerURL := getAPIServerURL(infra)
config := getRenderConfig("", string(filesData[kubeAPIServerServingCA]), spec, imgs, apiServerURL)

manifests := []struct {
name string
Expand Down
13 changes: 12 additions & 1 deletion pkg/operator/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,11 @@ func (optr *Operator) sync(key string) error {
templatectrl.KubeClientAgentImageKey: imgs.KubeClientAgent,
}

// TODO(abhinavdahiya): remove this migration when https://github.com/openshift/installer/pull/1718 merges
apiServerURL := getAPIServerURL(infra)

// create renderConfig
rc := getRenderConfig(namespace, string(kubeAPIServerServingCABytes), spec, imgs, infra.Status.APIServerURL)
rc := getRenderConfig(namespace, string(kubeAPIServerServingCABytes), spec, imgs, apiServerURL)
// syncFuncs is the list of sync functions that are executed in order.
// any error marks sync as failure but continues to next syncFunc
var syncFuncs = []syncFunc{
Expand Down Expand Up @@ -467,3 +470,11 @@ func getRenderConfig(tnamespace, kubeAPIServerServingCA string, ccSpec *mcfgv1.C
KubeAPIServerServingCA: kubeAPIServerServingCA,
}
}

func getAPIServerURL(infra *configv1.Infrastructure) string {
apiServerURL := infra.Status.APIServerInternalURL
if apiServerURL == "" {
apiServerURL = infra.Status.APIServerURL
}
return apiServerURL
}

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

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

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