Merge pull request #159 from darkowlzz/ct-marker-evaluation

runtime/events: fix Severity validation marker value
fluxcd · Oct 10, 2021 · 6c1a229 · 6c1a229
2 parents 36ddbce + 5d975bb
commit 6c1a229
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -25,6 +25,8 @@ vet-%:
 	cd $(subst :,/,$*); go vet ./...
 
 generate-%: controller-gen
+	# Run schemapatch to validate all the kubebuilder markers before generation.
+	cd $(subst :,/,$*); $(CONTROLLER_GEN) schemapatch:manifests="./" paths="./..."
 	cd $(subst :,/,$*); $(CONTROLLER_GEN) object:headerFile="$(root_dir)/hack/boilerplate.go.txt" paths="./..."
 
 test-%: generate-% tidy-% fmt-% vet-% setup-envtest

diff --git a/runtime/events/event.go b/runtime/events/event.go
@@ -42,7 +42,7 @@ type Event struct {
 	InvolvedObject corev1.ObjectReference `json:"involvedObject"`
 
 	// Severity type of this event (trace, info, error)
-	// +kubebuilder:validation:Enum=trace,info;error
+	// +kubebuilder:validation:Enum=trace;info;error
 	// +required
 	Severity string `json:"severity"`