Skip to content

Commit d231abe

Browse files
committed
MachineOSConfig name should match MachineConfigPool
Add a restriction where the name of the MachineOSConfig object must be the same as the MachineConfigPool it is created for. This will ensure that we only have one MOSC per MCP. Signed-off-by: Urvashi <[email protected]>
1 parent 674ad74 commit d231abe

File tree

4 files changed

+13
-0
lines changed

4 files changed

+13
-0
lines changed

machineconfiguration/v1/types_machineosconfig.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
// MachineOSConfig describes the configuration for a build process managed by the MCO
1919
// Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
2020
// +openshift:compatibility-gen:level=1
21+
// +kubebuilder:validation:XValidation:rule="self.metadata.name == self.spec.machineConfigPool.name", message="MachineOSConfig name must match the referenced MachineConfigPool name; can only have one MachineOSConfig per MachineConfigPool"
2122
type MachineOSConfig struct {
2223
metav1.TypeMeta `json:",inline"`
2324

machineconfiguration/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineosconfigs.crd.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,10 @@ spec:
345345
required:
346346
- spec
347347
type: object
348+
x-kubernetes-validations:
349+
- message: MachineOSConfig name must match the referenced MachineConfigPool
350+
name; can only have one MachineOSConfig per MachineConfigPool
351+
rule: self.metadata.name == self.spec.machineConfigPool.name
348352
served: true
349353
storage: true
350354
subresources:

machineconfiguration/v1/zz_generated.featuregated-crd-manifests/machineosconfigs.machineconfiguration.openshift.io/OnClusterBuild.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,10 @@ spec:
346346
required:
347347
- spec
348348
type: object
349+
x-kubernetes-validations:
350+
- message: MachineOSConfig name must match the referenced MachineConfigPool
351+
name; can only have one MachineOSConfig per MachineConfigPool
352+
rule: self.metadata.name == self.spec.machineConfigPool.name
349353
served: true
350354
storage: true
351355
subresources:

payload-manifests/crds/0000_80_machine-config_01_machineosconfigs.crd.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,10 @@ spec:
345345
required:
346346
- spec
347347
type: object
348+
x-kubernetes-validations:
349+
- message: MachineOSConfig name must match the referenced MachineConfigPool
350+
name; can only have one MachineOSConfig per MachineConfigPool
351+
rule: self.metadata.name == self.spec.machineConfigPool.name
348352
served: true
349353
storage: true
350354
subresources:

0 commit comments

Comments
 (0)