@@ -105,7 +105,7 @@ PROTOC_VERSION ?= 3.20.1
105
105
SHELLCHECK_VER ?= v0.8.0
106
106
YQ_VERSION ?= v4.11.2
107
107
108
- # For aws integration tests
108
+ # For aws integration tests
109
109
BUILD_TIMESTAMP_W_SEC := $(shell date +% Y-% m-% d-% H-% M-% S)
110
110
EKS_CLUSTER_NAME := integ-cluster-$(BUILD_TIMESTAMP_W_SEC )
111
111
AWS_REGION := us-west-2
@@ -158,7 +158,7 @@ image-scan: $(TRIVY)
158
158
$(TRIVY ) image --severity MEDIUM,HIGH,CRITICAL $(CRD_IMAGE_TAG )
159
159
# show vulnerabilities that have been fixed
160
160
$(TRIVY ) image --exit-code 1 --ignore-unfixed --severity MEDIUM,HIGH,CRITICAL $(IMAGE_TAG )
161
- $(TRIVY ) image --vuln-type os -- exit-code 1 --ignore-unfixed --severity MEDIUM,HIGH,CRITICAL $(CRD_IMAGE_TAG )
161
+ $(TRIVY ) image --exit-code 1 --ignore-unfixed --severity MEDIUM,HIGH,CRITICAL $(CRD_IMAGE_TAG )
162
162
163
163
# # --------------------------------------
164
164
# # Tooling Binaries
@@ -197,7 +197,7 @@ $(KIND): ## Download and install kind
197
197
$(AZURE_CLI ) : # # Download and install azure cli
198
198
curl -sL https://aka.ms/InstallAzureCLIDeb | bash
199
199
200
- $(EKSCTL ) : # # Download and install eksctl
200
+ $(EKSCTL ) : # # Download and install eksctl
201
201
curl -sSLO https://github.com/weaveworks/eksctl/releases/latest/download/eksctl_Linux_amd64.tar.gz && tar -zxvf eksctl_Linux_amd64.tar.gz && chmod +x eksctl && mv eksctl /usr/local/bin/
202
202
203
203
$(KUBECTL ) : # # Install kubectl
@@ -213,7 +213,7 @@ $(ENVSUBST): ## Install envsubst for running the tests
213
213
envsubst -V || (apt-get -o Acquire::Retries=30 update && apt-get -o Acquire::Retries=30 install gettext-base -y)
214
214
215
215
$(PROTOC ) : # # Install protoc
216
- curl -sSLO https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION} /protoc-${PROTOC_VERSION} -linux-x86_64.zip && unzip protoc-${PROTOC_VERSION} -linux-x86_64.zip bin/protoc -d $(TOOLS_DIR ) && rm protoc-${PROTOC_VERSION} -linux-x86_64.zip
216
+ curl -sSLO https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION} /protoc-${PROTOC_VERSION} -linux-x86_64.zip && unzip protoc-${PROTOC_VERSION} -linux-x86_64.zip bin/protoc -d $(TOOLS_DIR ) && rm protoc-${PROTOC_VERSION} -linux-x86_64.zip
217
217
218
218
$(YQ ) : # # Install yq for running the tests
219
219
curl -LO https://github.com/mikefarah/yq/releases/download/$(YQ_VERSION ) /yq_linux_amd64 && chmod +x ./yq_linux_amd64 && mv yq_linux_amd64 /usr/local/bin/yq
@@ -371,7 +371,7 @@ setup-kind: $(KIND)
371
371
372
372
.PHONY : setup-eks-cluster
373
373
setup-eks-cluster : $(HELM ) $(EKSCTL ) $(BATS ) $(ENVSUBST ) $(YQ )
374
- bash test/scripts/initialize_eks_cluster.bash $(EKS_CLUSTER_NAME ) $(IMAGE_VERSION )
374
+ bash test/scripts/initialize_eks_cluster.bash $(EKS_CLUSTER_NAME ) $(IMAGE_VERSION )
375
375
376
376
.PHONY : e2e-container
377
377
e2e-container :
@@ -463,7 +463,7 @@ e2e-kind-cleanup:
463
463
kind delete cluster --name kind
464
464
465
465
.PHONY : e2e-eks-cleanup
466
- e2e-eks-cleanup :
466
+ e2e-eks-cleanup :
467
467
eksctl delete cluster --name $(EKS_CLUSTER_NAME ) --region $(AWS_REGION )
468
468
469
469
.PHONY : e2e-provider
@@ -489,7 +489,7 @@ e2e-gcp:
489
489
.PHONY : e2e-aws
490
490
e2e-aws :
491
491
bats -t test/bats/aws.bats
492
-
492
+
493
493
# # --------------------------------------
494
494
# # Generate
495
495
# # --------------------------------------
0 commit comments