Skip to content

Commit 7ea433e

Browse files
committed
linter fix
1 parent 9eca225 commit 7ea433e

File tree

1 file changed

+23
-14
lines changed

1 file changed

+23
-14
lines changed

machineconfiguration/v1alpha1/types_internalreleaseimage.go

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,16 @@ import (
2323
// Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.
2424
// +openshift:compatibility-gen:level=4
2525
type InternalReleaseImage struct {
26-
metav1.TypeMeta `json:",inline"`
26+
metav1.TypeMeta `json:",inline"`
27+
28+
// metadata is the standard object's metadata.
29+
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
30+
// +optional
2731
metav1.ObjectMeta `json:"metadata,omitempty"`
2832

2933
// spec describes the configuration of this internal release image.
3034
// +required
31-
Spec InternalReleaseImageSpec `json:"spec"`
35+
Spec InternalReleaseImageSpec `json:"spec,omitzero"`
3236

3337
// status describes the last observed state of this internal release image.
3438
// +optional
@@ -37,51 +41,56 @@ type InternalReleaseImage struct {
3741

3842
// InternalReleaseImageStatus describes the current state of a InternalReleaseImage.
3943
type InternalReleaseImageStatus struct {
44+
// conditions represent the observations of an internal release image current state.
45+
// +listType=map
46+
// +listMapKey=type
47+
// +kubebuilder:validation:MaxItems=20
48+
// +optional
49+
Conditions []metav1.Condition `json:"conditions,omitempty"`
50+
4051
// availableReleases is a list of release bundle identifiers currently detected
4152
// from the attached ISO.
4253
// +listType=map
4354
// +listMapKey=name
55+
// +kubebuilder:validation:MinItems=1
56+
// +kubebuilder:validation:MaxItems=64
4457
// +optional
45-
AvailableReleases []InternalReleaseImageRef `json:"availableReleases"`
58+
AvailableReleases []InternalReleaseImageRef `json:"availableReleases,omitempty"`
4659

4760
// releases is a list of the currently managed release bundles.
4861
// +listType=map
4962
// +listMapKey=name
50-
// +required
51-
Releases []InternalReleaseImageRef `json:"releases"`
52-
53-
// conditions represent the observations of an internal release image current state.
54-
// +listType=map
55-
// +listMapKey=type
63+
// +kubebuilder:validation:MinItems=1
64+
// +kubebuilder:validation:MaxItems=64
5665
// +optional
57-
Conditions []metav1.Condition `json:"conditions,omitempty"`
66+
Releases []InternalReleaseImageRef `json:"releases,omitempty"`
5867
}
5968

6069
// InternalReleaseImageSpec defines the desired state of a InternalReleaseImage.
6170
type InternalReleaseImageSpec struct {
6271
// releases is a list of release bundle identifiers that the user wants to
6372
// add/remove to/from the control plane nodes.
64-
// +required
73+
// +optional
6574
// +kubebuilder:validation:MinItems=1
6675
// +kubebuilder:validation:MaxItems=20
6776
// +listType=map
6877
// +listMapKey=name
69-
Releases []InternalReleaseImageRef `json:"releases"`
78+
Releases []InternalReleaseImageRef `json:"releases,omitempty"`
7079
}
7180

7281
type InternalReleaseImageRef struct {
7382
// name indicates the desired release bundle identifier.
7483
// +required
7584
// +kubebuilder:validation:MinLength=1
7685
// +kubebuilder:validation:MaxLength=64
77-
Name string `json:"name"`
86+
Name string `json:"name,omitempty"`
7887

7988
// image is an OCP release imaged referenced by digest.
8089
// The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
8190
// where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
8291
// The length of the whole spec must be between 1 to 447 characters.
8392
// +optional
84-
Image machineosconfig.ImageDigestFormat `json:"image"`
93+
Image machineosconfig.ImageDigestFormat `json:"image,omitempty"`
8594
}
8695

8796
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

0 commit comments

Comments
 (0)