Skip to content

Commit 2a72276

Browse files
authored
Merge pull request #1111 from aramase/driver-crds-v1.26
chore: use kubectl v1.26.0 in driver-crds
2 parents cdc8356 + 7513988 commit 2a72276

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ PROTOC_VERSION ?= 3.20.1
105105
SHELLCHECK_VER ?= v0.8.0
106106
YQ_VERSION ?= v4.11.2
107107

108-
# For aws integration tests
108+
# For aws integration tests
109109
BUILD_TIMESTAMP_W_SEC := $(shell date +%Y-%m-%d-%H-%M-%S)
110110
EKS_CLUSTER_NAME := integ-cluster-$(BUILD_TIMESTAMP_W_SEC)
111111
AWS_REGION := us-west-2
@@ -158,7 +158,7 @@ image-scan: $(TRIVY)
158158
$(TRIVY) image --severity MEDIUM,HIGH,CRITICAL $(CRD_IMAGE_TAG)
159159
# show vulnerabilities that have been fixed
160160
$(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)
162162

163163
## --------------------------------------
164164
## Tooling Binaries
@@ -197,7 +197,7 @@ $(KIND): ## Download and install kind
197197
$(AZURE_CLI): ## Download and install azure cli
198198
curl -sL https://aka.ms/InstallAzureCLIDeb | bash
199199

200-
$(EKSCTL): ## Download and install eksctl
200+
$(EKSCTL): ## Download and install eksctl
201201
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/
202202

203203
$(KUBECTL): ## Install kubectl
@@ -213,7 +213,7 @@ $(ENVSUBST): ## Install envsubst for running the tests
213213
envsubst -V || (apt-get -o Acquire::Retries=30 update && apt-get -o Acquire::Retries=30 install gettext-base -y)
214214

215215
$(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
217217

218218
$(YQ): ## Install yq for running the tests
219219
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)
371371

372372
.PHONY: setup-eks-cluster
373373
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)
375375

376376
.PHONY: e2e-container
377377
e2e-container:
@@ -463,7 +463,7 @@ e2e-kind-cleanup:
463463
kind delete cluster --name kind
464464

465465
.PHONY: e2e-eks-cleanup
466-
e2e-eks-cleanup:
466+
e2e-eks-cleanup:
467467
eksctl delete cluster --name $(EKS_CLUSTER_NAME) --region $(AWS_REGION)
468468

469469
.PHONY: e2e-provider
@@ -489,7 +489,7 @@ e2e-gcp:
489489
.PHONY: e2e-aws
490490
e2e-aws:
491491
bats -t test/bats/aws.bats
492-
492+
493493
## --------------------------------------
494494
## Generate
495495
## --------------------------------------

docker/crd.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
FROM alpine as builder
16-
ARG KUBE_VERSION=v1.25.4
16+
ARG KUBE_VERSION=v1.26.0
1717
ARG TARGETARCH
1818

1919
RUN apk add --no-cache curl && \

0 commit comments

Comments
 (0)