Skip to content

Commit 42db191

Browse files
authored
fix: go-fips (#365)
* fix go-fips * update go dependencies * update go dependencies * change go toolchain * go 1.23.2 * toolchain 1.23.2 * toolchain 1.23.2 * change base * change base * disable cgo
1 parent 5a2c8de commit 42db191

File tree

5 files changed

+74
-77
lines changed

5 files changed

+74
-77
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22.7-alpine3.20 AS builder
1+
FROM golang:1.23-alpine3.20 AS builder
22

33
ARG TARGETARCH
44

dockerfiles/harness/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.22-alpine3.19 as builder
1+
FROM golang:1.23-alpine3.20 as builder
22

33
ARG TARGETARCH
44
ARG TARGETOS

dockerfiles/harness/base.fips.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ COPY internal ./internal
3232
COPY api ./api
3333

3434

35-
RUN CGO_ENABLED=1 CC=gcc GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a \
35+
RUN GOOS=linux GOARCH=${TARGETARCH} GO111MODULE=on go build -a \
3636
-ldflags="-s -w -X github.com/pluralsh/deployment-operator/pkg/harness/environment.Version=${VERSION}" \
3737
-o harness \
3838
cmd/harness/*.go

go.mod

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/pluralsh/deployment-operator
22

3-
go 1.22.7
3+
go 1.23.0
44

5-
toolchain go1.23.1
5+
toolchain go1.23.4
66

77
require (
88
github.com/Masterminds/semver/v3 v3.3.0
@@ -25,10 +25,10 @@ require (
2525
github.com/gofrs/flock v0.12.1
2626
github.com/golangci/golangci-lint v1.63.4
2727
github.com/google/gnostic-models v0.6.8
28-
github.com/hashicorp/terraform-json v0.22.1
28+
github.com/hashicorp/terraform-json v0.24.0
2929
github.com/mitchellh/mapstructure v1.5.0
30-
github.com/onsi/ginkgo/v2 v2.20.2
31-
github.com/onsi/gomega v1.34.2
30+
github.com/onsi/ginkgo/v2 v2.21.0
31+
github.com/onsi/gomega v1.35.1
3232
github.com/open-policy-agent/frameworks/constraint v0.0.0-20240802234259-aa99306df54e
3333
github.com/open-policy-agent/gatekeeper/v3 v3.17.1
3434
github.com/opencost/opencost/core v0.0.0-20241216191657-30e5d9a27f41
@@ -50,22 +50,22 @@ require (
5050
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
5151
gopkg.in/yaml.v3 v3.0.1
5252
helm.sh/helm/v3 v3.16.1
53-
k8s.io/api v0.31.1
53+
k8s.io/api v0.32.1
5454
k8s.io/apiextensions-apiserver v0.31.1
55-
k8s.io/apimachinery v0.31.1
56-
k8s.io/cli-runtime v0.31.1
57-
k8s.io/client-go v0.31.1
55+
k8s.io/apimachinery v0.32.1
56+
k8s.io/cli-runtime v0.32.1
57+
k8s.io/client-go v0.32.1
5858
k8s.io/klog/v2 v2.130.1
59-
k8s.io/kubectl v0.31.1
60-
k8s.io/metrics v0.31.1
61-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
59+
k8s.io/kubectl v0.32.1
60+
k8s.io/metrics v0.32.1
61+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
6262
layeh.com/gopher-luar v1.0.11
6363
sigs.k8s.io/cli-utils v0.37.2
6464
sigs.k8s.io/controller-runtime v0.19.0
6565
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240903085516-38546806f2fa
6666
sigs.k8s.io/controller-tools v0.16.3
67-
sigs.k8s.io/kustomize/kustomize/v5 v5.4.3
68-
sigs.k8s.io/kustomize/kyaml v0.17.2
67+
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0
68+
sigs.k8s.io/kustomize/kyaml v0.18.1
6969
sigs.k8s.io/yaml v1.4.0
7070
)
7171

@@ -234,7 +234,7 @@ require (
234234
github.com/google/go-cmp v0.6.0 // indirect
235235
github.com/google/go-containerregistry v0.19.2 // indirect
236236
github.com/google/gofuzz v1.2.0 // indirect
237-
github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 // indirect
237+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
238238
github.com/google/s2a-go v0.1.8 // indirect
239239
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
240240
github.com/google/uuid v1.6.0 // indirect
@@ -272,7 +272,7 @@ require (
272272
github.com/jjti/go-spancheck v0.6.4 // indirect
273273
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
274274
github.com/jmoiron/sqlx v1.4.0 // indirect
275-
github.com/jonboulle/clockwork v0.2.2 // indirect
275+
github.com/jonboulle/clockwork v0.4.0 // indirect
276276
github.com/josharian/intern v1.0.0 // indirect
277277
github.com/jpillora/backoff v1.0.0 // indirect
278278
github.com/json-iterator/go v1.1.12 // indirect
@@ -325,7 +325,7 @@ require (
325325
github.com/moby/buildkit v0.13.2 // indirect
326326
github.com/moby/docker-image-spec v1.3.1 // indirect
327327
github.com/moby/locker v1.0.1 // indirect
328-
github.com/moby/spdystream v0.4.0 // indirect
328+
github.com/moby/spdystream v0.5.0 // indirect
329329
github.com/moby/term v0.5.0 // indirect
330330
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
331331
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -420,7 +420,7 @@ require (
420420
github.com/yashtewari/glob-intersection v0.2.0 // indirect
421421
github.com/yeya24/promlinter v0.3.0 // indirect
422422
github.com/ykadowak/zerologlint v0.1.5 // indirect
423-
github.com/zclconf/go-cty v1.14.4 // indirect
423+
github.com/zclconf/go-cty v1.15.1 // indirect
424424
github.com/zclconf/go-cty-yaml v1.0.3 // indirect
425425
gitlab.com/bosi/decorder v0.4.2 // indirect
426426
go-simpler.org/musttag v0.13.0 // indirect
@@ -432,7 +432,6 @@ require (
432432
go.opentelemetry.io/otel/metric v1.29.0 // indirect
433433
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
434434
go.opentelemetry.io/otel/trace v1.29.0 // indirect
435-
go.starlark.net v0.0.0-20231016134836-22325403fcb3 // indirect
436435
go.uber.org/automaxprocs v1.6.0 // indirect
437436
go.uber.org/multierr v1.11.0 // indirect
438437
go.uber.org/zap v1.27.0 // indirect
@@ -446,7 +445,7 @@ require (
446445
golang.org/x/sys v0.28.0 // indirect
447446
golang.org/x/term v0.27.0 // indirect
448447
golang.org/x/text v0.21.0 // indirect
449-
golang.org/x/time v0.6.0 // indirect
448+
golang.org/x/time v0.7.0 // indirect
450449
golang.org/x/tools v0.28.0 // indirect
451450
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
452451
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -455,24 +454,24 @@ require (
455454
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
456455
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
457456
google.golang.org/grpc v1.66.2 // indirect
458-
google.golang.org/protobuf v1.34.2 // indirect
457+
google.golang.org/protobuf v1.35.1 // indirect
459458
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
460459
gopkg.in/inf.v0 v0.9.1 // indirect
461460
gopkg.in/ini.v1 v1.67.0 // indirect
462461
gopkg.in/warnings.v0 v0.1.2 // indirect
463462
gopkg.in/yaml.v2 v2.4.0 // indirect
464463
honnef.co/go/tools v0.5.1 // indirect
465464
k8s.io/apiserver v0.31.1 // indirect
466-
k8s.io/component-base v0.31.1 // indirect
467-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
465+
k8s.io/component-base v0.32.1 // indirect
466+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
468467
mvdan.cc/gofumpt v0.7.0 // indirect
469468
mvdan.cc/sh/v3 v3.8.0 // indirect
470469
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
471470
oras.land/oras-go v1.2.5 // indirect
472471
sigs.k8s.io/gateway-api v1.1.0 // indirect
473-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
474-
sigs.k8s.io/kustomize/api v0.17.3 // indirect
475-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
472+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
473+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
474+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
476475
)
477476

478477
replace (

0 commit comments

Comments
 (0)