diff --git a/.github/workflows/check-golangci-lint.yml b/.github/workflows/check-golangci-lint.yml index ddfb3a4..2353fdf 100644 --- a/.github/workflows/check-golangci-lint.yml +++ b/.github/workflows/check-golangci-lint.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v5.0.0 with: - go-version: "1.22.3" + go-version: "1.22.4" - uses: actions/checkout@v4.1.1 - name: golangci-lint uses: golangci/golangci-lint-action@v4.0.0 diff --git a/.github/workflows/check-govulncheck.yml b/.github/workflows/check-govulncheck.yml index 0f982fa..eb48306 100644 --- a/.github/workflows/check-govulncheck.yml +++ b/.github/workflows/check-govulncheck.yml @@ -15,5 +15,5 @@ jobs: - name: Scan for Vulnerabilities in Code uses: golang/govulncheck-action@v1 with: - go-version-input: 1.22.3 + go-version-input: 1.22.4 go-package: ./... diff --git a/.github/workflows/check-readme-linter.yml b/.github/workflows/check-readme-linter.yml index c20bc12..6c2e7ab 100644 --- a/.github/workflows/check-readme-linter.yml +++ b/.github/workflows/check-readme-linter.yml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/setup-go@v5.0.0 with: - go-version: "1.22.3" + go-version: "1.22.4" - uses: actions/checkout@v4.1.1 with: fetch-depth: 0 diff --git a/Dockerfile b/Dockerfile index 3e896e9..eff8694 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,7 @@ ## BUILD ARGS ## ################################################################################ # This build arg allows the specification of a custom Golang image. -ARG GOLANG_IMAGE=vcr.vngcloud.vn/81-vks-public/golang:1.22.3 +ARG GOLANG_IMAGE=vcr.vngcloud.vn/81-vks-public/golang:1.22.4 # The distroless image on which the CPI manager image is built. # @@ -22,7 +22,7 @@ ARG GOLANG_IMAGE=vcr.vngcloud.vn/81-vks-public/golang:1.22.3 # deterministic builds. Follow what kubernetes uses to build # kube-controller-manager, for example for 1.27.x: # https://github.com/kubernetes/kubernetes/blob/release-1.27/build/common.sh#L99 -ARG DISTROLESS_IMAGE=vcr.vngcloud.vn/81-vks-public/go-runner:v2.3.1-go1.22.3-bookworm.0 +ARG DISTROLESS_IMAGE=vcr.vngcloud.vn/81-vks-public/go-runner:v2.3.1-go1.22.4-bookworm.0 # We use Alpine as the source for default CA certificates and some output # images diff --git a/Makefile b/Makefile index fc889a9..99e3c87 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,13 @@ +push-base-repo: + docker pull golang:1.22.4 + docker tag golang:1.22.4 vcr.vngcloud.vn/81-vks-public/golang:1.22.4 + docker push vcr.vngcloud.vn/81-vks-public/golang:1.22.4 + docker image rm golang:1.22.4 vcr.vngcloud.vn/81-vks-public/golang:1.22.4 + + docker pull registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.4-bookworm.0 + docker tag registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.4-bookworm.0 vcr.vngcloud.vn/81-vks-public/go-runner:v2.3.1-go1.22.4-bookworm.0 + docker push vcr.vngcloud.vn/81-vks-public/go-runner:v2.3.1-go1.22.4-bookworm.0 + docker image rm registry.k8s.io/build-image/go-runner:v2.3.1-go1.22.4-bookworm.0 vcr.vngcloud.vn/81-vks-public/go-runner:v2.3.1-go1.22.4-bookworm.0 # golang-client Makefile # Follows the interface defined in the Golang CTI proposed # in https://review.openstack.org/410355 @@ -137,9 +147,11 @@ push-multiarch-image-%: --platform $(shell echo $(addprefix linux/,$(ARCHS)) | sed 's/ /,/g') \ --target $* \ . + + $(CONTAINER_ENGINE) image push $(REGISTRY)/$*:$(VERSION) # Push all multiarch images -push-multiarch-images: $(addprefix push-multiarch-image-,$(IMAGE_NAMES)) +push-multiarch-images: clean build $(addprefix push-multiarch-image-,$(IMAGE_NAMES)) version: @echo ${VERSION} diff --git a/go.sum b/go.sum index 9321d20..9583f2e 100755 --- a/go.sum +++ b/go.sum @@ -229,8 +229,6 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= -github.com/vngcloud/vngcloud-go-sdk v1.0.6 h1:AU7cNVUq0LZ2pNyKbr7+qfE+/+6U0GnbBvwGHRV+OYk= -github.com/vngcloud/vngcloud-go-sdk v1.0.6/go.mod h1:3ZjgN6oq5o7sYrShj2dOPOBF3cqWk6IW+/0VVpJWYf4= github.com/vngcloud/vngcloud-go-sdk v1.0.14-0.20240521072621-df4ad46f8a9b h1:WUU4MuMeXakkmlD3Qlt0IanlNpxgTihTy1PrI9VWqDg= github.com/vngcloud/vngcloud-go-sdk v1.0.14-0.20240521072621-df4ad46f8a9b/go.mod h1:3ZjgN6oq5o7sYrShj2dOPOBF3cqWk6IW+/0VVpJWYf4= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8=