Skip to content

Commit aa5aa1b

Browse files
MahnoorAsgharMahnoorAsghar
committed
Make baremetal capability disabled by default on hosted clusters
1 parent a203d81 commit aa5aa1b

31 files changed

+111
-10
lines changed

‎api/hypershift/v1beta1/hostedcluster_types.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,11 @@ const (
369369
PruneRetentionPolicy RetentionPolicy = "Prune"
370370
)
371371

372-
// +kubebuilder:validation:Enum=ImageRegistry
372+
// +kubebuilder:validation:Enum=ImageRegistry;baremetal
373373
type OptionalCapability string
374374

375375
const ImageRegistryCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityImageRegistry)
376+
const BaremetalCapability OptionalCapability = OptionalCapability(configv1.ClusterVersionCapabilityBaremetal)
376377

377378
// capabilities allows disabling optional components at install time.
378379
// Once set, it cannot be changed.
@@ -389,6 +390,7 @@ type Capabilities struct {
389390
// +listType=atomic
390391
// +immutable
391392
// +optional
393+
// +kubebuilder:default={baremetal}
392394
// +kubebuilder:validation:MaxItems=25
393395
// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="Disabled is immutable. Changes might result in unpredictable and disruptive behavior."
394396
Disabled []OptionalCapability `json:"disabled,omitempty"`

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AAA_ungated.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/AutoNodeKarpenter.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ spec:
204204
This field is optional and once set cannot be changed.
205205
properties:
206206
disabled:
207+
default:
208+
- baremetal
207209
description: |-
208210
disabled when specified, sets the cluster version baselineCapabilitySet to None
209211
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -216,6 +218,7 @@ spec:
216218
items:
217219
enum:
218220
- ImageRegistry
221+
- baremetal
219222
type: string
220223
maxItems: 25
221224
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/DynamicResourceAllocation.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDC.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/ImageStreamImportMode.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/KMSEncryptionProvider.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedclusters.hypershift.openshift.io/OpenStack.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ spec:
157157
This field is optional and once set cannot be changed.
158158
properties:
159159
disabled:
160+
default:
161+
- baremetal
160162
description: |-
161163
disabled when specified, sets the cluster version baselineCapabilitySet to None
162164
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -169,6 +171,7 @@ spec:
169171
items:
170172
enum:
171173
- ImageRegistry
174+
- baremetal
172175
type: string
173176
maxItems: 25
174177
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AAA_ungated.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/AutoNodeKarpenter.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,8 @@ spec:
172172
This field is optional and once set cannot be changed.
173173
properties:
174174
disabled:
175+
default:
176+
- baremetal
175177
description: |-
176178
disabled when specified, sets the cluster version baselineCapabilitySet to None
177179
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -184,6 +186,7 @@ spec:
184186
items:
185187
enum:
186188
- ImageRegistry
189+
- baremetal
187190
type: string
188191
maxItems: 25
189192
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ClusterVersionOperatorConfiguration.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/DynamicResourceAllocation.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDC.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ExternalOIDCWithUIDAndExtraClaimMappings.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/ImageStreamImportMode.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/KMSEncryptionProvider.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/NetworkDiagnosticsConfig.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎api/hypershift/v1beta1/zz_generated.featuregated-crd-manifests/hostedcontrolplanes.hypershift.openshift.io/OpenStack.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ spec:
125125
This field is optional and once set cannot be changed.
126126
properties:
127127
disabled:
128+
default:
129+
- baremetal
128130
description: |-
129131
disabled when specified, sets the cluster version baselineCapabilitySet to None
130132
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -137,6 +139,7 @@ spec:
137139
items:
138140
enum:
139141
- ImageRegistry
142+
- baremetal
140143
type: string
141144
maxItems: 25
142145
type: array

‎cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-CustomNoUpgrade.crd.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ spec:
207207
This field is optional and once set cannot be changed.
208208
properties:
209209
disabled:
210+
default:
211+
- baremetal
210212
description: |-
211213
disabled when specified, sets the cluster version baselineCapabilitySet to None
212214
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -219,6 +221,7 @@ spec:
219221
items:
220222
enum:
221223
- ImageRegistry
224+
- baremetal
222225
type: string
223226
maxItems: 25
224227
type: array

‎cmd/install/assets/hypershift-operator/zz_generated.crd-manifests/hostedclusters-Default.crd.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,8 @@ spec:
160160
This field is optional and once set cannot be changed.
161161
properties:
162162
disabled:
163+
default:
164+
- baremetal
163165
description: |-
164166
disabled when specified, sets the cluster version baselineCapabilitySet to None
165167
and sets all additionalEnabledCapabilities BUT the ones supplied in disabled.
@@ -172,6 +174,7 @@ spec:
172174
items:
173175
enum:
174176
- ImageRegistry
177+
- baremetal
175178
type: string
176179
maxItems: 25
177180
type: array

0 commit comments

Comments
 (0)