@@ -13,16 +13,16 @@ EXT_VARS := --tla-str cloud=$(CLOUD)
13
13
UNAME_S := $(shell uname -s)
14
14
ifeq ($(UNAME_S ) ,Linux)
15
15
SHASUM := sha256sum -c
16
- KUBECFG_URL := https://github.com/ksonnet/kubecfg/releases/download/v0.9.1 /kubecfg-linux-amd64
17
- KUBECFG_HASH := c972b52893794ccd49adfc9d7b69e2d388c0c91c4837e194de7cdf0d67b2baf8
16
+ KUBECFG_URL := https://github.com/ksonnet/kubecfg/releases/download/v0.14.0 /kubecfg-linux-amd64
17
+ KUBECFG_HASH := bb1455ec70f93d6f0fd344becec2f1617837a879e8363272d3216bf44c04cb2c
18
18
endif
19
19
ifeq ($(UNAME_S ) ,Darwin)
20
20
SHASUM := shasum -a 256 -c
21
- KUBECFG_URL := https://github.com/ksonnet/kubecfg/releases/download/v0.9.1 /kubecfg-darwin-amd64
22
- KUBECFG_HASH := 9b6772abc3e2da5add51aa57a2944f77f4c05be49df56087056837aa640fb9c9
21
+ KUBECFG_URL := https://github.com/ksonnet/kubecfg/releases/download/v0.14.0 /kubecfg-darwin-amd64
22
+ KUBECFG_HASH := d448ae2888a28692a20d5ddb29ddae0574f74327611bd5b933092312f8c18fcf
23
23
endif
24
- JSONNET_URL := https://github.com/google/jsonnet/archive/v0.12.1 .tar.gz
25
- JSONNET_HASH := 257c6de988f746cc90486d9d0fbd49826832b7a2f0dbdb60a515cc8a2596c950
24
+ JSONNET_URL := https://github.com/google/jsonnet/archive/v0.14.0 .tar.gz
25
+ JSONNET_HASH := 7f41cdc4cb366cfc1de3aada926a2f7e640ef025887eb05cdaf8342d6e4e088b
26
26
27
27
export KUBECONFIG
28
28
@@ -70,12 +70,13 @@ manifests_destroy: depend manifests/$(CLOUD)-config.json ## Use kubecfg to delet
70
70
$(BINDIR ) /kubecfg $(EXT_VARS ) show config.jsonnet | kubectl delete -f - --ignore-not-found
71
71
72
72
.PHONY : manifests_backup_certificates
73
- manifests_backup_certificates :
74
- kubectl get secrets --all-namespaces -l certmanager.k8s.io/certificate-name -o yaml > .backup-certificates-$(CLOUD ) .yaml.tmp
73
+ manifests_backup_certificates : # # backup tls secrets
74
+ export SECRETS=" $( shell kubectl get secrets -n auth -o ' jsonpath={.items[*].metadata.name}' | tr " " " \n" | grep tls) "
75
+ kubectl get -n auth secrets -o yaml $(SECRETS ) > .backup-certificates-$(CLOUD ) .yaml.tmp
75
76
mv .backup-certificates-$(CLOUD ) .yaml.tmp .backup-certificates-$(CLOUD ) .yaml
76
77
77
78
.PHONY : manifests_restore_certificates
78
- manifests_restore_certificates :
79
+ manifests_restore_certificates : # # restore tls secrets
79
80
kubectl create ns auth --dry-run -o yaml | kubectl apply -f -
80
81
kubectl apply -f .backup-certificates-$(CLOUD ) .yaml
81
82
@@ -100,6 +101,6 @@ $(BINDIR)/jsonnet:
100
101
curl -sL -o $@ .tar.gz $(JSONNET_URL )
101
102
echo " $( JSONNET_HASH) $@ .tar.gz" | $(SHASUM )
102
103
cd $(BINDIR ) && tar xf jsonnet.tar.gz && rm jsonnet.tar.gz
103
- make -C $(BINDIR ) /jsonnet-0.12.1
104
- mv $(BINDIR ) /jsonnet-0.12.1 /jsonnet $(BINDIR ) /jsonnet
105
- rm -rf $(BINDIR ) /jsonnet-0.12.1
104
+ make -C $(BINDIR ) /jsonnet-0.14.0
105
+ mv $(BINDIR ) /jsonnet-0.14.0 /jsonnet $(BINDIR ) /jsonnet
106
+ rm -rf $(BINDIR ) /jsonnet-0.14.0
0 commit comments