Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.13 - CVE Go bump #9697

Merged
merged 3 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions changelog/v1.13.38/cve-24790.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
changelog:
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: cloud-builders
dependencyTag: v0.7.7
issueLink: https://github.com/solo-io/gloo/issues/9672
description: Upgrade cloud-builders images to pick up CVE fixes
18 changes: 9 additions & 9 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ steps:

# $COMMIT_SHA is a default gcloud env var, to run via cloudbuild submit use:
# gcloud builds submit --substitutions COMMIT_SHA=<commit sha>,REPO_NAME=solo-io/gloo,_PR_NUM=<<insert PR Number here>> --project solo-public
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.6'
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.7'
args:
- "--repo-name"
- "$REPO_NAME"
Expand Down Expand Up @@ -35,7 +35,7 @@ steps:
# Run all the tests with ginkgo -r -failFast -trace -progress --noColor
# This requires setting up envoy, AWS, helm, and docker
# The e2e-go-mod-ginkgo container provides everything else needed for running tests
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
entrypoint: 'bash'
args:
- '-c'
Expand All @@ -47,7 +47,7 @@ steps:
waitFor: ['prepare-workspace']
id: 'get-envoy'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
entrypoint: 'bash'
args: ['-c', 'make proxycontroller']
dir: '/workspace/gloo/example/proxycontroller'
Expand All @@ -68,7 +68,7 @@ steps:

# Docker related setup
# grab this container immediately in parallel
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.6'
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.7'
entrypoint: ls
waitFor: ['-']
id: 'grab-ginkgo-container'
Expand All @@ -82,12 +82,12 @@ steps:
waitFor: ['set-gcr-zone']
id: 'get-test-credentials'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
args: ['install-go-tools']
dir: *dir
id: 'install-go-tools'

- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.6'
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.7'
entrypoint: make
env:
- 'ACK_GINKGO_RC=true'
Expand Down Expand Up @@ -117,7 +117,7 @@ steps:
id: 'docker-login'

# 1) Run make targets to push docker images to quay.io
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
args: ['docker-push-extended']
env:
- 'DOCKER_CONFIG=/workspace/docker-config'
Expand All @@ -138,7 +138,7 @@ steps:
waitFor: ['docker-push-extended']
id: 'gcr-auth'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
args: ['fetch-package-and-save-helm', 'render-manifests', 'upload-github-release-assets', 'push-chart-to-registry', '-B']
env:
- 'DOCKER_CONFIG=/workspace/docker-config'
Expand All @@ -152,7 +152,7 @@ steps:
id: 'release-chart'

# Run make targets to retag and push docker images to GCR
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
args: ['docker-push-retag']
env:
- 'DOCKER_CONFIG=/workspace/docker-config'
Expand Down
Loading