Skip to content
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

Jump to bottom

OCPCLOUD-2010: Add CloudControllerManagerStatus to External platform status #1434

Merged
merged 4 commits into from
Jun 13, 2023
Merged

OCPCLOUD-2010: Add CloudControllerManagerStatus to External platform status #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1974bb3
OCPCLOUD-2010: Add CloudControllerManagerStatus to the `External` pla…
adriengentil Apr 5, 2023
3361940
Add field validations and tests
adriengentil May 3, 2023
99f7e5b
Set CloudControllerManagerStatus behind TechPreviewNoUpgrade feature set
adriengentil Jun 2, 2023
db0028c
update CEL to be more accurate
adriengentil Jun 12, 2023
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
18 changes: 18 additions & 0 deletions config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,24 @@ spec:
type: object
external:
description: External contains settings specific to the generic External infrastructure provider.
properties:
cloudControllerManager:
description: cloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI). When omitted, new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.
properties:
state:
description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n Valid values are \"External\", \"None\" and omitted. When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected."
enum:
- ""
- External
- None
type: string
x-kubernetes-validations:
- message: state is immutable once set
rule: self == oldSelf
type: object
x-kubernetes-validations:
- message: state may not be added or removed once set
rule: (has(self.state) == has(oldSelf.state)) || (!has(oldSelf.state) && self.state != "External")
type: object
gcp:
description: GCP contains settings specific to the Google Cloud Platform infrastructure provider.
Expand Down
10 changes: 10 additions & 0 deletions config/v1/feature_gates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,16 @@ var (
OwningProduct: ocpSpecific,
}

FeatureGateExternalCloudProviderExternal = FeatureGateName("ExternalCloudProviderExternal")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this definitely what we want to call this? Seems funny to have External twice, not sure it's super important what it's called since we intend to remove it eventually

Copy link
Contributor Author

@adriengentil adriengentil Jun 12, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree it's not ideal, I kept the same naming scheme as FeatureGateExternalCloudProviderGCP and FeatureGateExternalCloudProviderAzure to stay consistent. Otherwise, something like FeatureGateExternalCloudControllerState ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agree that the stutter isn't great, but since it follows the others i think it can be acceptable

externalCloudProviderExternal = FeatureGateDescription{
FeatureGateAttributes: FeatureGateAttributes{
Name: FeatureGateExternalCloudProviderExternal,
},
OwningJiraComponent: "cloud-provider",
ResponsiblePerson: "elmiko",
OwningProduct: ocpSpecific,
}

FeatureGateCSIDriverSharedResource = FeatureGateName("CSIDriverSharedResource")
csiDriverSharedResource = FeatureGateDescription{
FeatureGateAttributes: FeatureGateAttributes{
Expand Down
Loading