Skip to content
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

(Work in progess) MCO-1518: Promote MCN to GA #2171

Closed
wants to merge 9 commits into from
Closed

(Work in progess) MCO-1518: Promote MCN to GA #2171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c80b09e
addition of v1 mcn type & test
isabella-janssen Jan 24, 2025
c32f007
addition of generated files
isabella-janssen Jan 24, 2025
5a27930
cleanup
isabella-janssen Jan 27, 2025
369015f
update rfc1123 validation
isabella-janssen Jan 28, 2025
5977184
update descriptions, types, and validation
isabella-janssen Jan 30, 2025
8bb354e
update doc comments
isabella-janssen Feb 3, 2025
a838189
update maxitems for lists
isabella-janssen Feb 4, 2025
9d9b456
update descriptions
isabella-janssen Feb 6, 2025
8f08686
update PIS section of MCN object
isabella-janssen Feb 12, 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: 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 @@ -38,6 +38,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
&MachineOSConfigList{},
&MachineOSBuild{},
&MachineOSBuildList{},
&MachineConfigNode{},
&MachineConfigNodeList{},
)

metav1.AddToGroupVersion(scheme, GroupVersion)
Expand Down
248 changes: 248 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,248 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "MachineConfigNode"
crdName: machineconfignodes.machineconfiguration.openshift.io
featureGates: MachineConfigNodes
tests:
onCreate:
- name: Should be able to create a minimal MachineConfigNode
initial: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
expected: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
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/v1alpha1
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/v1alpha1
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/v1alpha1
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/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
pool:
name: barfoo
node:
name: foobar
expectedError: "spec.configVersion: Required value, <nil>: Invalid value: \"null\""
- name: Should be able to create a MachineConfigNode with a PinnedImageSet
initial: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
expected: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
onUpdate:
- name: PinnedImageSet desired generation must be greater than or equal to the current generation
initial: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
status:
observedGeneration: 1
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 1
desiredGeneration: 1
updated: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
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 last failed generation
initial: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
status:
observedGeneration: 4
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
currentGeneration: 2
desiredGeneration: 2
lastFailedGeneration: 1
updated: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
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 last failed generation"
- name: PinnedImageSet desired generation must be set if last failed generation is set
initial: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
status:
observedGeneration: 4
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
updated: |
apiVersion: machineconfiguration.openshift.io/v1alpha1
kind: MachineConfigNode
metadata:
name: foobar
spec:
node:
name: foobar
pool:
name: worker
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
status:
observedGeneration: 5
configVersion:
desired: rendered-worker-abc
pinnedImageSets:
- name: test-pinned-image-set
lastFailedGeneration: 2
expectedStatusError: "Invalid value: \"object\": desired generation must be defined if last failed generation is defined"
Loading