Skip to content

Commit f1fbda2

Browse files
authored
Merge pull request #676 from shiftstack/bump-kal
Bump KAL
2 parents 7ce708f + 4ca9cfd commit f1fbda2

46 files changed

Lines changed: 281 additions & 124 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.golangci.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ linters:
3434
settings:
3535
linters:
3636
disable:
37+
# NOTE: conflicts with the lack of validation in the Status structs
38+
- arrayofstruct
39+
# NOTE: The following checks are currently failing
3740
- optionalfields
3841
enable:
3942
- commentstart
4043
- conditions
44+
- defaults
4145
- duplicatemarkers
4246
- integers
4347
- jsontags
@@ -48,6 +52,7 @@ linters:
4852
- nodurations
4953
- nofloats
5054
- nomaps
55+
- nonpointerstructs
5156
- nonullable
5257
- notimestamp
5358
- nophase
@@ -62,11 +67,14 @@ linters:
6267
isFirstField: Warn
6368
usePatchStrategy: Ignore
6469
useProtobuf: Forbid
70+
defaults:
71+
# Let's use `+kubebuilder:default` until elastic/crd-ref-docs supports `+default`
72+
preferredDefaultMarker: "kubebuilder:default"
6573
requiredfields:
6674
omitempty:
6775
policy: Ignore
6876
exclusions:
69-
generated: lax
77+
generated: disable
7078
rules:
7179
- linters:
7280
- lll
@@ -75,13 +83,22 @@ linters:
7583
- dupl
7684
- lll
7785
path: internal/*
86+
- linters:
87+
- dupl
88+
- goimports
89+
- unparam
90+
path: zz_generated
7891
- linters:
7992
- kubeapilinter
80-
path-except: api/*
93+
path-except: ^api/*
8194
paths:
8295
- third_party$
8396
- builtin$
8497
- examples$
98+
- applyconfiguration/*
99+
- clientset/*
100+
- informers/*
101+
- listers/*
85102
formatters:
86103
enable:
87104
- gofmt
@@ -92,3 +109,5 @@ formatters:
92109
- third_party$
93110
- builtin$
94111
- examples$
112+
issues:
113+
exclude-generated: disable

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ KUSTOMIZE_VERSION ?= v5.6.0
315315
CONTROLLER_TOOLS_VERSION ?= v0.17.1
316316
ENVTEST_VERSION ?= release-0.22
317317
GOLANGCI_LINT_VERSION ?= v2.7.2
318-
KAL_VERSION ?= v0.0.0-20250924094418-502783c08f9d
318+
KAL_VERSION ?= v0.0.0-20260205134631-d65d24a9df89
319319
MOCKGEN_VERSION ?= v0.5.0
320320
KUTTL_VERSION ?= v0.24.0
321321
GOVULNCHECK_VERSION ?= v1.1.4

api/v1alpha1/image_types.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ type ImageContent struct {
267267
// download describes how to obtain image data by downloading it from a URL.
268268
// Must be set when creating a managed image.
269269
// +required
270-
//nolint:kubeapilinter
271-
Download *ImageContentSourceDownload `json:"download"`
270+
Download *ImageContentSourceDownload `json:"download,omitempty"`
272271
}
273272

274273
type ImageContentSourceDownload struct {

api/v1alpha1/router_interface_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ type RouterInterface struct {
3636
metav1.ObjectMeta `json:"metadata,omitempty"`
3737

3838
// spec specifies the desired state of the resource.
39-
// +optional
40-
Spec RouterInterfaceSpec `json:"spec,omitempty"`
39+
// +required
40+
Spec RouterInterfaceSpec `json:"spec,omitzero"`
4141

4242
// status defines the observed state of the resource.
4343
// +optional

api/v1alpha1/zz_generated.domain-resource.go

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

api/v1alpha1/zz_generated.flavor-resource.go

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

api/v1alpha1/zz_generated.floatingip-resource.go

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

api/v1alpha1/zz_generated.group-resource.go

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

api/v1alpha1/zz_generated.image-resource.go

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

api/v1alpha1/zz_generated.keypair-resource.go

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

0 commit comments

Comments
 (0)