Skip to content

config/v1/types_infrastructure.go: add kube cloud config to status #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Apr 17, 2020
Merged

config/v1/types_infrastructure.go: add kube cloud config to status #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions config/v1/0000_10_config-operator_01_infrastructure.crd.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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