diff --git a/pkg/apis/machineconfiguration.openshift.io/v1/types.go b/pkg/apis/machineconfiguration.openshift.io/v1/types.go index 062946d3aa..affaf6c0f7 100644 --- a/pkg/apis/machineconfiguration.openshift.io/v1/types.go +++ b/pkg/apis/machineconfiguration.openshift.io/v1/types.go @@ -94,6 +94,10 @@ type ControllerConfigSpec struct { // proxy holds the current proxy configuration for the nodes Proxy *configv1.ProxyStatus `json:"proxy"` + + // infra holds the infrastructure details + // TODO this makes platform redundant as everything is contained inside Infra.Status + Infra *configv1.Infrastructure `json:"infra"` } // ControllerConfigStatus is the status for ControllerConfig diff --git a/pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go b/pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go index cffc2beb51..ba22402a58 100644 --- a/pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go +++ b/pkg/apis/machineconfiguration.openshift.io/v1/zz_generated.deepcopy.go @@ -253,6 +253,11 @@ func (in *ControllerConfigSpec) DeepCopyInto(out *ControllerConfigSpec) { *out = new(configv1.ProxyStatus) **out = **in } + if in.Infra != nil { + in, out := &in.Infra, &out.Infra + *out = new(configv1.Infrastructure) + (*in).DeepCopyInto(*out) + } return } diff --git a/pkg/operator/render.go b/pkg/operator/render.go index 523ebffc1b..abbd72e09d 100644 --- a/pkg/operator/render.go +++ b/pkg/operator/render.go @@ -88,6 +88,7 @@ func createDiscoveredControllerConfigSpec(infra *configv1.Infrastructure, networ CloudProviderConfig: "", EtcdDiscoveryDomain: infra.Status.EtcdDiscoveryDomain, Platform: platform, + Infra: infra, } if proxy != nil {