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.

Sign up for GitHub

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

k3d/5.6.0-r9: cve remediation #16427

Merged
merged 2 commits into from
Apr 9, 2024
Merged

k3d/5.6.0-r9: cve remediation #16427

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3520687
k3d/5.6.0-r9: fix GHSA-6q6q-88xp-6f2r/GHSA-ppp9-7jff-5vj2/GHSA-8c26-w…
octo-sts[bot] Apr 6, 2024
de2b795
Update the proxy from forked one to the original one.
debasishbsws Apr 6, 2024
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
18 changes: 11 additions & 7 deletions k3d.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: k3d
version: 5.6.0
epoch: 10
epoch: 11
description: Little helper to run CNCF's k3s in Docker
copyright:
- license: Apache-2.0
Expand All @@ -25,7 +25,7 @@ pipeline:

- uses: go/bump
with:
deps: golang.org/x/net@v0.17.0 github.com/docker/docker@v24.0.9 golang.org/x/crypto@v0.17.0 github.com/opencontainers/runc@v1.1.12 github.com/containerd/containerd@v1.7.11 google.golang.org/protobuf@v1.33.0 github.com/golang/protobuf@v1.5.4
deps: golang.org/x/net@v0.17.0 golang.org/x/crypto@v0.17.0 github.com/docker/docker@v24.0.9 github.com/opencontainers/runc@v1.1.12 github.com/containerd/containerd@v1.7.11 google.golang.org/protobuf@v1.33.0 github.com/golang/protobuf@v1.5.4

- runs: |
make build
Expand Down Expand Up @@ -59,12 +59,16 @@ subpackages:
mkdir -p "${{targets.subpkgdir}}"/etc/confd
cp -ar templates "${{targets.subpkgdir}}"/etc/confd/
cp -ar conf.d "${{targets.subpkgdir}}"/etc/confd/
- uses: git-checkout
- name: git-chekout-confd # There is not a new release in last 6 years
runs: |
git clone https://github.com/kelseyhightower/confd.git /home/confd
hectorj2f marked this conversation as resolved.
Show resolved Hide resolved
debasishbsws marked this conversation as resolved.
Show resolved Hide resolved
cd /home/confd
git fetch origin master
git checkout 919444eb6cf721d198b2bb18581d0f0b3734d107
- uses: go/bump
with:
repository: https://github.com/iwilltry42/confd
tag: v0.17.0 # NOTE: This pins us to a tag that we can't auto-bump, but this hasn't been updated in years
expected-commit: 6b806c9d9cf66333ca41f9b9175508db0e222a0b
destination: /home/confd
deps: golang.org/x/crypto@v0.17.0 google.golang.org/protobuf@v1.33.0 github.com/golang/protobuf@v1.5.4 github.com/go-jose/go-jose/v3@v3.0.3
modroot: /home/confd
- uses: go/build
with:
modroot: /home/confd
Expand Down