Skip to content

DO NOT REVIEW: For testing #2272

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

DO NOT REVIEW: For testing #2272

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
652d12d
min generation = 1 for mcn
isabella-janssen Apr 10, 2025
a29d116
make update
isabella-janssen Apr 10, 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
8 changes: 4 additions & 4 deletions machineconfiguration/v1alpha1/types_machineconfignode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ type MachineConfigNodeStatus struct {
// observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
// This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
// +kubebuilder:validation:XValidation:rule="self >= oldSelf", message="observedGeneration must not decrease"
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=1
// +optional
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
// configVersion describes the current and desired machine config version for this node.
Expand Down Expand Up @@ -150,17 +150,17 @@ type MachineConfigNodeStatusPinnedImageSet struct {
Name string `json:"name"`
// currentGeneration is the generation of the pinned image set that has most recently been successfully pulled and pinned on this node.
// +kubebuilder:validation:XValidation:rule="self >= oldSelf", message="currentGeneration must not decrease"
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=1
// +optional
CurrentGeneration int32 `json:"currentGeneration,omitempty"`
// desiredGeneration is the generation of the pinned image set that is targeted to be pulled and pinned on this node.
// +kubebuilder:validation:XValidation:rule="self >= oldSelf", message="desiredGeneration must not decrease"
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=1
// +optional
DesiredGeneration int32 `json:"desiredGeneration,omitempty"`
// lastFailedGeneration is the generation of the most recent pinned image set that failed to be pulled and pinned on this node.
// +kubebuilder:validation:XValidation:rule="self >= oldSelf", message="lastFailedGeneration must not decrease"
// +kubebuilder:validation:Minimum=0
// +kubebuilder:validation:Minimum=1
// +optional
LastFailedGeneration int32 `json:"lastFailedGeneration,omitempty"`
// lastFailedGenerationError is the error explaining why the desired images failed to be pulled and pinned.
Expand Down
8 changes: 4 additions & 4 deletions ...rated.crd-manifests/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down
8 changes: 4 additions & 4 deletions ...d.crd-manifests/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down
8 changes: 4 additions & 4 deletions ....crd-manifests/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down
8 changes: 4 additions & 4 deletions ...rd-manifests/machineconfignodes.machineconfiguration.openshift.io/MachineConfigNodes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down
8 changes: 4 additions & 4 deletions payload-manifests/crds/0000_80_machine-config_01_machineconfignodes-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down
8 changes: 4 additions & 4 deletions ...-manifests/crds/0000_80_machine-config_01_machineconfignodes-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down
8 changes: 4 additions & 4 deletions ...manifests/crds/0000_80_machine-config_01_machineconfignodes-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ spec:
observedGeneration represents the generation of the MachineConfigNode object observed by the Machine Config Operator's controller.
This field is updated when the controller observes a change to the desiredConfig in the configVersion of the machine config node spec.
format: int64
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: observedGeneration must not decrease
Expand All @@ -298,7 +298,7 @@ spec:
image set that has most recently been successfully pulled
and pinned on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: currentGeneration must not decrease
Expand All @@ -308,7 +308,7 @@ spec:
image set that is targeted to be pulled and pinned on this
node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: desiredGeneration must not decrease
Expand All @@ -318,7 +318,7 @@ spec:
recent pinned image set that failed to be pulled and pinned
on this node.
format: int32
minimum: 0
minimum: 1
type: integer
x-kubernetes-validations:
- message: lastFailedGeneration must not decrease
Expand Down