Merge pull request #1558 from openshift-cherrypick-robot/cherry-pick-…

…1554-to-release-4.4 Bug 1812211: [release-4.4] manifests/controllerconfig: make infra nullable
openshift · Mar 13, 2020 · b78542a · b78542a
2 parents 53d03e7 + da48c66
commit b78542a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/manifests/controllerconfig.crd.yaml b/manifests/controllerconfig.crd.yaml
@@ -336,6 +336,7 @@ spec:
                                 as a static pod to serve those hostnames to the nodes
                                 in the cluster.
                               type: string
+              nullable: true
             kubeAPIServerServingCAData:
               description: kubeAPIServerServingCAData managed Kubelet to API Server
                 Cert... Rotated automatically

diff --git a/pkg/apis/machineconfiguration.openshift.io/v1/types.go b/pkg/apis/machineconfiguration.openshift.io/v1/types.go
@@ -84,6 +84,7 @@ type ControllerConfigSpec struct {
 
 	// infra holds the infrastructure details
 	// TODO this makes platform redundant as everything is contained inside Infra.Status
+	// +nullable
 	Infra *configv1.Infrastructure `json:"infra"`
 
 	// kubeletIPv6 is true to force a single-stack IPv6 kubelet config

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
@@ -981,6 +981,7 @@ spec:
                                 as a static pod to serve those hostnames to the nodes
                                 in the cluster.
                               type: string
+              nullable: true
             kubeAPIServerServingCAData:
               description: kubeAPIServerServingCAData managed Kubelet to API Server
                 Cert... Rotated automatically