From af7ed52c0e379c9cd18fca850edb631ec57bb5d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 03:12:00 +0000 Subject: [PATCH 1/2] build(deps): bump golang.org/x/mod from 0.18.0 to 0.20.0 Bumps [golang.org/x/mod](https://github.com/golang/mod) from 0.18.0 to 0.20.0. - [Commits](https://github.com/golang/mod/compare/v0.18.0...v0.20.0) --- updated-dependencies: - dependency-name: golang.org/x/mod dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4f3df29b..55c2f155 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.19.1 go.uber.org/zap v1.27.0 - golang.org/x/mod v0.18.0 + golang.org/x/mod v0.20.0 k8s.io/api v0.30.0 k8s.io/apiextensions-apiserver v0.30.0 k8s.io/apimachinery v0.30.0 diff --git a/go.sum b/go.sum index f010555d..69b40876 100644 --- a/go.sum +++ b/go.sum @@ -221,8 +221,8 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= -golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From 6bc25913d21cee16923038e6443fe391ee310853 Mon Sep 17 00:00:00 2001 From: michael12312 Date: Wed, 7 Aug 2024 15:08:38 +0800 Subject: [PATCH 2/2] feat: chart to v0.3.42 --- .github/workflows/main.yaml | 2 +- Dockerfile | 2 +- Dockerfile-check | 2 +- Dockerfile-dev | 2 +- VERSION | 2 +- bin/setup.sh | 2 +- chart/Chart.yaml | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 26d33115..64b25371 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -103,7 +103,7 @@ jobs: run: | [ -z "${GOPATH}" ] && export GOPATH=$HOME/go PATH="${GOPATH}/bin:${PATH}" - kind create cluster --image kindest/node:v1.28.7 + kind create cluster --image kindest/node:v1.29.4 echo "sleep 60s to wait node ready" sleep 60s kubectl get node diff --git a/Dockerfile b/Dockerfile index dd3b579b..4f563534 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ARG TARGETOS # Build RUN mkdir bin RUN apt install -y curl tar -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.28.4/bin/${TARGETOS}/${TARGETARCH}/kubectl +RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/${TARGETOS}/${TARGETARCH}/kubectl RUN chmod +x ./kubectl RUN mv kubectl bin RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_${TARGETOS}_${TARGETARCH}.tar.gz diff --git a/Dockerfile-check b/Dockerfile-check index 605c0c24..9133a42f 100644 --- a/Dockerfile-check +++ b/Dockerfile-check @@ -20,7 +20,7 @@ COPY bin/ bin/ RUN apt install -y curl RUN bin/setup.sh # Temporary fix see https://github.com/fidelity/kraan/issues/114 -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.28.4/bin/linux/amd64/kubectl +RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/linux/amd64/kubectl RUN chmod +x ./kubectl RUN mv kubectl bin RUN cp bin/* /usr/local/bin diff --git a/Dockerfile-dev b/Dockerfile-dev index 7b9dbae4..8586bde6 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -18,7 +18,7 @@ RUN go mod download RUN mkdir bin RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o bin/kraan-controller main/main.go RUN apt install -y curl -RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.28.4/bin/linux/amd64/kubectl +RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.29.7/bin/linux/amd64/kubectl RUN chmod +x ./kubectl RUN mv kubectl bin RUN curl -LO https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v3.8.7/kustomize_v3.8.7_linux_amd64.tar.gz diff --git a/VERSION b/VERSION index 09e126ad..8eab6eb2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.3.41 \ No newline at end of file +v0.3.42 \ No newline at end of file diff --git a/bin/setup.sh b/bin/setup.sh index f4998f2e..34c67312 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -4,7 +4,7 @@ linter_version=1.55.2 mockgen_version=v1.6.0 helm_version=v3.6.1 kind_version=v0.11.1 -kubectl_version=v1.28.4 +kubectl_version=v1.29.7 kustomize_version=v3.8.7 function usage() diff --git a/chart/Chart.yaml b/chart/Chart.yaml index a5044b33..f24d336a 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 description: A Helm chart for kraan controller name: kraan-controller type: application -appVersion: v0.3.41 -version: v0.3.41 +appVersion: v0.3.42 +version: v0.3.42