Skip to content

Commit

Permalink
config/v1/types_infrastructure.go: update the cloudConfig spec to def…
Browse files Browse the repository at this point in the history
…ine the generated one's location

The cloudConfig is generated by the stitching together the user specifed config and the other platform spec in the infrstructure object.
  • Loading branch information
abhinavdahiya committed Apr 14, 2020
1 parent c6e8c9b commit 2dadc74
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 3 deletions.
11 changes: 9 additions & 2 deletions config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,18 @@ spec:
type: object
properties:
cloudConfig:
description: cloudConfig is a reference to a ConfigMap containing the
description: "cloudConfig is a reference to a ConfigMap containing the
cloud provider configuration file. This configuration file is used
to configure the Kubernetes cloud provider integration when using
the built-in cloud provider integration or the external cloud controller
manager. The namespace for this config map is openshift-config.
manager. The namespace for this config map is openshift-config. \n
cloudConfig should only be consumed by the kube_cloud_config controller.
The controller is responsible for using the user configuration in
the spec for various platforms and combining that with the user provided
ConfigMap in this field to create a stitched kube cloud config. The
controller generates a ConfigMap `kube-cloud-config` in `openshift-config-managed`
namespace with the kube cloud config is stored in `cloud.conf` key.
All the clients are expected to use the generated ConfigMap only."
type: object
properties:
key:
Expand Down
9 changes: 9 additions & 0 deletions config/v1/types_infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ type InfrastructureSpec struct {
// This configuration file is used to configure the Kubernetes cloud provider integration
// when using the built-in cloud provider integration or the external cloud controller manager.
// The namespace for this config map is openshift-config.
//
// cloudConfig should only be consumed by the kube_cloud_config controller.
// The controller is responsible for using the user configuration in the spec
// for various platforms and combining that with the user provided ConfigMap in this field
// to create a stitched kube cloud config.
// The controller generates a ConfigMap `kube-cloud-config` in `openshift-config-managed` namespace
// with the kube cloud config is stored in `cloud.conf` key.
// All the clients are expected to use the generated ConfigMap only.
//
// +optional
CloudConfig ConfigMapFileReference `json:"cloudConfig"`

Expand Down
2 changes: 1 addition & 1 deletion config/v1/zz_generated.swagger_doc_generated.go

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

0 comments on commit 2dadc74

Please sign in to comment.