[release-4.1] Bug 1734512: missing config updates for infrastructure crd

glide.yaml

@@ -2,9 +2,115 @@ package: github.com/openshift/cluster-config-operator
 import:
 - package: github.com/openshift/library-go
   version: master
+- package: github.com/openshift/api
+  version: dedfb47b1ff14bbd03727fa5720f63d8dc7bea5b
 - package: k8s.io/apiextensions-apiserver
   repo: https://github.com/openshift/kubernetes-apiextensions-apiserver
   version: origin-4.1-kubernetes-1.13.4
 - package: sigs.k8s.io/controller-tools
   repo: https://github.com/openshift/kubernetes-sigs-controller-tools
   version: origin-4.1-kubernetes-1.13.4
+
+# generated by tools/depcheck
+- package: github.com/Azure/go-ansiterm
+  version: d6e3b3328b783f23731bc4d058875b0371ff8109
+- package: github.com/beorn7/perks
+  version: 3ac7bf7a47d159a033b107610db8a1b6575507a4
+- package: github.com/davecgh/go-spew
+  version: d8f796af33cc11cb798c1aaeb27a4ebc5099927d
+- package: github.com/docker/docker
+  version: a9fbbdc8dd8794b20af358382ab780559bca589d
+- package: github.com/evanphx/json-patch
+  version: 5858425f75500d40c52783dce87d085a483ce135
+- package: github.com/ghodss/yaml
+  version: 25d852aebe32c875e9c044af3eef9c7dc6bc777f
+- package: github.com/gobuffalo/envy
+  version: 043cb4b8af871b49563291e32c66bb84378a60ac
+- package: github.com/gogo/protobuf
+  version: 342cbe0a04158f6dcb03ca0079991a51a4248c02
+- package: github.com/golang/groupcache
+  version: 02826c3e79038b59d737d3b1c0a1d937f71a4433
+- package: github.com/golang/protobuf
+  version: b4deda0973fb4c70b50d226b1af49f3da59f5265
+- package: github.com/google/btree
+  version: 7d79101e329e5a3adf994758c578dab82b90c017
+- package: github.com/google/gofuzz
+  version: 44d81051d367757e1c7c6a5a86423ece9afcf63c
+- package: github.com/googleapis/gnostic
+  version: 0c5108395e2debce0d731cf0287ddf7242066aba
+- package: github.com/gregjones/httpcache
+  version: 787624de3eb7bd915c329cba748687a3b22666a6
+- package: github.com/imdario/mergo
+  version: 9316a62528ac99aaecb4e47eadd6dc8aa6533d58
+- package: github.com/inconshreveable/mousetrap
+  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
+- package: github.com/joho/godotenv
+  version: 5c0e6c6ab1a0a9ef0a8822cba3a05d62f7dad941
+- package: github.com/json-iterator/go
+  version: ab8a2e0c74be9d3be70b3184d9acc634935ded82
+- package: github.com/markbates/inflect
+  version: d582c680dc4d29c2279628ae00e743005bfcd4fe
+- package: github.com/matttproud/golang_protobuf_extensions
+  version: c12348ce28de40eed0136aa2b644d0ee0650e56c
+- package: github.com/modern-go/concurrent
+  version: bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94
+- package: github.com/modern-go/reflect2
+  version: 94122c33edd36123c84d5368cfb2b69df93a0ec8
+- package: github.com/peterbourgon/diskv
+  version: 5f041e8faa004a95c88a202771f4cc3e991971e6
+- package: github.com/pkg/errors
+  version: 645ef00459ed84a119197bfb8d8205042c6df63d
+- package: github.com/prometheus/client_golang
+  version: e7e903064f5e9eb5da98208bae10b475d4db0f8c
+- package: github.com/prometheus/client_model
+  version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6
+- package: github.com/prometheus/common
+  version: 13ba4ddd0caa9c28ca7b7bffe1dfa9ed8d5ef207
+- package: github.com/prometheus/procfs
+  version: 65c1f6f8f0fc1e2185eb9863a3bc751496404259
+- package: github.com/rogpeppe/go-internal
+  version: 438578804ca6f31be148c27683afc419ce47c06e
+- package: github.com/sirupsen/logrus
+  version: 89742aefa4b206dcf400792f3bd35b542998eb3b
+- package: github.com/spf13/afero
+  version: 588a75ec4f32903aa5e39a2619ba6a4631e28424
+- package: github.com/spf13/cobra
+  version: c439c4fa093711d42e1b01acb1235b52004753c1
+- package: github.com/spf13/pflag
+  version: 583c0c0531f06d5278b7d917446061adc344b5cd
+- package: golang.org/x/crypto
+  version: de0752318171da717af4ce24d0a2e8626afaeb11
+- package: golang.org/x/net
+  version: 0ed95abb35c445290478a5348a7b38bb154135fd
+- package: golang.org/x/oauth2
+  version: a6bd8cefa1811bd24b86f8902872e4e8225f74c4
+- package: golang.org/x/sys
+  version: 95c6576299259db960f6c5b9b69ea52422860fce
+- package: golang.org/x/text
+  version: b19bf474d317b857955b12035d2c5acb57ce8b01
+- package: golang.org/x/time
+  version: f51c12702a4d776e4c1fa9b0fabab841babae631
+- package: golang.org/x/tools
+  version: 5cec639030af3a6ada2732d9bfa1d3731ed55106
+- package: google.golang.org/appengine
+  version: 54a98f90d1c46b7731eb8fb305d2a321c30ef610
+- package: gopkg.in/inf.v0
+  version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
+- package: gopkg.in/yaml.v2
+  version: 51d6538a90f86fe93ac480b35f37b2be17fef232
+- package: k8s.io/api
+  version: 5cb15d34447165a97c76ed5a60e4e99c8a01ecfe
+- package: k8s.io/apimachinery
+  version: 86fb29eff6288413d76bd8506874fddd9fccdff0
+- package: k8s.io/apiserver
+  version: 79427f02047f9189a75b8cdaadccaf65a126853e
+- package: k8s.io/client-go
+  version: b40b2a5939e43f7ffe0028ad67586b7ce50bb675
+- package: k8s.io/gengo
+  version: e17681d19d3ac4837a019ece36c2a0ec31ffe985
+- package: k8s.io/klog
+  version: e531227889390a39d9533dde61f590fe9f4b0035
+- package: k8s.io/kube-openapi
+  version: c59034cc13d587f5ef4e85ca0ade0c1866ae8e1d
+- package: sigs.k8s.io/yaml
+  version: fd68e9863619f6ec2fdd8625fe1f02e7c877e480

manifests/0000_10_config-operator_01_infrastructure.crd.yaml

@@ -52,11 +52,16 @@ spec:
           description: status holds observed values from the cluster. They may not
             be overridden.
           properties:
+            apiServerInternalURI:
+              description: apiServerInternalURL is a valid URI with scheme(http/https),
+                address and port.  apiServerInternalURL can be used by components
+                like kubelets, to contact the Kubernetes API server using the infrastructure
+                provider rather than Kubernetes networking.
+              type: string
             apiServerURL:
-              description: apiServerURL is a valid URL with scheme(http/https), address
-                and port. apiServerURL can be used by components like kubelet on machines,
-                to contact the `apisever` using the infrastructure provider rather
-                than the kubernetes networking.
+              description: apiServerURL is a valid URI with scheme(http/https), address
+                and port.  apiServerURL can be used by components like the web console
+                to tell users where to find the Kubernetes API.
               type: string
             etcdDiscoveryDomain:
               description: 'etcdDiscoveryDomain is the domain used to fetch the SRV
@@ -68,16 +73,34 @@ spec:
                 max length 27 and must have only alphanumeric or hyphen characters.
               type: string
             platform:
-              description: platform is the underlying infrastructure provider for
-                the cluster. This value controls whether infrastructure automation
-                such as service load balancers, dynamic volume provisioning, machine
-                creation and deletion, and other integrations are enabled. If None,
-                no infrastructure automation is enabled. Allowed values are "AWS",
-                "Azure", "BareMetal", "GCP", "Libvirt", "OpenStack", "VSphere", and
-                "None". Individual components may not support all platforms, and must
-                handle unrecognized platforms as None if they do not support that
-                platform.
+              description: 'platform is the underlying infrastructure provider for
+                the cluster.  Deprecated: Use platformStatus.type instead.'
               type: string
+            platformStatus:
+              description: platformStatus holds status information specific to the
+                underlying infrastructure provider.
+              properties:
+                aws:
+                  description: AWS contains settings specific to the Amazon Web Services
+                    infrastructure provider.
+                  properties:
+                    region:
+                      description: region holds the default AWS region for new AWS
+                        resources created by the cluster.
+                      type: string
+                  type: object
+                type:
+                  description: type is the underlying infrastructure provider for
+                    the cluster. This value controls whether infrastructure automation
+                    such as service load balancers, dynamic volume provisioning, machine
+                    creation and deletion, and other integrations are enabled. If
+                    None, no infrastructure automation is enabled. Allowed values
+                    are "AWS", "Azure", "BareMetal", "GCP", "Libvirt", "OpenStack",
+                    "VSphere", and "None". Individual components may not support all
+                    platforms, and must handle unrecognized platforms as None if they
+                    do not support that platform.
+                  type: string
+              type: object
           type: object
       required:
       - spec