Skip to content

Commit 595c787

Browse files
Add verify-manifests target and fix config files (#745)
Signed-off-by: Prajyot-Parab <[email protected]>
1 parent 32edda9 commit 595c787

8 files changed

+17
-50
lines changed

Makefile

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ lint: $(GOLANGCI_LINT) ## Lint codebase
405405
lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
406406
GOLANGCI_LINT_EXTRA_ARGS=--fix $(MAKE) lint
407407

408-
ALL_VERIFY_CHECKS = doctoc boilerplate shellcheck modules gen conversions #tiltfile
408+
ALL_VERIFY_CHECKS = doctoc boilerplate shellcheck modules gen manifests conversions #tiltfile
409409

410410
.PHONY: verify
411411
verify: $(addprefix verify-,$(ALL_VERIFY_CHECKS)) ## Run all verify-* targets
@@ -444,6 +444,13 @@ verify-gen: generate ## Verfiy go generated files are up to date
444444
echo "generated files are out of date, run make generate"; exit 1; \
445445
fi
446446

447+
.PHONY: verify-manifests
448+
verify-manifests: manifests ## Verfiy go generated manifests files are up to date
449+
@if !(git diff --quiet HEAD); then \
450+
git diff; \
451+
echo "generated manifests files are out of date, run make manifests"; exit 1; \
452+
fi
453+
447454
.PHONY: verify-conversions
448455
verify-conversions: $(CONVERSION_VERIFIER) ## Verifies expected API conversion are in place
449456
$(CONVERSION_VERIFIER)

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmpowervsclusters.infrastructure.cluster.x-k8s.io
99
spec:
@@ -158,9 +158,3 @@ spec:
158158
storage: true
159159
subresources:
160160
status: {}
161-
status:
162-
acceptedNames:
163-
kind: ""
164-
plural: ""
165-
conditions: []
166-
storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsimages.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmpowervsimages.infrastructure.cluster.x-k8s.io
99
spec:
@@ -151,9 +151,3 @@ spec:
151151
storage: true
152152
subresources:
153153
status: {}
154-
status:
155-
acceptedNames:
156-
kind: ""
157-
plural: ""
158-
conditions: []
159-
storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmpowervsmachines.infrastructure.cluster.x-k8s.io
99
spec:
@@ -210,6 +210,7 @@ spec:
210210
TODO: Add other useful fields. apiVersion, kind, uid?'
211211
type: string
212212
type: object
213+
x-kubernetes-map-type: atomic
213214
memory:
214215
description: Memory is Amount of memory allocated (in GB)
215216
type: string
@@ -375,9 +376,3 @@ spec:
375376
storage: true
376377
subresources:
377378
status: {}
378-
status:
379-
acceptedNames:
380-
kind: ""
381-
plural: ""
382-
conditions: []
383-
storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachinetemplates.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmpowervsmachinetemplates.infrastructure.cluster.x-k8s.io
99
spec:
@@ -167,6 +167,7 @@ spec:
167167
TODO: Add other useful fields. apiVersion, kind, uid?'
168168
type: string
169169
type: object
170+
x-kubernetes-map-type: atomic
170171
memory:
171172
description: Memory is Amount of memory allocated (in GB)
172173
type: string
@@ -224,9 +225,3 @@ spec:
224225
type: object
225226
served: true
226227
storage: true
227-
status:
228-
acceptedNames:
229-
kind: ""
230-
plural: ""
231-
conditions: []
232-
storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmvpcclusters.infrastructure.cluster.x-k8s.io
99
spec:
@@ -365,9 +365,3 @@ spec:
365365
storage: true
366366
subresources:
367367
status: {}
368-
status:
369-
acceptedNames:
370-
kind: ""
371-
plural: ""
372-
conditions: []
373-
storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachines.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmvpcmachines.infrastructure.cluster.x-k8s.io
99
spec:
@@ -319,9 +319,3 @@ spec:
319319
storage: true
320320
subresources:
321321
status: {}
322-
status:
323-
acceptedNames:
324-
kind: ""
325-
plural: ""
326-
conditions: []
327-
storedVersions: []

config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachinetemplates.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.2
77
creationTimestamp: null
88
name: ibmvpcmachinetemplates.infrastructure.cluster.x-k8s.io
99
spec:
@@ -259,9 +259,3 @@ spec:
259259
type: object
260260
served: true
261261
storage: true
262-
status:
263-
acceptedNames:
264-
kind: ""
265-
plural: ""
266-
conditions: []
267-
storedVersions: []

0 commit comments

Comments
 (0)