Skip to content

Commit

Permalink
Merge pull request #10214 from ajayk/cve-fixes-12
Browse files Browse the repository at this point in the history
mitigate CVE-2023-48795 for kubernetes-dashboard
  • Loading branch information
ajayk authored Dec 20, 2023
2 parents 00545e2 + 77b2106 commit 6ddc21a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions kubernetes-dashboard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package:
name: kubernetes-dashboard
# When bumping, check to see if the GHSA mitigations below can be removed.
version: 2.7.0
epoch: 10
epoch: 11
description: General-purpose web UI for Kubernetes clusters
copyright:
- license: Apache-2.0
Expand All @@ -29,7 +29,7 @@ pipeline:

- uses: go/bump
with:
deps: golang.org/x/[email protected] golang.org/x/[email protected] github.com/docker/[email protected] golang.org/x/[email protected]
deps: golang.org/x/[email protected] golang.org/x/[email protected] github.com/docker/[email protected] golang.org/x/[email protected] golang.org/x/[email protected]

- runs: |
npm ci
Expand Down
8 changes: 4 additions & 4 deletions mc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package:
name: mc
# minio uses strange versioning, the upstream version is RELEASE.2023-12-02T02-03-28Z
# when bumping this, also bump the tag in git-checkout below
version: 0.20231202.020328
epoch: 1
version: 0.20231220.071422
epoch: 0
description: Multi-Cloud Object Storage
copyright:
- license: AGPL-3.0
Expand All @@ -21,8 +21,8 @@ pipeline:
- uses: git-checkout
with:
repository: https://github.com/minio/mc
tag: RELEASE.2023-12-02T02-03-28Z
expected-commit: f5f7147b9ec4cf78eb67f1cdc91b63d191852e6a
tag: RELEASE.2023-12-20T07-14-22Z
expected-commit: 8e1573ec1b9c174e9f8d82ee9996d002c1d9caaa

- runs: |
make build
Expand Down
4 changes: 2 additions & 2 deletions memcached-exporter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: memcached-exporter
version: 0.14.1
epoch: 0
epoch: 1
description: Exports metrics from memcached servers for consumption by Prometheus.
copyright:
- license: Apache-2.0
Expand All @@ -21,7 +21,7 @@ pipeline:

- uses: go/bump
with:
deps: golang.org/x/[email protected]
deps: golang.org/x/[email protected] golang.org/x/[email protected]

- uses: go/build
with:
Expand Down
8 changes: 4 additions & 4 deletions minio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package:
name: minio
# minio uses strange versioning, the upstream version is RELEASE.2023-10-25T06-33-25Z
# when bumping this, also bump the tag in git-checkout below
version: 0.20231101.183725
epoch: 1
version: 0.20231220.010002
epoch: 0
description: Multi-Cloud Object Storage
copyright:
- license: AGPL-3.0
Expand All @@ -21,8 +21,8 @@ pipeline:
- uses: git-checkout
with:
repository: https://github.com/minio/minio
tag: RELEASE.2023-11-01T18-37-25Z
expected-commit: 4b4a98d5e59354870325ad19703fba03d1b104c2
tag: RELEASE.2023-12-20T01-00-02Z
expected-commit: 7a311a3b666a0e5476fbde24d4413220876d9df2

- runs: |
make build
Expand Down

0 comments on commit 6ddc21a

Please sign in to comment.