Skip to content

OCPVE-658: add CloudController capability #1579

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-bot merged 1 commit into from
Mar 1, 2024
Merged

OCPVE-658: add CloudController capability #1579

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
3 changes: 3 additions & 0 deletions config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -351,6 +352,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -376,6 +378,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -298,6 +299,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -323,6 +325,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -351,6 +352,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -376,6 +378,7 @@ spec:
- OperatorLifecycleManager
- CloudCredential
- Ingress
- CloudControllerManager
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
10 changes: 9 additions & 1 deletion config/v1/types_cluster_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ const (
)

// ClusterVersionCapability enumerates optional, core cluster components.
// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress
// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager
type ClusterVersionCapability string

const (
Expand Down Expand Up @@ -390,6 +390,11 @@ const (
//
// WARNING: This capability cannot be disabled on the standalone OpenShift.
ClusterVersionCapabilityIngress ClusterVersionCapability = "Ingress"

// ClusterVersionCapabilityCloudControllerManager manages various Cloud Controller
// Managers deployed on top of OpenShift. They help you to work with cloud
// provider API and embeds cloud-specific control logic.
ClusterVersionCapabilityCloudControllerManager ClusterVersionCapability = "CloudControllerManager"
)

// KnownClusterVersionCapabilities includes all known optional, core cluster components.
Expand All @@ -409,6 +414,7 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{
ClusterVersionCapabilityOperatorLifecycleManager,
ClusterVersionCapabilityCloudCredential,
ClusterVersionCapabilityIngress,
ClusterVersionCapabilityCloudControllerManager,
}

// ClusterVersionCapabilitySet defines sets of cluster version capabilities.
Expand Down Expand Up @@ -538,6 +544,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
ClusterVersionCapabilityOperatorLifecycleManager,
ClusterVersionCapabilityCloudCredential,
ClusterVersionCapabilityIngress,
ClusterVersionCapabilityCloudControllerManager,
},
ClusterVersionCapabilitySetCurrent: {
ClusterVersionCapabilityBaremetal,
Expand All @@ -555,6 +562,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
ClusterVersionCapabilityOperatorLifecycleManager,
ClusterVersionCapabilityCloudCredential,
ClusterVersionCapabilityIngress,
ClusterVersionCapabilityCloudControllerManager,
},
}

Expand Down