@@ -15,14 +15,16 @@ ifeq ($(UNAME_S),Linux)
1515 SHASUM := sha256sum -c
1616 KUBECFG_URL := https://github.com/ksonnet/kubecfg/releases/download/v0.14.0/kubecfg-linux-amd64
1717 KUBECFG_HASH := bb1455ec70f93d6f0fd344becec2f1617837a879e8363272d3216bf44c04cb2c
18+ JSONNET_URL := https://github.com/google/jsonnet/releases/download/v0.14.0/jsonnet-bin-v0.14.0-linux.tar.gz
19+ JSONNET_HASH := 30ba7b243ddb24231882ae3aa1930e76b6050bb76b5ccd0d97410b21fb784039
1820endif
1921ifeq ($(UNAME_S ) ,Darwin)
2022 SHASUM := shasum -a 256 -c
2123 KUBECFG_URL := https://github.com/ksonnet/kubecfg/releases/download/v0.14.0/kubecfg-darwin-amd64
2224 KUBECFG_HASH := d448ae2888a28692a20d5ddb29ddae0574f74327611bd5b933092312f8c18fcf
25+ JSONNET_URL := https://github.com/google/jsonnet/releases/download/v0.14.0/jsonnet-bin-v0.14.0-osx.tar.gz
26+ JSONNET_HASH := e056c7305e8f86c0e2441085d5cdfd29b219ef09d8daae54e9f6d2647dd18d3e
2327endif
24- JSONNET_URL := https://github.com/google/jsonnet/archive/v0.14.0.tar.gz
25- JSONNET_HASH := 7f41cdc4cb366cfc1de3aada926a2f7e640ef025887eb05cdaf8342d6e4e088b
2628
2729export KUBECONFIG
2830
@@ -63,7 +65,7 @@ manifests_validate: depend manifests/$(CLOUD)-config.json ## Use kubecfg to vali
6365
6466.PHONY : manifests_validate
6567jsonnet_fmt : depend # # validate formatting of jsonnet files
66- $(BINDIR ) /jsonnet fmt --test $(shell find manifests/components/. manifests/main.jsonnet -name "* .jsonnet")
68+ $(BINDIR ) /jsonnetfmt --test $(shell find manifests/components/. manifests/main.jsonnet -name "* .jsonnet")
6769
6870.PHONY : manifests_destroy
6971manifests_destroy : depend manifests/$(CLOUD ) -config.json # # Use kubecfg to delete manifests
@@ -83,7 +85,7 @@ manifests_restore_certificates: ## restore tls secrets
8385verify : jsonnet_fmt # # verify code and vendor
8486
8587.PHONY : depend
86- depend : $(BINDIR ) /kubecfg $(BINDIR ) /jsonnet
88+ depend : $(BINDIR ) /kubecfg $(BINDIR ) /jsonnet $( BINDIR ) /jsonnetfmt
8789
8890.PHONY : clean
8991clean : # # clean up created files
@@ -99,7 +101,4 @@ $(BINDIR)/jsonnet:
99101 mkdir -p $(BINDIR )
100102 curl -sL -o $@ .tar.gz $(JSONNET_URL )
101103 echo " $( JSONNET_HASH) $@ .tar.gz" | $(SHASUM )
102- cd $(BINDIR ) && tar xf jsonnet.tar.gz && rm jsonnet.tar.gz
103- make -C $(BINDIR ) /jsonnet-0.14.0
104- mv $(BINDIR ) /jsonnet-0.14.0/jsonnet $(BINDIR ) /jsonnet
105- rm -rf $(BINDIR ) /jsonnet-0.14.0
104+ cd $(BINDIR ) && tar xvf jsonnet.tar.gz && rm jsonnet.tar.gz
0 commit comments