Merge pull request #2113 from cybertron/fix-bm-upgrade

Bug 1875237: Add etcdDiscoveryDomain back to controllerconfig crd
openshift · Sep 23, 2020 · 88baac2 · 88baac2
2 parents fc268ac + e6f66f6
commit 88baac2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/manifests/controllerconfig.crd.yaml b/manifests/controllerconfig.crd.yaml
@@ -68,6 +68,9 @@ spec:
             clusterDNSIP:
               description: clusterDNSIP is the cluster DNS IP address
               type: string
+            etcdDiscoveryDomain:
+              description: etcdDiscoveryDomain is deprecated, use infra.status.etcdDiscoveryDomain instead
+              type: string
             images:
               description: images is map of images that are used by the controller
                 to render templates under ./templates/

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go