Skip to content

Commit c2f669c

Browse files
committed
linter fix
1 parent 9eca225 commit c2f669c

File tree

9 files changed

+82
-59
lines changed

9 files changed

+82
-59
lines changed

machineconfiguration/v1alpha1/types_internalreleaseimage.go

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,65 +23,75 @@ 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
35-
Status InternalReleaseImageStatus `json:"status"`
39+
Status *InternalReleaseImageStatus `json:"status,omitempty"`
3640
}
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:MinItems=1
48+
// +kubebuilder:validation:MaxItems=256
49+
// +optional
50+
Conditions []metav1.Condition `json:"conditions,omitempty"`
51+
4052
// availableReleases is a list of release bundle identifiers currently detected
4153
// from the attached ISO.
4254
// +listType=map
4355
// +listMapKey=name
56+
// +kubebuilder:validation:MinItems=1
57+
// +kubebuilder:validation:MaxItems=64
4458
// +optional
45-
AvailableReleases []InternalReleaseImageRef `json:"availableReleases"`
59+
AvailableReleases []InternalReleaseImageRef `json:"availableReleases,omitempty"`
4660

4761
// releases is a list of the currently managed release bundles.
4862
// +listType=map
4963
// +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
64+
// +kubebuilder:validation:MinItems=1
65+
// +kubebuilder:validation:MaxItems=64
5666
// +optional
57-
Conditions []metav1.Condition `json:"conditions,omitempty"`
67+
Releases []InternalReleaseImageRef `json:"releases,omitempty"`
5868
}
5969

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

7282
type InternalReleaseImageRef struct {
7383
// name indicates the desired release bundle identifier.
7484
// +required
7585
// +kubebuilder:validation:MinLength=1
7686
// +kubebuilder:validation:MaxLength=64
77-
Name string `json:"name"`
87+
Name string `json:"name,omitempty"`
7888

7989
// image is an OCP release imaged referenced by digest.
8090
// The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
8191
// where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
8292
// The length of the whole spec must be between 1 to 447 characters.
8393
// +optional
84-
Image machineosconfig.ImageDigestFormat `json:"image"`
94+
Image machineosconfig.ImageDigestFormat `json:"image,omitempty"`
8595
}
8696

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

machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_internalreleaseimages-CustomNoUpgrade.crd.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ spec:
122122
required:
123123
- name
124124
type: object
125+
maxItems: 64
126+
minItems: 1
125127
type: array
126128
x-kubernetes-list-map-keys:
127129
- name
@@ -183,6 +185,8 @@ spec:
183185
- status
184186
- type
185187
type: object
188+
maxItems: 256
189+
minItems: 1
186190
type: array
187191
x-kubernetes-list-map-keys:
188192
- type
@@ -215,12 +219,12 @@ spec:
215219
required:
216220
- name
217221
type: object
222+
maxItems: 64
223+
minItems: 1
218224
type: array
219225
x-kubernetes-list-map-keys:
220226
- name
221227
x-kubernetes-list-type: map
222-
required:
223-
- releases
224228
type: object
225229
required:
226230
- spec

machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_internalreleaseimages-DevPreviewNoUpgrade.crd.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ spec:
121121
required:
122122
- name
123123
type: object
124+
maxItems: 64
125+
minItems: 1
124126
type: array
125127
x-kubernetes-list-map-keys:
126128
- name
@@ -182,6 +184,8 @@ spec:
182184
- status
183185
- type
184186
type: object
187+
maxItems: 256
188+
minItems: 1
185189
type: array
186190
x-kubernetes-list-map-keys:
187191
- type
@@ -214,12 +218,12 @@ spec:
214218
required:
215219
- name
216220
type: object
221+
maxItems: 64
222+
minItems: 1
217223
type: array
218224
x-kubernetes-list-map-keys:
219225
- name
220226
x-kubernetes-list-type: map
221-
required:
222-
- releases
223227
type: object
224228
required:
225229
- spec

machineconfiguration/v1alpha1/zz_generated.crd-manifests/0000_80_machine-config_01_internalreleaseimages-TechPreviewNoUpgrade.crd.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ spec:
121121
required:
122122
- name
123123
type: object
124+
maxItems: 64
125+
minItems: 1
124126
type: array
125127
x-kubernetes-list-map-keys:
126128
- name
@@ -182,6 +184,8 @@ spec:
182184
- status
183185
- type
184186
type: object
187+
maxItems: 256
188+
minItems: 1
185189
type: array
186190
x-kubernetes-list-map-keys:
187191
- type
@@ -214,12 +218,12 @@ spec:
214218
required:
215219
- name
216220
type: object
221+
maxItems: 64
222+
minItems: 1
217223
type: array
218224
x-kubernetes-list-map-keys:
219225
- name
220226
x-kubernetes-list-type: map
221-
required:
222-
- releases
223227
type: object
224228
required:
225229
- spec

machineconfiguration/v1alpha1/zz_generated.deepcopy.go

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

machineconfiguration/v1alpha1/zz_generated.featuregated-crd-manifests/internalreleaseimages.machineconfiguration.openshift.io/NoRegistryClusterOperations.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ spec:
122122
required:
123123
- name
124124
type: object
125+
maxItems: 64
126+
minItems: 1
125127
type: array
126128
x-kubernetes-list-map-keys:
127129
- name
@@ -183,6 +185,8 @@ spec:
183185
- status
184186
- type
185187
type: object
188+
maxItems: 256
189+
minItems: 1
186190
type: array
187191
x-kubernetes-list-map-keys:
188192
- type
@@ -215,12 +219,12 @@ spec:
215219
required:
216220
- name
217221
type: object
222+
maxItems: 64
223+
minItems: 1
218224
type: array
219225
x-kubernetes-list-map-keys:
220226
- name
221227
x-kubernetes-list-type: map
222-
required:
223-
- releases
224228
type: object
225229
required:
226230
- spec

machineconfiguration/v1alpha1/zz_generated.swagger_doc_generated.go

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)