Skip to content

Commit b1a49b3

Browse files
andfasanoandfasano
committed
linter fix
1 parent 9eca225 commit b1a49b3

File tree

9 files changed

+83
-59
lines changed

9 files changed

+83
-59
lines changed

‎machineconfiguration/v1alpha1/types_internalreleaseimage.go‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
// +kubebuilder:object:root=true
1313
// +kubebuilder:resource:path=internalreleaseimages,scope=Cluster
1414
// +kubebuilder:subresource:status
15+
// +openshift:api-approved.openshift.io=https://github.com/openshift/api/pull/2510
1516
// +openshift:file-pattern=cvoRunLevel=0000_80,operatorName=machine-config,operatorOrdering=01
1617
// +openshift:enable:FeatureGate=NoRegistryClusterOperations
1718
// +kubebuilder:metadata:labels=openshift.io/operator-managed=
@@ -23,65 +24,75 @@ import (
2324
// 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.
2425
// +openshift:compatibility-gen:level=4
2526
type InternalReleaseImage struct {
26-
metav1.TypeMeta `json:",inline"`
27+
metav1.TypeMeta `json:",inline"`
28+
29+
// metadata is the standard object's metadata.
30+
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
31+
// +optional
2732
metav1.ObjectMeta `json:"metadata,omitempty"`
2833

2934
// spec describes the configuration of this internal release image.
3035
// +required
31-
Spec InternalReleaseImageSpec `json:"spec"`
36+
Spec InternalReleaseImageSpec `json:"spec,omitzero"`
3237

3338
// status describes the last observed state of this internal release image.
3439
// +optional
35-
Status InternalReleaseImageStatus `json:"status"`
40+
Status *InternalReleaseImageStatus `json:"status,omitempty"`
3641
}
3742

3843
// InternalReleaseImageStatus describes the current state of a InternalReleaseImage.
3944
type InternalReleaseImageStatus struct {
45+
// conditions represent the observations of an internal release image current state.
46+
// +listType=map
47+
// +listMapKey=type
48+
// +kubebuilder:validation:MinItems=1
49+
// +kubebuilder:validation:MaxItems=256
50+
// +optional
51+
Conditions []metav1.Condition `json:"conditions,omitempty"`
52+
4053
// availableReleases is a list of release bundle identifiers currently detected
4154
// from the attached ISO.
4255
// +listType=map
4356
// +listMapKey=name
57+
// +kubebuilder:validation:MinItems=1
58+
// +kubebuilder:validation:MaxItems=64
4459
// +optional
45-
AvailableReleases []InternalReleaseImageRef `json:"availableReleases"`
60+
AvailableReleases []InternalReleaseImageRef `json:"availableReleases,omitempty"`
4661

4762
// releases is a list of the currently managed release bundles.
4863
// +listType=map
4964
// +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
65+
// +kubebuilder:validation:MinItems=1
66+
// +kubebuilder:validation:MaxItems=64
5667
// +optional
57-
Conditions []metav1.Condition `json:"conditions,omitempty"`
68+
Releases []InternalReleaseImageRef `json:"releases,omitempty"`
5869
}
5970

6071
// InternalReleaseImageSpec defines the desired state of a InternalReleaseImage.
6172
type InternalReleaseImageSpec struct {
6273
// releases is a list of release bundle identifiers that the user wants to
6374
// add/remove to/from the control plane nodes.
64-
// +required
6575
// +kubebuilder:validation:MinItems=1
6676
// +kubebuilder:validation:MaxItems=20
6777
// +listType=map
6878
// +listMapKey=name
69-
Releases []InternalReleaseImageRef `json:"releases"`
79+
// +required
80+
Releases []InternalReleaseImageRef `json:"releases,omitempty"`
7081
}
7182

7283
type InternalReleaseImageRef struct {
7384
// name indicates the desired release bundle identifier.
7485
// +required
7586
// +kubebuilder:validation:MinLength=1
7687
// +kubebuilder:validation:MaxLength=64
77-
Name string `json:"name"`
88+
Name string `json:"name,omitempty"`
7889

7990
// image is an OCP release imaged referenced by digest.
8091
// The format of the image pull spec is: host[:port][/namespace]/name@sha256:<digest>,
8192
// where the digest must be 64 characters long, and consist only of lowercase hexadecimal characters, a-f and 0-9.
8293
// The length of the whole spec must be between 1 to 447 characters.
8394
// +optional
84-
Image machineosconfig.ImageDigestFormat `json:"image"`
95+
Image machineosconfig.ImageDigestFormat `json:"image,omitempty"`
8596
}
8697

8798
// +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)