Skip to content
Closed
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:
- -AWSClusterHostedDNS
- -AWSClusterHostedDNSInstall
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
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: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- AWSClusterHostedDNS
- AWSClusterHostedDNSInstall
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
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: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- GCPClusterHostedDNS
- GCPClusterHostedDNSInstall
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
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: "Infrastructure"
crdName: infrastructures.config.openshift.io
featureGates:
- GCPCustomAPIEndpoints
- GCPCustomAPIEndpointsInstall
tests:
onCreate:
- name: Should be able to create a minimal Infrastructure
Expand Down
6 changes: 3 additions & 3 deletions config/v1/types_infrastructure.go
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ type AWSPlatformStatus struct {
//
// +default={"dnsType": "PlatformDefault"}
// +kubebuilder:default={"dnsType": "PlatformDefault"}
// +openshift:enable:FeatureGate=AWSClusterHostedDNS
// +openshift:enable:FeatureGate=AWSClusterHostedDNSInstall
// +optional
// +nullable
CloudLoadBalancerConfig *CloudLoadBalancerConfig `json:"cloudLoadBalancerConfig,omitempty"`
Expand Down Expand Up @@ -745,7 +745,7 @@ type GCPPlatformStatus struct {
//
// +default={"dnsType": "PlatformDefault"}
// +kubebuilder:default={"dnsType": "PlatformDefault"}
// +openshift:enable:FeatureGate=GCPClusterHostedDNS
// +openshift:enable:FeatureGate=GCPClusterHostedDNSInstall
// +optional
// +nullable
CloudLoadBalancerConfig *CloudLoadBalancerConfig `json:"cloudLoadBalancerConfig,omitempty"`
Expand All @@ -760,7 +760,7 @@ type GCPPlatformStatus struct {
// +kubebuilder:validation:MaxItems=8
// +kubebuilder:validation:XValidation:rule="self.all(x, self.exists_one(y, x.name == y.name))",message="only 1 endpoint override is permitted per GCP service name"
// +optional
// +openshift:enable:FeatureGate=GCPCustomAPIEndpoints
// +openshift:enable:FeatureGate=GCPCustomAPIEndpointsInstall
ServiceEndpoints []GCPServiceEndpoint `json:"serviceEndpoints,omitempty"`
}

Expand Down
6 changes: 3 additions & 3 deletions config/v1/zz_generated.featuregated-crd-manifests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,11 @@ infrastructures.config.openshift.io:
Capability: ""
Category: ""
FeatureGates:
- AWSClusterHostedDNS
- AWSClusterHostedDNSInstall
- DualReplica
- DyanmicServiceEndpointIBMCloud
- GCPClusterHostedDNS
- GCPCustomAPIEndpoints
- GCPClusterHostedDNSInstall
- GCPCustomAPIEndpointsInstall
- HighlyAvailableArbiter
- HighlyAvailableArbiter+DualReplica
- 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/AWSClusterHostedDNS: "true"
feature-gate.release.openshift.io/AWSClusterHostedDNSInstall: "true"
release.openshift.io/bootstrap-required: "true"
name: infrastructures.config.openshift.io
spec:
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/GCPClusterHostedDNS: "true"
feature-gate.release.openshift.io/GCPClusterHostedDNSInstall: "true"
release.openshift.io/bootstrap-required: "true"
name: infrastructures.config.openshift.io
spec:
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/GCPCustomAPIEndpoints: "true"
feature-gate.release.openshift.io/GCPCustomAPIEndpointsInstall: "true"
release.openshift.io/bootstrap-required: "true"
name: infrastructures.config.openshift.io
spec:
Expand Down
6 changes: 3 additions & 3 deletions features.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
| SELinuxMount| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
| VSphereMixedNodeEnv| | | <span style="background-color: #519450">Enabled</span> | <span style="background-color: #519450">Enabled</span> | | |
| NewOLM| | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> | | <span style="background-color: #519450">Enabled</span> |
| AWSClusterHostedDNS| | | <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> |
| AWSClusterHostedDNSInstall| | | <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> |
| AWSDedicatedHosts| | | <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> |
| AWSServiceLBNetworkSecurityGroup| | | <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> |
| AutomatedEtcdBackup| | | <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 All @@ -34,8 +34,8 @@
| EtcdBackendQuota| | | <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> |
| ExternalOIDCWithUIDAndExtraClaimMappings| | | <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> |
| GCPClusterHostedDNS| | | <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> |
| GCPCustomAPIEndpoints| | | <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> |
| GCPClusterHostedDNSInstall| | | <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> |
| GCPCustomAPIEndpointsInstall| | | <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> |
| HighlyAvailableArbiter| | | <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> |
| ImageModeStatusReporting| | | <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> |
| ImageStreamImportMode| | | <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
30 changes: 15 additions & 15 deletions features/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,21 +320,21 @@ var (
enhancementPR(legacyFeatureGateWithoutEnhancement).
mustRegister()

FeatureGateGCPClusterHostedDNS = newFeatureGate("GCPClusterHostedDNS").
reportProblemsToJiraComponent("Installer").
contactPerson("barbacbd").
productScope(ocpSpecific).
enhancementPR(legacyFeatureGateWithoutEnhancement).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
FeatureGateGCPClusterHostedDNSInstall = newFeatureGate("GCPClusterHostedDNSInstall").
reportProblemsToJiraComponent("Installer").
contactPerson("barbacbd").
productScope(ocpSpecific).
enhancementPR(legacyFeatureGateWithoutEnhancement).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()

FeatureGateAWSClusterHostedDNS = newFeatureGate("AWSClusterHostedDNS").
reportProblemsToJiraComponent("Installer").
contactPerson("barbacbd").
productScope(ocpSpecific).
enhancementPR(legacyFeatureGateWithoutEnhancement).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()
FeatureGateAWSClusterHostedDNSInstall = newFeatureGate("AWSClusterHostedDNSInstall").
reportProblemsToJiraComponent("Installer").
contactPerson("barbacbd").
productScope(ocpSpecific).
enhancementPR(legacyFeatureGateWithoutEnhancement).
enableIn(configv1.DevPreviewNoUpgrade, configv1.TechPreviewNoUpgrade).
mustRegister()

FeatureGateMixedCPUsAllocation = newFeatureGate("MixedCPUsAllocation").
reportProblemsToJiraComponent("NodeTuningOperator").
Expand Down Expand Up @@ -703,7 +703,7 @@ var (
enableIn(configv1.DevPreviewNoUpgrade).
mustRegister()

FeatureGateGCPCustomAPIEndpoints = newFeatureGate("GCPCustomAPIEndpoints").
FeatureGateGCPCustomAPIEndpointsInstall = newFeatureGate("GCPCustomAPIEndpointsInstall").
reportProblemsToJiraComponent("Installer").
contactPerson("barbacbd").
productScope(ocpSpecific).
Expand Down
4 changes: 2 additions & 2 deletions features/legacyfeaturegates.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package features
import "k8s.io/apimachinery/pkg/util/sets"

var legacyFeatureGates = sets.New(
"AWSClusterHostedDNS",
"AWSClusterHostedDNSInstall",
// never add to this list, if you think you have an exception ask @deads2k
"AWSEFSDriverVolumeMetrics",
// never add to this list, if you think you have an exception ask @deads2k
Expand Down Expand Up @@ -37,7 +37,7 @@ var legacyFeatureGates = sets.New(
// never add to this list, if you think you have an exception ask @deads2k
"Example2",
// never add to this list, if you think you have an exception ask @deads2k
"GCPClusterHostedDNS",
"GCPClusterHostedDNSInstall",
// never add to this list, if you think you have an exception ask @deads2k
"GatewayAPI",
// never add to this list, if you think you have an exception ask @deads2k
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: "Shamefully missing"
crdName: controllerconfigs.machineconfiguration.openshift.io
featureGates:
- AWSClusterHostedDNS
- AWSClusterHostedDNSInstall
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 @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w
name: "Shamefully missing"
crdName: controllerconfigs.machineconfiguration.openshift.io
featureGates:
- GCPClusterHostedDNS
- GCPClusterHostedDNSInstall
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 @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if w
name: "ControllerConfig"
crdName: controllerconfigs.machineconfiguration.openshift.io
featureGates:
- GCPCustomAPIEndpoints
- GCPCustomAPIEndpointsInstall
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 @@ -28,11 +28,11 @@ controllerconfigs.machineconfiguration.openshift.io:
Capability: ""
Category: ""
FeatureGates:
- AWSClusterHostedDNS
- AWSClusterHostedDNSInstall
- DualReplica
- DyanmicServiceEndpointIBMCloud
- GCPClusterHostedDNS
- GCPCustomAPIEndpoints
- GCPClusterHostedDNSInstall
- GCPCustomAPIEndpointsInstall
- HighlyAvailableArbiter
- HighlyAvailableArbiter+DualReplica
- NutanixMultiSubnets
Expand Down
Loading