Skip to content

MCO-1519: Deploy v1 CRDs for the MCN API #2273

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

Closed
wants to merge 2 commits into from
Closed

MCO-1519: Deploy v1 CRDs for the MCN API #2273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae8ec66
add v1 api for MachineConfigNode
isabella-janssen Apr 1, 2025
2ec3add
update 'update-payload-crds.sh' to deploy v1 crds for MCN api
isabella-janssen Apr 22, 2025
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
2 changes: 0 additions & 2 deletions hack/update-payload-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

source "$(dirname "${BASH_SOURCE}")/lib/init.sh"

#TODO(jerzhang): once MOSC/MOSB graduates, update the v1 crds to include them
crd_globs="\
authorization/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
config/v1/zz_generated.crd-manifests/*_config-operator_*.crd*yaml\
Expand All @@ -23,7 +22,6 @@ crd_globs="\
config/v1/zz_generated.crd-manifests/0000_10_openshift-controller-manager_01_builds*.crd.yaml
operator/v1/zz_generated.crd-manifests/0000_50_openshift-controller-manager_02_openshiftcontrollermanagers*.crd.yaml
machineconfiguration/v1/zz_generated.crd-manifests/*.crd.yaml
machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfignodes*.crd.yaml
operator/v1/zz_generated.crd-manifests/0000_80_machine-config_01_machineconfigurations*.crd.yaml
config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_clusterimagepolicies*.crd.yaml
config/v1alpha1/zz_generated.crd-manifests/0000_10_config-operator_01_imagepolicies*.crd.yaml
Expand Down
2 changes: 2 additions & 0 deletions machineconfiguration/v1/register.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&MachineOSBuildList{},
&PinnedImageSet{},
&PinnedImageSetList{},
&MachineConfigNode{},
&MachineConfigNodeList{},
)

metav1.AddToGroupVersion(scheme, GroupVersion)
Expand Down
211 changes: 211 additions & 0 deletions ...ion/v1/tests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "[TechPreview] MachineConfigNode"
crdName: machineconfignodes.machineconfiguration.openshift.io
featureGates:
- MachineConfigNodes
tests:
onCreate:
- name: Should be able to create a minimal MachineConfigNode
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
expected: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
- name: Node name must match the Object name.
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: barfoo
pool:
name: worker
configVersion:
desired: rendered-worker-abc
expectedError: "Invalid value: \"object\": spec.node.name should match metadata.name"
- name: Pool is required.
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: barfoo
configVersion:
desired: rendered-worker-abc
expectedError: "spec.pool: Required value, <nil>: Invalid value: \"null\""
- name: Node is required.
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
pool:
name: barfoo
configVersion:
desired: rendered-worker-abc
expectedError: "spec.node: Required value, <nil>: Invalid value: \"null\""
- name: ConfigVersion is required.
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
pool:
name: barfoo
node:
name: foobar
expectedError: "spec.configVersion: Required value, <nil>: Invalid value: \"null\""
onUpdate:
- name: PinnedImageSet desired generation must be greater than or equal to the current generation
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
status:
observedGeneration: 1
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 1
desiredGeneration: 1
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
status:
observedGeneration: 1
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 2
desiredGeneration: 1
expectedStatusError: "Invalid value: \"object\": desired generation must be greater than or equal to the current generation"
- name: PinnedImageSet desired generation must be greater than or equal to the last failed generation
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
status:
observedGeneration: 4
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 2
desiredGeneration: 2
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
status:
observedGeneration: 5
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 3
desiredGeneration: 3
lastFailedGeneration: 4
expectedStatusError: "Invalid value: \"object\": desired generation must be greater than or equal to the last failed generation"
- name: PinnedImageSet last failed generation error must be defined on image pull and pin failure
initial: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
status:
observedGeneration: 4
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 2
desiredGeneration: 2
updated: |
apiVersion: machineconfiguration.openshift.io/v1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
status:
observedGeneration: 5
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 2
desiredGeneration: 3
lastFailedGeneration: 3
expectedStatusError: "Invalid value: \"object\": last failed generation error must be defined on image pull and pin failure"
Loading