Upgrade Husky and SKIP_GIT_PUSH_HOOK option (#63)

* Upgrade Husky and SKIP_GIT_PUSH_HOOK option

* Upgrade Kustomize to the latest

* Fix Kustomize env replace path

* Container order not guaranteed

.husky/hooks/pre-push

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+if [[ "$SKIP_GIT_PUSH_HOOK" ]]; then exit 0; fi
+
 set -e
 
 if [[ -n "$(git status --short)" ]]; then

Makefile

@@ -124,7 +124,7 @@ controller-gen: ## Download controller-gen locally if necessary.
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 .PHONY: kustomize
 kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected].7)
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected].7)
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 .PHONY: envtest
@@ -140,7 +140,7 @@ kubebuilder: ## Download kubebuilder locally if necessary.
 HUSKY = $(shell pwd)/bin/husky
 .PHONY: husky
 husky: ## Download husky locally if necessary.
-	$(call go-get-tool,$(HUSKY),github.com/automation-co/[email protected].5)
+	$(call go-get-tool,$(HUSKY),github.com/automation-co/[email protected].14)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -151,7 +151,7 @@ TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
-GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
 rm -rf $$TMP_DIR ;\
 }
 endef

config/default/kustomization.yaml

@@ -76,7 +76,7 @@ vars:
 patches:
   - patch: |-
       - op: replace
-        path: "/spec/template/spec/containers/1/env/0"
+        path: "/spec/template/spec/containers/0/env/0"
         value:
           name: SUPPORTED_CSI_DRIVERS
           value: "ebs.csi.aws.com"

tests/e2e/stable/storageos/01-assert.yaml

@@ -21,28 +21,6 @@ spec:
         app.kubernetes.io/component: discoblocks
         control-plane: controller-manager
     spec:
-      containers:
-      - name: kube-rbac-proxy
-      - env:
-        - name: SUPPORTED_CSI_DRIVERS
-          value: csi.storageos.com
-        - name: SCHEDULER_STRICT_MODE
-          value: "true"
-        - name: MUTATOR_STRICT_MODE
-          value: "true"
-        name: manager
-        ports:
-        - containerPort: 9443
-          name: webhook-server
-          protocol: TCP
-        securityContext:
-          allowPrivilegeEscalation: false
-        volumeMounts:
-        - mountPath: /tmp/k8s-webhook-server/serving-certs
-          name: cert
-          readOnly: true
-        - mountPath: /etc/kubernetes/discoblocks-scheduler
-          name: config-volume
       schedulerName: default-scheduler
       securityContext:
         runAsNonRoot: true