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

Add changes to infrastructure object to contain service endpoints and feature flag added #2078

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add changes to infrastructure object to contain service endpoints and feature flag added #2078

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1e4f92
.
Oct 10, 2024
4770e0d
run make commands
Oct 10, 2024
76aa47a
Merge branch 'master' into jh-340
Oct 10, 2024
7caa6c6
merge master
Oct 29, 2024
9f1b0c5
merge master
Nov 4, 2024
42999b6
cleanup
Nov 5, 2024
86d218d
sync w/ correct type and comment
Nov 18, 2024
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
9 changes: 8 additions & 1 deletion config/v1/types_infrastructure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,14 @@ type IBMCloudServiceEndpoint struct {

// IBMCloudPlatformSpec holds the desired state of the IBMCloud infrastructure provider.
// This only includes fields that can be modified in the cluster.
type IBMCloudPlatformSpec struct{}
type IBMCloudPlatformSpec struct {
// ServiceEndpoints contains custom endpoints designated to
// override existing defaults of IBM Cloud Services.
Copy link
Contributor

Choose a reason for hiding this comment

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

The godoc on the status version of this field is different, shall we copy it here?

Copy link
Author

Choose a reason for hiding this comment

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

yes, fixed

// +listType=atomic
Copy link
Contributor

Choose a reason for hiding this comment

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

Status version is a map type, why would this one be different?

Copy link
Author

Choose a reason for hiding this comment

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

my bad, unintentionally messed that up when playing with some things - fixed

// +openshift:enable:FeatureGate=DyanmicServiceEndpointIBMCloud
// +optional
ServiceEndpoints []IBMCloudServiceEndpoint `json:"serviceEndpoints,omitempty"`
}

// IBMCloudPlatformStatus holds the current status of the IBMCloud infrastructure provider.
type IBMCloudPlatformStatus struct {
Expand Down
1 change: 1 addition & 0 deletions features.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
| ------ | --- | --- | --- | --- | --- | --- |
| ClusterAPIInstall| | | | | | |
| ClusterAPIInstallIBMCloud| | | | | | |
| DyanmicServiceEndpointIBMCloud| | | | | | |
| EventedPLEG| | | | | | |
| MachineAPIMigration| | | | | | |
| MachineAPIOperatorDisableMachineHealthCheckController| | | | | | |
Expand Down
18 changes: 12 additions & 6 deletions features/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,12 +442,12 @@ var (
mustRegister()

FeatureGateVolumeAttributesClass = newFeatureGate("VolumeAttributesClass").
reportProblemsToJiraComponent("Storage / Kubernetes External Components").
contactPerson("dfajmon").
productScope(kubernetes).
enhancementPR("https://github.com/kubernetes/enhancements/issues/3751").
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
reportProblemsToJiraComponent("Storage / Kubernetes External Components").
contactPerson("dfajmon").
productScope(kubernetes).
enhancementPR("https://github.com/kubernetes/enhancements/issues/3751").
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()

FeatureGateVolumeGroupSnapshot = newFeatureGate("VolumeGroupSnapshot").
reportProblemsToJiraComponent("Storage / Kubernetes External Components").
Expand Down Expand Up @@ -670,4 +670,10 @@ var (
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
enhancementPR("https://github.com/openshift/enhancements/pull/1697").
mustRegister()

FeatureGateDyanmicServiceEndpointIBMCloud = newFeatureGate("DyanmicServiceEndpointIBMCloud").
Copy link
Contributor

Choose a reason for hiding this comment

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

You'll want to include an enableIn and add this to DevPreview and TechPreview initially

reportProblemsToJiraComponent("Cloud Compute / IBM Provider").
contactPerson("jared-hayes-dev").
productScope(ocpSpecific).
mustRegister()
)
23 changes: 23 additions & 0 deletions openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

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

13 changes: 12 additions & 1 deletion openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6782,7 +6782,18 @@
},
"com.github.openshift.api.config.v1.IBMCloudPlatformSpec": {
"description": "IBMCloudPlatformSpec holds the desired state of the IBMCloud infrastructure provider. This only includes fields that can be modified in the cluster.",
"type": "object"
"type": "object",
"properties": {
"serviceEndpoints": {
"description": "ServiceEndpoints contains custom endpoints designated to override existing defaults of IBM Cloud Services.",
"type": "array",
"items": {
"default": {},
"$ref": "#/definitions/com.github.openshift.api.config.v1.IBMCloudServiceEndpoint"
},
"x-kubernetes-list-type": "atomic"
}
}
},
"com.github.openshift.api.config.v1.IBMCloudPlatformStatus": {
"description": "IBMCloudPlatformStatus holds the current status of the IBMCloud infrastructure provider.",
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-Hypershift-Default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
{
"name": "DNSNameResolver"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
},
{
"name": "DynamicResourceAllocation"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-Hypershift-DevPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
{
"name": "ClusterAPIInstallIBMCloud"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
},
{
"name": "EventedPLEG"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-Hypershift-TechPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
{
"name": "ClusterAPIInstallIBMCloud"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
},
{
"name": "EventedPLEG"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-SelfManagedHA-Default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@
{
"name": "DNSNameResolver"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
},
{
"name": "DynamicResourceAllocation"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-SelfManagedHA-DevPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
{
"name": "ClusterAPIInstallIBMCloud"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
},
{
"name": "EventedPLEG"
},
Expand Down
3 changes: 3 additions & 0 deletions payload-manifests/featuregates/featureGate-SelfManagedHA-TechPreviewNoUpgrade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
{
"name": "ClusterAPIInstallIBMCloud"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
},
{
"name": "EventedPLEG"
},
Expand Down