From 76d7cc342b2ab0db3bf55d4cf6e741d73176cfc1 Mon Sep 17 00:00:00 2001 From: Damien Grisonnet Date: Mon, 6 Sep 2021 18:39:47 +0200 Subject: [PATCH] validate: run kubeconform on supported versions Instead of running kubeconform on only one version of Kubernetes, it would be better to run it against the 2 latests versions of Kubernetes that kube-prometheus supports, so that the validation will be in line with our support policy. Signed-off-by: Damien Grisonnet --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index b252173c..e2c265cd 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,6 @@ TOOLING=$(EMBEDMD_BIN) $(JB_BIN) $(GOJSONTOYAML_BIN) $(JSONNET_BIN) $(JSONNETLIN JSONNETFMT_ARGS=-n 2 --max-blank-lines 2 --string-style s --comment-style s -KUBE_VERSION?="1.20.0" - all: generate fmt test .PHONY: clean @@ -43,7 +41,16 @@ update: $(JB_BIN) $(JB_BIN) update .PHONY: validate -validate: crdschemas manifests $(KUBECONFORM_BIN) +validate: validate-1.21 validate-1.22 + +validate-1.21: + KUBE_VERSION=1.21.1 $(MAKE) kubeconform + +validate-1.22: + KUBE_VERSION=1.22.0 $(MAKE) kubeconform + +.PHONY: kubeconform +kubeconform: crdschemas manifests $(KUBECONFORM_BIN) $(KUBECONFORM_BIN) -kubernetes-version $(KUBE_VERSION) -schema-location 'default' -schema-location 'crdschemas/{{ .ResourceKind }}.json' -skip CustomResourceDefinition manifests/ .PHONY: fmt