Skip to content

Commit

Permalink
Merge pull request #721 from hakman/automated-cherry-pick-of-#675-#720-…
Browse files Browse the repository at this point in the history
…upstream-release-1.28

Automated cherry pick of #675: Stricter dependency/security review & update go version
#720: update the go version to 1.21.3
  • Loading branch information
k8s-ci-robot authored Nov 2, 2023
2 parents 1f7d223 + d9a7462 commit d570d5c
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 4 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/deps.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: "Dependency Review"
on: [push, pull_request, workflow_dispatch]
permissions:
contents: read
jobs:
dependency-review:
runs-on: ubuntu-latest
steps:
- name: "Checkout Repository"
uses: actions/checkout@v4
with:
show-progress: false
- name: "Dependency Review"
uses: actions/dependency-review-action@v3
govulncheck:
runs-on: ubuntu-latest
steps:
- name: "Checkout Repository"
uses: actions/checkout@v4
with:
show-progress: false
- id: govulncheck
uses: golang/govulncheck-action@v1
with:
go-version-input: 1.21.3
go-version-file: go.mod
- id: govulncheck-tests-e2e
uses: golang/govulncheck-action@v1
with:
go-version-input: 1.21.3
go-version-file: tests/e2e/go.mod
2 changes: 1 addition & 1 deletion .ko.yaml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.20.3-bullseye.0
defaultBaseImage: registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.3-bookworm.0
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
## BUILD ARGS ##
################################################################################
# This build arg allows the specification of a custom Golang image.
ARG GOLANG_IMAGE=golang:1.20.3
ARG GOLANG_IMAGE=golang:1.21.3

# The distroless image on which the CPI manager image is built.
#
# Please do not use "latest". Explicit tags should be used to provide
# deterministic builds. Follow what kubernetes uses to build
# kube-controller-manager, for example for 1.23.x:
# https://github.com/kubernetes/kubernetes/blob/release-1.24/build/common.sh#L94
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.20.3-bullseye.0
ARG DISTROLESS_IMAGE=registry.k8s.io/build-image/go-runner:v2.3.1-go1.21.3-bookworm.0

################################################################################
## BUILD STAGE ##
Expand Down
2 changes: 1 addition & 1 deletion cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
- --platform=linux/amd64,linux/arm64
- .
# Build cloudbuild artifacts (for attestation)
- name: 'docker.io/library/golang:1.20.3-bullseye'
- name: 'docker.io/library/golang:1.21.3-bookworm'
id: cloudbuild-artifacts
entrypoint: make
env:
Expand Down

0 comments on commit d570d5c

Please sign in to comment.