Skip to content

Commit c7cb2fe

Browse files
efiacorefiacor
authored
Merge pull request #864 from Nordix/address_ossf_vuln
Address ossf vuln
2 parents c092c53 + 047ed54 commit c7cb2fe

File tree

20 files changed

+122
-94
lines changed

20 files changed

+122
-94
lines changed

‎krm-functions/configinject-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/configinject-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/dnn-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/dnn-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/gen-configmap-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/gen-configmap-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/gen-configmap-fn/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nephio-project/nephio/krm-functions/gen-configmap-fn
22

3-
go 1.22
3+
go 1.23.5
44

55
replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
66

‎krm-functions/gen-kustomize-res/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/gen-kustomize-res
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/gen-kustomize-res/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/nephio-project/nephio/krm-functions/gen-kustomize-res
22

3-
go 1.22.2
3+
go 1.23.5
44

55
require (
66
github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d

‎krm-functions/interface-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/interface-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/ipam-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/ipam-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/nad-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/nad-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/nfdeploy-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/nfdeploy-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/ueransim-deploy-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/ueransim-deploy-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎krm-functions/vlan-fn/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The Nephio Authors.
1+
# Copyright 2023-2025 The Nephio Authors.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -12,14 +12,14 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
FROM golang:1.23-alpine
15+
FROM golang:1.23.5-alpine@sha256:sha256:47d337594bd9e667d35514b241569f95fb6d95727c24b19468813d596d5ae596
1616
ENV CGO_ENABLED=0
1717
WORKDIR /go/src/
1818
COPY krm-functions/ krm-functions/
1919
WORKDIR /go/src/krm-functions/vlan-fn
2020
RUN go install
2121
RUN go build -o /usr/local/bin/function ./
2222

23-
FROM gcr.io/distroless/static:latest
23+
FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
2424
COPY --from=0 /usr/local/bin/function /usr/local/bin/function
2525
ENTRYPOINT ["function"]

‎operators/focom-operator/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Build the manager binary
16-
FROM golang:1.23 AS builder
16+
FROM golang:1.23.5@sha256:e213430692e5c31aba27473cdc84cfff2896d0c097e984bef67b6a44c75a8181 AS builder
1717
ARG TARGETOS
1818
ARG TARGETARCH
1919

@@ -39,7 +39,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ma
3939

4040
# Use distroless as minimal base image to package the manager binary
4141
# Refer to https://github.com/GoogleContainerTools/distroless for more details
42-
FROM gcr.io/distroless/static:nonroot
42+
FROM gcr.io/distroless/static@sha256:6ec5aa99dc335666e79dc64e4a6c8b89c33a543a1967f20d360922a80dd21f02
4343
WORKDIR /
4444
COPY --from=builder /workspace/manager .
4545
USER 65532:65532

‎operators/focom-operator/config/manager/kustomization.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: docker.io/nephio/focom-operator
8-
newTag: 0.0.1
7+
newName: nephio/focom-operator
8+
newTag: e2e

‎operators/focom-operator/go.mod

+18-18
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ go 1.23.5
44

55
require (
66
github.com/go-logr/logr v1.4.2
7-
github.com/onsi/ginkgo/v2 v2.21.0
8-
github.com/onsi/gomega v1.35.1
7+
github.com/onsi/ginkgo/v2 v2.22.2
8+
github.com/onsi/gomega v1.36.2
99
github.com/stretchr/testify v1.9.0
10-
k8s.io/api v0.32.0
11-
k8s.io/apiextensions-apiserver v0.32.0
12-
k8s.io/apimachinery v0.32.0
13-
k8s.io/client-go v0.32.0
14-
sigs.k8s.io/controller-runtime v0.20.1
10+
k8s.io/api v0.32.2
11+
k8s.io/apiextensions-apiserver v0.32.2
12+
k8s.io/apimachinery v0.32.2
13+
k8s.io/client-go v0.32.2
14+
sigs.k8s.io/controller-runtime v0.20.2
1515
)
1616

1717
require (
@@ -24,7 +24,7 @@ require (
2424
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2626
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
27-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
27+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2828
github.com/felixge/httpsnoop v1.0.4 // indirect
2929
github.com/fsnotify/fsnotify v1.7.0 // indirect
3030
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -41,7 +41,7 @@ require (
4141
github.com/google/gnostic-models v0.6.8 // indirect
4242
github.com/google/go-cmp v0.6.0 // indirect
4343
github.com/google/gofuzz v1.2.0 // indirect
44-
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
44+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
4545
github.com/google/uuid v1.6.0 // indirect
4646
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
4747
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -72,24 +72,24 @@ require (
7272
go.uber.org/multierr v1.11.0 // indirect
7373
go.uber.org/zap v1.27.0 // indirect
7474
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
75-
golang.org/x/net v0.30.0 // indirect
75+
golang.org/x/net v0.35.0 // indirect
7676
golang.org/x/oauth2 v0.23.0 // indirect
77-
golang.org/x/sync v0.8.0 // indirect
78-
golang.org/x/sys v0.26.0 // indirect
79-
golang.org/x/term v0.25.0 // indirect
80-
golang.org/x/text v0.19.0 // indirect
77+
golang.org/x/sync v0.11.0 // indirect
78+
golang.org/x/sys v0.30.0 // indirect
79+
golang.org/x/term v0.29.0 // indirect
80+
golang.org/x/text v0.22.0 // indirect
8181
golang.org/x/time v0.7.0 // indirect
82-
golang.org/x/tools v0.26.0 // indirect
82+
golang.org/x/tools v0.28.0 // indirect
8383
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8484
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
8585
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
8686
google.golang.org/grpc v1.65.0 // indirect
87-
google.golang.org/protobuf v1.35.1 // indirect
87+
google.golang.org/protobuf v1.36.1 // indirect
8888
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
8989
gopkg.in/inf.v0 v0.9.1 // indirect
9090
gopkg.in/yaml.v3 v3.0.1 // indirect
91-
k8s.io/apiserver v0.32.0 // indirect
92-
k8s.io/component-base v0.32.0 // indirect
91+
k8s.io/apiserver v0.32.2 // indirect
92+
k8s.io/component-base v0.32.2 // indirect
9393
k8s.io/klog/v2 v2.130.1 // indirect
9494
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
9595
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

0 commit comments

Comments
 (0)