Skip to content

Commit 1f71a29

Browse files
authored
INS-2025: Bump libs and fix vulnerabilities for pluto (#591)
* Fix vulns * Fix * Fix * Fix * Fix * Fix * Fix * Fix * Fix * Fix * Fix
1 parent 46b3b71 commit 1f71a29

5 files changed

Lines changed: 151 additions & 231 deletions

File tree

.circleci/config.yml

Lines changed: 47 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,28 @@ references:
3131
command: |
3232
apk --update add curl yq
3333
cd /tmp
34-
curl -LO https://releases.hashicorp.com/vault/1.12.2/vault_1.12.2_linux_amd64.zip
35-
sha256sum vault_1.12.2_linux_amd64.zip | grep 116c143de377a77a7ea455a367d5e9fe5290458e8a941a6e2dd85d92aaedba67
36-
unzip vault_1.12.2_linux_amd64.zip
34+
curl -LO https://releases.hashicorp.com/vault/1.21.4/vault_1.21.4_linux_amd64.zip
35+
sha256sum vault_1.21.4_linux_amd64.zip | grep 889b681990fe221b884b7932fa9c9dd0ee9811b9349554f1aa287ab63c9f3dae
36+
unzip vault_1.21.4_linux_amd64.zip
3737
mv vault /usr/bin/vault
38+
install_vault_machine: &install_vault_machine
39+
run:
40+
name: install hashicorp vault
41+
command: |
42+
sudo apt-get update -y && sudo apt-get install -y curl unzip
43+
cd /tmp
44+
curl -LO https://releases.hashicorp.com/vault/1.21.4/vault_1.21.4_linux_amd64.zip
45+
echo '889b681990fe221b884b7932fa9c9dd0ee9811b9349554f1aa287ab63c9f3dae vault_1.21.4_linux_amd64.zip' | sha256sum -c
46+
unzip -o vault_1.21.4_linux_amd64.zip
47+
sudo mv vault /usr/bin/vault
48+
setup_qemu_binfmt: &setup_qemu_binfmt
49+
run:
50+
name: Setup QEMU for multi-arch Docker builds
51+
command: |
52+
sudo apt-get update -y
53+
sudo apt-get install -y qemu-user-static binfmt-support
54+
docker buildx create --use || true
55+
docker buildx inspect --bootstrap
3856
install_circleci: &install_circleci
3957
run:
4058
name: Install CircleCI CLI
@@ -54,17 +72,13 @@ jobs:
5472
- run: go mod download && go mod verify
5573
- run: go test -v ./... -coverprofile=coverage.txt -covermode=atomic
5674
release:
57-
working_directory: /home/circleci/go/src/github.com/fairwindsops/pluto
75+
machine:
76+
image: ubuntu-2204:current
5877
resource_class: large
5978
shell: /bin/bash
60-
docker:
61-
- image: goreleaser/goreleaser:v2.14.0
62-
environment:
63-
GO111MODULE: "on"
6479
steps:
6580
- checkout
66-
- setup_remote_docker
67-
- *install_vault_alpine
81+
- *install_vault_machine
6882
- rok8s/get_vault_env:
6983
vault_path: repo/global/env
7084
- rok8s/get_vault_env:
@@ -73,17 +87,32 @@ jobs:
7387
name: docker login
7488
command: |
7589
docker login -u _json_key -p "$(echo $GCP_ARTIFACTREADWRITE_JSON_KEY | base64 -d)" us-docker.pkg.dev
76-
- run: echo 'export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"' >> $BASH_ENV
77-
- run: goreleaser
90+
- *setup_qemu_binfmt
91+
- run:
92+
name: Run GoReleaser release
93+
command: |
94+
export GORELEASER_CURRENT_TAG="${CIRCLE_TAG}"
95+
docker run --rm \
96+
-v /var/run/docker.sock:/var/run/docker.sock \
97+
-v "$(pwd):/workspace" -w /workspace \
98+
-e GORELEASER_CURRENT_TAG -e CIRCLE_TAG -e CIRCLE_SHA1 \
99+
-e GO111MODULE=on \
100+
goreleaser/goreleaser:v2.14.2
78101
snapshot:
79-
working_directory: /home/circleci/go/src/github.com/fairwindsops/pluto
102+
machine:
103+
image: ubuntu-2204:current
80104
resource_class: large
81-
docker:
82-
- image: goreleaser/goreleaser:v2.14.0
83105
steps:
84106
- checkout
85-
- setup_remote_docker
86-
- run: goreleaser --snapshot --skip=sign
107+
- *setup_qemu_binfmt
108+
- run:
109+
name: Run GoReleaser snapshot
110+
command: |
111+
docker run --rm \
112+
-v /var/run/docker.sock:/var/run/docker.sock \
113+
-v "$(pwd):/workspace" -w /workspace \
114+
-e CIRCLE_SHA1 -e CIRCLE_BRANCH -e CIRCLE_TAG \
115+
goreleaser/goreleaser:v2.14.2 --snapshot --skip=sign
87116
- store_artifacts:
88117
path: dist
89118
destination: snapshot
@@ -141,6 +170,7 @@ workflows:
141170
release:
142171
jobs:
143172
- release:
173+
context: org-global
144174
filters:
145175
branches:
146176
ignore: /.*/

.goreleaser.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ dockers:
9191
- "us-docker.pkg.dev/fairwinds-ops/oss/pluto:v{{ .Major }}-armv7"
9292
- "us-docker.pkg.dev/fairwinds-ops/oss/pluto:v{{ .Major }}.{{ .Minor }}-armv7"
9393
use: buildx
94-
goarch: arm64
94+
goarch: arm
95+
goarm: 7
96+
goos: linux
9597
dockerfile: Dockerfile
9698
build_flag_templates:
9799
- "--platform=linux/arm/v7"

Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM alpine:3.23.3
22

3+
RUN apk update && apk -U upgrade --no-cache
4+
35
LABEL org.opencontainers.image.authors="FairwindsOps, Inc." \
46
org.opencontainers.image.vendor="FairwindsOps, Inc." \
57
org.opencontainers.image.title="pluto" \

go.mod

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,18 @@ require (
1212
golang.org/x/mod v0.33.0
1313
gopkg.in/yaml.v3 v3.0.1
1414
helm.sh/helm/v3 v3.20.0
15-
k8s.io/api v0.35.1
16-
k8s.io/apimachinery v0.35.1
17-
k8s.io/client-go v0.35.1
18-
k8s.io/klog/v2 v2.130.1
19-
sigs.k8s.io/controller-runtime v0.23.1
15+
k8s.io/api v0.35.2
16+
k8s.io/apimachinery v0.35.2
17+
k8s.io/client-go v0.35.2
18+
k8s.io/klog/v2 v2.140.0
19+
sigs.k8s.io/controller-runtime v0.23.3
2020
)
2121

2222
require (
2323
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2424
github.com/Masterminds/squirrel v1.5.4 // indirect
2525
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/clipperhouse/displaywidth v0.11.0 // indirect
27-
github.com/clipperhouse/stringish v0.1.1 // indirect
2827
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
2928
github.com/cyphar/filepath-securejoin v0.6.1 // indirect
3029
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
@@ -34,23 +33,22 @@ require (
3433
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3534
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
3635
github.com/go-logr/logr v1.4.3 // indirect
37-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
38-
github.com/go-openapi/jsonreference v0.21.4 // indirect
39-
github.com/go-openapi/swag v0.25.4 // indirect
40-
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
41-
github.com/go-openapi/swag/conv v0.25.4 // indirect
42-
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
43-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
44-
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
45-
github.com/go-openapi/swag/loading v0.25.4 // indirect
46-
github.com/go-openapi/swag/mangling v0.25.4 // indirect
47-
github.com/go-openapi/swag/netutils v0.25.4 // indirect
48-
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
49-
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
50-
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
36+
github.com/go-openapi/jsonpointer v0.22.5 // indirect
37+
github.com/go-openapi/jsonreference v0.21.5 // indirect
38+
github.com/go-openapi/swag v0.25.5 // indirect
39+
github.com/go-openapi/swag/cmdutils v0.25.5 // indirect
40+
github.com/go-openapi/swag/conv v0.25.5 // indirect
41+
github.com/go-openapi/swag/fileutils v0.25.5 // indirect
42+
github.com/go-openapi/swag/jsonname v0.25.5 // indirect
43+
github.com/go-openapi/swag/jsonutils v0.25.5 // indirect
44+
github.com/go-openapi/swag/loading v0.25.5 // indirect
45+
github.com/go-openapi/swag/mangling v0.25.5 // indirect
46+
github.com/go-openapi/swag/netutils v0.25.5 // indirect
47+
github.com/go-openapi/swag/stringutils v0.25.5 // indirect
48+
github.com/go-openapi/swag/typeutils v0.25.5 // indirect
49+
github.com/go-openapi/swag/yamlutils v0.25.5 // indirect
5150
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
5251
github.com/goccy/go-json v0.10.5 // indirect
53-
github.com/gogo/protobuf v1.3.2 // indirect
5452
github.com/google/gnostic-models v0.7.1 // indirect
5553
github.com/google/uuid v1.6.0 // indirect
5654
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -61,7 +59,7 @@ require (
6159
github.com/lib/pq v1.11.2 // indirect
6260
github.com/mattn/go-colorable v0.1.14 // indirect
6361
github.com/mattn/go-isatty v0.0.20 // indirect
64-
github.com/mattn/go-runewidth v0.0.20 // indirect
62+
github.com/mattn/go-runewidth v0.0.21 // indirect
6563
github.com/mitchellh/copystructure v1.2.0 // indirect
6664
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6765
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -80,19 +78,19 @@ require (
8078
github.com/spf13/cast v1.10.0 // indirect
8179
github.com/subosito/gotenv v1.6.0 // indirect
8280
github.com/x448/float16 v0.8.4 // indirect
83-
go.yaml.in/yaml/v2 v2.4.3 // indirect
81+
go.yaml.in/yaml/v2 v2.4.4 // indirect
8482
go.yaml.in/yaml/v3 v3.0.4 // indirect
85-
golang.org/x/net v0.50.0 // indirect
86-
golang.org/x/oauth2 v0.35.0 // indirect
87-
golang.org/x/sys v0.41.0 // indirect
83+
golang.org/x/net v0.51.0 // indirect
84+
golang.org/x/oauth2 v0.36.0 // indirect
85+
golang.org/x/sys v0.42.0 // indirect
8886
golang.org/x/term v0.40.0 // indirect
8987
golang.org/x/text v0.34.0 // indirect
90-
golang.org/x/time v0.14.0 // indirect
88+
golang.org/x/time v0.15.0 // indirect
9189
google.golang.org/protobuf v1.36.11 // indirect
9290
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
9391
gopkg.in/inf.v0 v0.9.1 // indirect
94-
k8s.io/apiextensions-apiserver v0.35.1 // indirect
95-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
92+
k8s.io/apiextensions-apiserver v0.35.2 // indirect
93+
k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf // indirect
9694
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
9795
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
9896
sigs.k8s.io/randfill v1.0.0 // indirect

0 commit comments

Comments
 (0)