Skip to content

Commit 4fae29c

Browse files
authored
Merge pull request #12974 from sivchari/bump-kal
🌱 Bump Kube API Linter version
2 parents 2d94bfe + 2456113 commit 4fae29c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.golangci-kal.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ linters:
9696
linters:
9797
- kubeapilinter
9898
- path: "api/addons/v1beta2|api/bootstrap/kubeadm/v1beta2|api/controlplane/kubeadm/v1beta2|api/core/v1beta2|api/ipam/v1beta2|api/runtime/v1beta2"
99-
text: "ssatags: Conditions should have a listType marker for proper Server-Side Apply behavior"
99+
text: "ssatags: .*Conditions should have a listType marker for proper Server-Side Apply behavior"
100100
linters:
101101
- kubeapilinter
102102
- path: "api/core/v1beta2"
103-
text: "field Conditions type Conditions must have a maximum items, add kubebuilder:validation:MaxItems marker"
103+
text: "field .*Conditions type Conditions must have a maximum items, add kubebuilder:validation:MaxItems marker"
104104
linters:
105105
- kubeapilinter
106106
- path: "api/core/v1beta2/condition_types.go"
@@ -122,7 +122,7 @@ linters:
122122
## Excludes for JSONSchemaProps
123123
# We want to align to the JSON tags of the CustomResourceDefinition fields.
124124
- path: "api/core/v1beta2/clusterclass_types"
125-
text: "field (XPreserveUnknownFields|XPreserveUnknownFields|XValidations|XMetadata|XIntOrString) json tag does not match pattern"
125+
text: "field JSONSchemaProps.(XPreserveUnknownFields|XPreserveUnknownFields|XValidations|XMetadata|XIntOrString) json tag does not match pattern"
126126
linters:
127127
- kubeapilinter
128128
# We want to align Properties to the corresponding field in CustomResourceDefinitions.
@@ -145,7 +145,7 @@ linters:
145145
## Excludes for kubeadm types
146146
# We want to align the FeatureGates field to the FeatureGates field in kubeadm.
147147
- path: "api/bootstrap/kubeadm/v1beta2/kubeadm_types.go"
148-
text: "nomaps: FeatureGates should not use a map type, use a list type with a unique name/identifier instead"
148+
text: "nomaps: ClusterConfiguration.FeatureGates should not use a map type, use a list type with a unique name/identifier instead"
149149
linters:
150150
- kubeapilinter
151151

@@ -166,11 +166,11 @@ linters:
166166

167167
# Excludes for existing default markers
168168
- path: "api/core/v1beta2/clusterclass_types.go"
169-
text: 'forbiddenmarkers: field Reason has forbidden marker "kubebuilder:default=FieldValueInvalid"'
169+
text: 'forbiddenmarkers: field ValidationRule.Reason has forbidden marker "kubebuilder:default=FieldValueInvalid"'
170170
linters:
171171
- kubeapilinter
172172
- path: "api/core/v1beta2/clusterclass_types.go"
173-
text: 'forbiddenmarkers: field Reason has forbidden marker "default=ref\(sigs.k8s.io/cluster-api/api/core/v1beta2.FieldValueInvalid\)"'
173+
text: 'forbiddenmarkers: field ValidationRule.Reason has forbidden marker "default=ref\(sigs.k8s.io/cluster-api/api/core/v1beta2.FieldValueInvalid\)"'
174174
linters:
175175
- kubeapilinter
176176

hack/tools/.custom-gcl.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
version: v2.4.0
1+
version: v2.5.0
22
name: golangci-lint-kube-api-linter
33
destination: ./bin
44
plugins:
55
- module: 'sigs.k8s.io/kube-api-linter'
6-
version: v0.0.0-20250908163129-65a570bd22aa
6+
version: v0.0.0-20251107220451-f87b38edda8c

0 commit comments

Comments
 (0)