Merge pull request #44 from simonpasquier/merge-upstream

Merge upstream

Author: simonpasquier

.bingo/Variables.mk

@@ -77,11 +77,11 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
 	@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.21.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.21.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
 
-KUBEVAL := $(GOBIN)/kubeval-v0.0.0-20201005082916-38668c6c5b23
-$(KUBEVAL): $(BINGO_DIR)/kubeval.mod
+KUBECONFORM := $(GOBIN)/kubeconform-v0.7.0
+$(KUBECONFORM): $(BINGO_DIR)/kubeconform.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/kubeval-v0.0.0-20201005082916-38668c6c5b23"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kubeval.mod -o=$(GOBIN)/kubeval-v0.0.0-20201005082916-38668c6c5b23 "github.com/instrumenta/kubeval"
+	@echo "(re)installing $(GOBIN)/kubeconform-v0.7.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kubeconform.mod -o=$(GOBIN)/kubeconform-v0.7.0 "github.com/yannh/kubeconform/cmd/kubeconform"
 
 OAPI_CODEGEN := $(GOBIN)/oapi-codegen-v2.5.1
 $(OAPI_CODEGEN): $(BINGO_DIR)/oapi-codegen.mod

.bingo/kubeconform.mod

@@ -0,0 +1,5 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.24.10
+
+require github.com/yannh/kubeconform v0.7.0 // cmd/kubeconform

.bingo/kubeconform.sum

@@ -0,0 +1,14 @@
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
+github.com/yannh/kubeconform v0.7.0 h1:ZFfniR8VChrWQxaxTUGnNrxw8RIDkjVBrjdhXSamwjw=
+github.com/yannh/kubeconform v0.7.0/go.mod h1:oHO1wjM16sTRW6s41HJUox+tD69qOTE5ZVQ9HeqX+xM=
+golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
+golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
+sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

.bingo/kubeval.mod

@@ -28,7 +28,7 @@ JSONNET="${GOBIN}/jsonnet-v0.21.0"
 
 JSONNETFMT="${GOBIN}/jsonnetfmt-v0.21.0"
 
-KUBEVAL="${GOBIN}/kubeval-v0.0.0-20201005082916-38668c6c5b23"
+KUBECONFORM="${GOBIN}/kubeconform-v0.7.0"
 
 OAPI_CODEGEN="${GOBIN}/oapi-codegen-v2.5.1"
 

.bingo/kubeval.sum

@@ -283,8 +283,8 @@ ${MANIFESTS}: examples/main.jsonnet jsonnet/lib/* | $(JSONNET) $(GOJSONTOYAML)
 	$(JSONNET) -m ${MANIFESTS} examples/main.jsonnet | xargs -I{} sh -c 'cat {} | $(GOJSONTOYAML) > {}.yaml && rm -f {}' -- {
 
 .PHONY: validate
-validate: $(KUBEVAL)
-	$(KUBEVAL) ${MANIFESTS}/*.yaml
+validate: $(KUBECONFORM)
+	$(KUBECONFORM) -exit-on-error -summary -output json ${MANIFESTS}
 
 JSONNET_SRC = $(shell find . -name 'vendor' -prune -o -name 'examples/vendor' -prune -o -name 'tmp' -prune -o -name '*.libsonnet' -print -o -name '*.jsonnet' -print)
 JSONNETFMT_CMD := $(JSONNETFMT) -n 2 --max-blank-lines 2 --string-style s --comment-style s

.bingo/variables.env

@@ -19,14 +19,13 @@ var providerFactories map[string]ProviderFactory
 // providersMtx is used to protect the providerFactories.
 var providersMtx sync.RWMutex
 
-func init() {
-	providerFactories = make(map[string]ProviderFactory)
-}
-
 // onboardNewProvider is used by the providers to register themselves.
 func onboardNewProvider(providerType string, factory ProviderFactory) {
 	providersMtx.Lock()
 	defer providersMtx.Unlock()
+	if providerFactories == nil {
+		providerFactories = map[string]ProviderFactory{}
+	}
 
 	providerFactories[providerType] = factory
 }