[pull] main from nephio-project:main

.prow.yaml

@@ -4,7 +4,7 @@ presubmits:
     always_run: true
     spec:
       containers:
-      - image: nephio/gotests:1922925584309030912
+      - image: golang:1.25.6
         command:
         - make
         args:
@@ -14,7 +14,7 @@ presubmits:
     always_run: true
     spec:
       containers:
-      - image: nephio/gotests:1922925584309030912
+      - image: golang:1.25.6
         command:
         - make
         args:
@@ -24,14 +24,14 @@ presubmits:
     always_run: true
     spec:
       containers:
-      - image: nephio/gotests:1922925584309030912
+      - image: golang:1.25.6
         command:
         - make
         args:
         - gosec
   - name: presubmit-nephio-license-header-check
     decorate: true
-    always_run: true
+    always_run: false
     spec:
       containers:
       - image: nephio/gotests:1922925584309030912
@@ -58,7 +58,7 @@ presubmits:
             memory: 1Gi
   - name: presubmit-nephio-fossology
     decorate: true
-    always_run: true
+    always_run: false
     spec:
       containers:
         - image: fossology/fossology:scanner
@@ -67,26 +67,23 @@ presubmits:
           args:
             - "-c"
             - |
-              set -eE
+              set -e
 
               SCAN_DIR="${PWD}"
               ALLOWLIST="${SCAN_DIR}/allowlist.json"
 
-              OPS=("repo" "nomos" "ojo" "copyright" "keyword" "scan-dir")
-
-              for op in "${OPS[@]}"; do
-                echo "Running fossologyscanner operation: $op"
-                /bin/fossologyscanner \
-                  "$op" \
-                  --report SPDX_JSON \
-                  --dir-path "$SCAN_DIR" \
-                  --allowlist-path "$ALLOWLIST" || true
-              done
+              echo "Running fossologyscanner scan-dir operation"
+              /bin/fossologyscanner \
+                scan-dir \
+                --report SPDX_JSON \
+                --dir-path "$SCAN_DIR" \
+                --allowlist-path "$ALLOWLIST" || echo "Scan completed with warnings"
 
               if [ -d results ]; then
                 cp -R results "${ARTIFACTS}/"
+                echo "Results copied to artifacts"
               else
-                echo "No results generated"
+                echo "No results directory generated"
               fi
   - name: presubmit-nephio-lichen
     decorate: true

Makefile

@@ -14,7 +14,7 @@
 
 .SHELLFLAGS = -ec
 
-GO_VERSION ?= 1.22.2
+GO_VERSION ?= 1.25.6
 IMG_REGISTRY ?= docker.io/nephio
 
 # find all subdirectories with a go.mod file in them

controllers/pkg/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/controllers/pkg
 
-go 1.24.3
+go 1.25.6
 
 replace (
 	github.com/nephio-project/nephio/krm-functions/configinject-fn => ../../krm-functions/configinject-fn

default-go-lint.mk

@@ -12,7 +12,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-GOLANG_CI_VER ?= v2.4.0
+GOLANG_CI_VER ?= v2.8.0
 GIT_ROOT_DIR ?= $(dir $(lastword $(MAKEFILE_LIST)))
 include $(GIT_ROOT_DIR)/detect-container-runtime.mk
 
@@ -23,5 +23,6 @@ ifeq ($(CONTAINER_RUNNABLE), 0)
 	$(RUN_CONTAINER_COMMAND) docker.io/golangci/golangci-lint:${GOLANG_CI_VER}-alpine \
 	golangci-lint run ./... -v
 else
+	@which golangci-lint > /dev/null || (wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.8.0)
 	golangci-lint run ./... -v
 endif

default-go-test.mk

@@ -26,7 +26,7 @@ unit: test
 .PHONY: test
 test: ## Run unit tests (go test)
 ifeq ($(CONTAINER_RUNNABLE), 0)
-		$(RUN_CONTAINER_COMMAND) docker.io/nephio/gotests:1922925584309030912 \
+		$(RUN_CONTAINER_COMMAND) docker.io/library/golang:1.25.6 \
          sh -e -c "go test ./... -v -coverprofile ${TEST_COVERAGE_FILE}; \
          go tool cover -html=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_HTML_FILE}; \
          go tool cover -func=${TEST_COVERAGE_FILE} -o ${TEST_COVERAGE_FUNC_FILE}"

default-gosec.mk

@@ -19,8 +19,9 @@ include $(GIT_ROOT_DIR)/detect-container-runtime.mk
 .PHONY: gosec
 gosec: ## Inspect the source code for security problems by scanning the Go Abstract Syntax Tree
 ifeq ($(CONTAINER_RUNNABLE), 0)
-		$(RUN_CONTAINER_COMMAND) docker.io/nephio/gotests:1922925584309030912 gosec -fmt=html -out=gosec-results.html \
+		$(RUN_CONTAINER_COMMAND) docker.io/securego/gosec:latest gosec -fmt=html -out=gosec-results.html \
 		-stdout -verbose=text -exclude-dir=test -exclude-generated ./...
 else
+		@which gosec > /dev/null || (wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.22.0)
 		gosec -fmt=html -out=gosec-results.html -stdout -verbose=text -exclude-dir=test -exclude-generated ./...
 endif

gitops-tools/kpt-argocd-cmp/kpt-render/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILDER_IMAGE=golang:1.24.3@sha256:81bf5927dc91aefb42e2bc3a5abdbe9bb3bae8ba8b107e2a4cf43ce3402534c6
+ARG BUILDER_IMAGE=golang:1.25.6@sha256:ce63a16e0f7063787ebb4eb28e72d477b00b4726f79874b3205a965ffd797ab2
 ARG BASE_IMAGE=quay.io/argoproj/argocd:v3.0.6
 
 FROM --platform=$BUILDPLATFORM ${BUILDER_IMAGE} AS build

gitops-tools/kpt-argocd-cmp/kpt-render/go.mod

@@ -1,6 +1,6 @@
 module github.com/treactor/treactor-kpt-functions/argo/kpt-render
 
-go 1.24.3
+go 1.25.6
 
 require (
 	github.com/kptdev/krm-functions-sdk/go/fn v0.0.0-20251015063938-03a9634d0809

gitops-tools/kpt-argocd-cmp/kpt-repo/Dockerfile

@@ -1,5 +1,5 @@
 # Build
-ARG BUILDER_IMAGE=golang:1.24.3@sha256:81bf5927dc91aefb42e2bc3a5abdbe9bb3bae8ba8b107e2a4cf43ce3402534c6
+ARG BUILDER_IMAGE=golang:1.25.6@sha256:ce63a16e0f7063787ebb4eb28e72d477b00b4726f79874b3205a965ffd797ab2
 ARG BASE_IMAGE=quay.io/argoproj/argocd:v3.0.6
 
 FROM --platform=$BUILDPLATFORM ${BUILDER_IMAGE} AS build

gitops-tools/kpt-argocd-cmp/kpt-repo/go.mod

@@ -1,6 +1,6 @@
 module github.com/treactor/treactor-kpt-functions/argo/kpt-repo
 
-go 1.24.3
+go 1.25.6
 
 require github.com/kptdev/krm-functions-sdk/go/fn v0.0.0-20251015063938-03a9634d0809
 

krm-functions/configinject-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/configinject-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

krm-functions/configinject-fn/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/configinject-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/dnn-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/dnn-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

krm-functions/dnn-fn/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/dnn-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/gen-configmap-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/gen-configmap-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

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

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/gen-configmap-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/gen-kustomize-res/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/gen-kustomize-res
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

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

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/gen-kustomize-res
 
-go 1.24.3
+go 1.25.6
 
 require (
 	github.com/kptdev/krm-functions-sdk/go/fn v0.0.0-20251015063938-03a9634d0809

krm-functions/interface-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/interface-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

krm-functions/interface-fn/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/interface-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/ipam-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/ipam-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

krm-functions/ipam-fn/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/ipam-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/lib/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/lib
 
-go 1.24.3
+go 1.25.6
 
 require (
 	github.com/google/go-cmp v0.7.0

krm-functions/nad-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/nad-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

krm-functions/nad-fn/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/nad-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/nfdeploy-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/nfdeploy-fn
 RUN go install 
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]

krm-functions/nfdeploy-fn/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/nfdeploy-fn
 
-go 1.24.3
+go 1.25.6
 
 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 

krm-functions/pipeline-tests/go.mod

@@ -1,6 +1,6 @@
 module github.com/nephio-project/nephio/krm-functions/pipeline-tests
 
-go 1.24.3
+go 1.25.6
 
 // always test the latest versions of all functions/libs
 replace (

krm-functions/ueransim-deploy-fn/Dockerfile

@@ -12,14 +12,14 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-FROM golang:1.24.3-alpine@sha256:b4f875e650466fa0fe62c6fd3f02517a392123eea85f1d7e69d85f780e4db1c1
+FROM golang:1.25.6-alpine@sha256:d9b2e14101f27ec8d09674cd01186798d227bb0daec90e032aeb1cd22ac0f029
 ENV CGO_ENABLED=0
 WORKDIR /go/src/
 COPY krm-functions/ krm-functions/
 WORKDIR /go/src/krm-functions/ueransim-deploy-fn
 RUN go install
 RUN go build -o /usr/local/bin/function ./
 
-FROM gcr.io/distroless/static@sha256:3f2b64ef97bd285e36132c684e6b2ae8f2723293d09aae046196cca64251acac
+FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764
 COPY --from=0 /usr/local/bin/function /usr/local/bin/function
 ENTRYPOINT ["function"]