Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w
name: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- DyanmicServiceEndpointIBMCloud
- DynamicServiceEndpointIBMCloud
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
Expand Down
8 changes: 4 additions & 4 deletions config/v1/types_infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -1898,8 +1898,8 @@ type IBMCloudServiceEndpoint struct {
// +kubebuilder:validation:Type=string
// +kubebuilder:validation:MaxLength=300
// +kubebuilder:validation:XValidation:rule="isURL(self)",message="url must be a valid absolute URL"
// +openshift:validation:FeatureGateAwareXValidation:featureGate=DyanmicServiceEndpointIBMCloud,rule="url(self).getScheme() == \"https\"",message="url must use https scheme"
// +openshift:validation:FeatureGateAwareXValidation:featureGate=DyanmicServiceEndpointIBMCloud,rule=`matches((url(self).getEscapedPath()), '^/(api/)?v[0-9]+/{0,1}$')`,message="url path must match /v[0,9]+ or /api/v[0,9]+"
// +openshift:validation:FeatureGateAwareXValidation:featureGate=DynamicServiceEndpointIBMCloud,rule="url(self).getScheme() == \"https\"",message="url must use https scheme"
// +openshift:validation:FeatureGateAwareXValidation:featureGate=DynamicServiceEndpointIBMCloud,rule=`matches((url(self).getEscapedPath()), '^/(api/)?v[0-9]+/{0,1}$')`,message="url path must match /v[0,9]+ or /api/v[0,9]+"
URL string `json:"url"`
}

Expand All @@ -1917,7 +1917,7 @@ type IBMCloudPlatformSpec struct {
// +listType=map
// +listMapKey=name
// +optional
// +openshift:enable:FeatureGate=DyanmicServiceEndpointIBMCloud
// +openshift:enable:FeatureGate=DynamicServiceEndpointIBMCloud
ServiceEndpoints []IBMCloudServiceEndpoint `json:"serviceEndpoints,omitempty"`
}

Expand Down Expand Up @@ -1946,7 +1946,7 @@ type IBMCloudPlatformStatus struct {
// overridden. The CCCMO reads in the IBMCloudPlatformSpec and validates each
// endpoint is resolvable. Once validated, the cloud config and IBMCloudPlatformStatus
// are updated to reflect the same custom endpoints.
// +openshift:validation:FeatureGateAwareMaxItems:featureGate=DyanmicServiceEndpointIBMCloud,maxItems=15
// +openshift:validation:FeatureGateAwareMaxItems:featureGate=DynamicServiceEndpointIBMCloud,maxItems=15
// +listType=map
// +listMapKey=name
// +optional
Expand Down
2 changes: 1 addition & 1 deletion config/v1/zz_generated.featuregated-crd-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ infrastructures.config.openshift.io:
- AzureDualStackInstall
- BGPBasedVIPManagement
- DualReplica
- DyanmicServiceEndpointIBMCloud
- DynamicServiceEndpointIBMCloud
- GCPSovereignCloudInstall
- MutableTopology
- NutanixMultiSubnets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
api.openshift.io/filename-cvo-runlevel: "0000_10"
api.openshift.io/filename-operator: config-operator
api.openshift.io/filename-ordering: "01"
feature-gate.release.openshift.io/DyanmicServiceEndpointIBMCloud: "true"
feature-gate.release.openshift.io/DynamicServiceEndpointIBMCloud: "true"
release.openshift.io/bootstrap-required: "true"
name: infrastructures.config.openshift.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion features.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
| ClusterVersionOperatorConfiguration| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| ConfigurablePKI| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| DNSNameResolver| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| DyanmicServiceEndpointIBMCloud| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| DynamicServiceEndpointIBMCloud| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| EgressIPNodeSelector| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| Example| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
| ExternalOIDCAsWebhook| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> |
Expand Down
2 changes: 1 addition & 1 deletion features/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ var (
enable(inTechPreviewNoUpgrade(), inDevPreviewNoUpgrade()).
mustRegister()

FeatureGateDyanmicServiceEndpointIBMCloud = newFeatureGate("DyanmicServiceEndpointIBMCloud").
FeatureGateDynamicServiceEndpointIBMCloud = newFeatureGate("DynamicServiceEndpointIBMCloud").
reportProblemsToJiraComponent("Cloud Compute / IBM Provider").
contactPerson("jared-hayes-dev").
productScope(ocpSpecific).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w
name: "ControllerConfig"
crdName: controllerconfigs.machineconfiguration.openshift.io
featureGates:
- DyanmicServiceEndpointIBMCloud
- DynamicServiceEndpointIBMCloud
tests:
onCreate:
- name: Should be able to create a minimal ControllerConfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ controllerconfigs.machineconfiguration.openshift.io:
- AzureDualStackInstall
- BGPBasedVIPManagement
- DualReplica
- DyanmicServiceEndpointIBMCloud
- DynamicServiceEndpointIBMCloud
- GCPSovereignCloudInstall
- MutableTopology
- NutanixMultiSubnets
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
api.openshift.io/filename-cvo-runlevel: "0000_80"
api.openshift.io/filename-operator: machine-config
api.openshift.io/filename-ordering: "01"
feature-gate.release.openshift.io/DyanmicServiceEndpointIBMCloud: "true"
feature-gate.release.openshift.io/DynamicServiceEndpointIBMCloud: "true"
labels:
openshift.io/operator-managed: ""
name: controllerconfigs.machineconfiguration.openshift.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
"name": "DRADeviceTaintRules"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EgressIPNodeSelector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
"name": "DualReplica"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EVPN"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"name": "DRADeviceTaintRules"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EgressIPNodeSelector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"name": "DualReplica"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EVPN"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
"name": "DRADeviceTaintRules"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EgressIPNodeSelector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"name": "DualReplica"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EVPN"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
"name": "DRADeviceTaintRules"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EgressIPNodeSelector"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
"name": "DualReplica"
},
{
"name": "DyanmicServiceEndpointIBMCloud"
"name": "DynamicServiceEndpointIBMCloud"
},
{
"name": "EVPN"
Expand Down