@@ -106,21 +106,21 @@ helm-docs: docker
106106helm-lint : docker
107107 @docker run -v " $( SRC_ROOT) :/workdir" --entrypoint /bin/sh quay.io/helmpack/chart-testing:v3.3.1 -c " cd /workdir; ct lint --config .github/configs/ct.yaml --lint-conf .github/configs/lintconf.yaml --all --debug"
108108
109- helm-test : helm-controller-version kind ct ko-build-all helm-create helm-install helm-destroy
109+ helm-test : helm-controller-version ct ko-build-all helm-create helm-install helm-destroy
110110
111111helm-install :
112112 @kubectl apply --server-side=true -f https://github.com/cert-manager/cert-manager/releases/download/v1.13.2/cert-manager.yaml
113113 @make install-capsule
114114 @kubectl apply --server-side=true -f https://github.com/prometheus-operator/prometheus-operator/releases/download/v0.58.0/bundle.yaml
115115 @$(CT ) install --config $(SRC_ROOT ) /.github/configs/ct.yaml --namespace=capsule-system --all --debug
116116
117- helm-create :
118- @kind create cluster --wait=60s --name capsule-charts
119- @kind load docker-image --name capsule-charts $(CAPSULE_PROXY_IMG ) :$(VERSION )
117+ helm-create : kind
118+ @$( KIND ) create cluster --wait=60s --name capsule-charts
119+ @$( KIND ) load docker-image --name capsule-charts $(CAPSULE_PROXY_IMG ) :$(VERSION )
120120 @kubectl create ns capsule-system
121121
122- helm-destroy :
123- @kind delete cluster --name capsule-charts
122+ helm-destroy : kind
123+ @$( KIND ) delete cluster --name capsule-charts
124124
125125# ###################
126126# -- Testing
@@ -138,9 +138,9 @@ e2e-exec: ginkgo
138138 $(GINKGO ) -v -tags e2e ./e2e
139139
140140.PHONY : e2e-build
141- e2e-build :
141+ e2e-build : kind
142142 @echo " Building kubernetes env using Kind $$ {KIND_K8S_VERSION:-v1.27.0}..."
143- @kind create cluster --name capsule --image kindest/node:$$ {KIND_K8S_VERSION:-v1.27.0} --config ./e2e/kind.yaml --wait=120s \
143+ @$( KIND ) create cluster --name capsule --image kindest/node:$$ {KIND_K8S_VERSION:-v1.27.0} --config ./e2e/kind.yaml --wait=120s \
144144 && kubectl taint nodes capsule-worker2 key1=value1:NoSchedule
145145 @helm repo add bitnami https://charts.bitnami.com/bitnami
146146 @helm repo update
@@ -153,13 +153,13 @@ e2e-build:
153153e2e-install : install-capsule install-capsule-proxy rbac-fix
154154
155155.PHONY : e2e-load-image
156- e2e-load-image : ko-build-all
156+ e2e-load-image : kind ko-build-all
157157 @echo " Loading Docker image..."
158- @kind load docker-image --name capsule $(CAPSULE_PROXY_IMG ) :$(VERSION )
158+ @$( KIND ) load docker-image --name capsule $(CAPSULE_PROXY_IMG ) :$(VERSION )
159159
160160.PHONY : e2e-destroy
161- e2e-destroy :
162- kind delete cluster --name capsule
161+ e2e-destroy : kind
162+ $( KIND ) delete cluster --name capsule
163163
164164install-capsule :
165165 @echo " Installing capsule..."
0 commit comments