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.14 - CVE bitnami/kubernetes and Go bump #9695

Merged
merged 2 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
11 changes: 11 additions & 0 deletions changelog/v1.14.31/cve-24790.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
changelog:
- type: DEPENDENCY_BUMP
dependencyOwner: bitnami
dependencyRepo: kubectl
dependencyTag: 1.27.15
issueLink: https://github.com/solo-io/gloo/issues/9671
description: Upgrade image used to build kubectl to pick up CVE fixes
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: cloud-builders
dependencyTag: v0.7.7
8 changes: 4 additions & 4 deletions ci/cloudbuild/publish-artifacts.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:

- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.6'
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.7'
id: 'prepare-workspace'
args:
- '--repo-name'
Expand Down Expand Up @@ -44,7 +44,7 @@ steps:
- 'us-central1-a'

# 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'
id: 'docker-push-extended'
args:
- 'docker-push-extended'
Expand All @@ -65,7 +65,7 @@ steps:
waitFor:
- 'docker-push-extended'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.6'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
id: 'release-chart'
dir: *dir
args:
Expand All @@ -82,7 +82,7 @@ steps:
- 'gcr-auth'

# 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'
id: 'docker-push-extended-gcr'
dir: *dir
args:
Expand Down
10 changes: 5 additions & 5 deletions ci/cloudbuild/run-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
steps:

- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.1'
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.7.7'
id: 'prepare-workspace'
args:
- '--repo-name'
Expand All @@ -23,7 +23,7 @@ steps:
cd /go/pkg
gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them"

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
id: 'prepare-envoy'
dir: *dir
entrypoint: 'bash'
Expand Down Expand Up @@ -68,7 +68,7 @@ steps:
waitFor:
- 'prepare-gcr-zone'

- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.1'
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.7.7'
id: 'prepare-test-tools'
dir: *dir
args:
Expand All @@ -79,7 +79,7 @@ steps:
- 'prepare-gcr-zone'
- 'prepare-test-credentials'

- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.1'
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.7'
id: 'run-tests'
dir: *dir
entrypoint: 'make'
Expand All @@ -90,7 +90,7 @@ steps:
secretEnv:
- 'JWT_PRIVATE_KEY'

- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.1'
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.7.7'
id: 'run-e2e-tests'
dir: *dir
entrypoint: 'make'
Expand Down
2 changes: 1 addition & 1 deletion jobs/kubectl/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM bitnami/kubectl:1.27.13 as kubectl
FROM bitnami/kubectl:1.27.15 as kubectl

FROM alpine:3.17.6

Expand Down
Loading