diff --git a/.prow.yaml b/.prow.yaml index add9adbe..1541a7a9 100644 --- a/.prow.yaml +++ b/.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 diff --git a/Makefile b/Makefile index 2afb60fd..3b6177ea 100644 --- a/Makefile +++ b/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 diff --git a/controllers/pkg/go.mod b/controllers/pkg/go.mod index 9beff2a9..04969152 100644 --- a/controllers/pkg/go.mod +++ b/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 diff --git a/default-go-lint.mk b/default-go-lint.mk index 8dc6e2da..9efdbc0e 100644 --- a/default-go-lint.mk +++ b/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 diff --git a/default-go-test.mk b/default-go-test.mk index 9b4fffcc..9160cc6b 100644 --- a/default-go-test.mk +++ b/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}" diff --git a/default-gosec.mk b/default-gosec.mk index c8d4a3c4..f2059786 100644 --- a/default-gosec.mk +++ b/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 diff --git a/gitops-tools/kpt-argocd-cmp/kpt-render/Dockerfile b/gitops-tools/kpt-argocd-cmp/kpt-render/Dockerfile index 7b9d34b4..646c458b 100644 --- a/gitops-tools/kpt-argocd-cmp/kpt-render/Dockerfile +++ b/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 diff --git a/gitops-tools/kpt-argocd-cmp/kpt-render/go.mod b/gitops-tools/kpt-argocd-cmp/kpt-render/go.mod index 95f0f808..6199c9be 100644 --- a/gitops-tools/kpt-argocd-cmp/kpt-render/go.mod +++ b/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 diff --git a/gitops-tools/kpt-argocd-cmp/kpt-repo/Dockerfile b/gitops-tools/kpt-argocd-cmp/kpt-repo/Dockerfile index d8255ed2..796c352a 100644 --- a/gitops-tools/kpt-argocd-cmp/kpt-repo/Dockerfile +++ b/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 diff --git a/gitops-tools/kpt-argocd-cmp/kpt-repo/go.mod b/gitops-tools/kpt-argocd-cmp/kpt-repo/go.mod index 63cc6339..eb026080 100644 --- a/gitops-tools/kpt-argocd-cmp/kpt-repo/go.mod +++ b/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 diff --git a/krm-functions/configinject-fn/Dockerfile b/krm-functions/configinject-fn/Dockerfile index 904ee806..47b92c48 100644 --- a/krm-functions/configinject-fn/Dockerfile +++ b/krm-functions/configinject-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] diff --git a/krm-functions/configinject-fn/go.mod b/krm-functions/configinject-fn/go.mod index debf0436..3c9effe4 100644 --- a/krm-functions/configinject-fn/go.mod +++ b/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 diff --git a/krm-functions/dnn-fn/Dockerfile b/krm-functions/dnn-fn/Dockerfile index e6f69314..7bd2fb38 100644 --- a/krm-functions/dnn-fn/Dockerfile +++ b/krm-functions/dnn-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] diff --git a/krm-functions/dnn-fn/go.mod b/krm-functions/dnn-fn/go.mod index e17b9d67..dae1b6c3 100644 --- a/krm-functions/dnn-fn/go.mod +++ b/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 diff --git a/krm-functions/gen-configmap-fn/Dockerfile b/krm-functions/gen-configmap-fn/Dockerfile index a7caf7d7..383521ea 100644 --- a/krm-functions/gen-configmap-fn/Dockerfile +++ b/krm-functions/gen-configmap-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] diff --git a/krm-functions/gen-configmap-fn/go.mod b/krm-functions/gen-configmap-fn/go.mod index 1ac84362..dc926dab 100644 --- a/krm-functions/gen-configmap-fn/go.mod +++ b/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 diff --git a/krm-functions/gen-kustomize-res/Dockerfile b/krm-functions/gen-kustomize-res/Dockerfile index 196a5e00..52ff7c7a 100644 --- a/krm-functions/gen-kustomize-res/Dockerfile +++ b/krm-functions/gen-kustomize-res/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] diff --git a/krm-functions/gen-kustomize-res/go.mod b/krm-functions/gen-kustomize-res/go.mod index b76e67c6..b60f7f2e 100644 --- a/krm-functions/gen-kustomize-res/go.mod +++ b/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 diff --git a/krm-functions/interface-fn/Dockerfile b/krm-functions/interface-fn/Dockerfile index cc2537c5..8d787c81 100644 --- a/krm-functions/interface-fn/Dockerfile +++ b/krm-functions/interface-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] \ No newline at end of file diff --git a/krm-functions/interface-fn/go.mod b/krm-functions/interface-fn/go.mod index 9e3a7806..0d188525 100644 --- a/krm-functions/interface-fn/go.mod +++ b/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 diff --git a/krm-functions/ipam-fn/Dockerfile b/krm-functions/ipam-fn/Dockerfile index 704ab57a..8721d739 100644 --- a/krm-functions/ipam-fn/Dockerfile +++ b/krm-functions/ipam-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] diff --git a/krm-functions/ipam-fn/go.mod b/krm-functions/ipam-fn/go.mod index 2f93f097..be340b76 100644 --- a/krm-functions/ipam-fn/go.mod +++ b/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 diff --git a/krm-functions/lib/go.mod b/krm-functions/lib/go.mod index 1d80f94a..9dd12b26 100644 --- a/krm-functions/lib/go.mod +++ b/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 diff --git a/krm-functions/nad-fn/Dockerfile b/krm-functions/nad-fn/Dockerfile index 3980fc6d..3c45410f 100644 --- a/krm-functions/nad-fn/Dockerfile +++ b/krm-functions/nad-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] diff --git a/krm-functions/nad-fn/go.mod b/krm-functions/nad-fn/go.mod index 0353d606..cdf00c4a 100644 --- a/krm-functions/nad-fn/go.mod +++ b/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 diff --git a/krm-functions/nfdeploy-fn/Dockerfile b/krm-functions/nfdeploy-fn/Dockerfile index b1fdeea8..7adf7346 100644 --- a/krm-functions/nfdeploy-fn/Dockerfile +++ b/krm-functions/nfdeploy-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] \ No newline at end of file diff --git a/krm-functions/nfdeploy-fn/go.mod b/krm-functions/nfdeploy-fn/go.mod index 9fd12d06..b0ae5b47 100644 --- a/krm-functions/nfdeploy-fn/go.mod +++ b/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 diff --git a/krm-functions/pipeline-tests/go.mod b/krm-functions/pipeline-tests/go.mod index 741d8e3e..6db9aa6f 100644 --- a/krm-functions/pipeline-tests/go.mod +++ b/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 ( diff --git a/krm-functions/ueransim-deploy-fn/Dockerfile b/krm-functions/ueransim-deploy-fn/Dockerfile index d0e5d83f..6844bd6c 100644 --- a/krm-functions/ueransim-deploy-fn/Dockerfile +++ b/krm-functions/ueransim-deploy-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ 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"] \ No newline at end of file diff --git a/krm-functions/ueransim-deploy-fn/go.mod b/krm-functions/ueransim-deploy-fn/go.mod index 9d23f1c1..9f7c541e 100644 --- a/krm-functions/ueransim-deploy-fn/go.mod +++ b/krm-functions/ueransim-deploy-fn/go.mod @@ -1,6 +1,6 @@ module github.com/nephio-project/nephio/krm-functions/ueransim-deploy-fn -go 1.24.3 +go 1.25.6 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib diff --git a/krm-functions/vlan-fn/Dockerfile b/krm-functions/vlan-fn/Dockerfile index a99c389d..707b806d 100644 --- a/krm-functions/vlan-fn/Dockerfile +++ b/krm-functions/vlan-fn/Dockerfile @@ -12,7 +12,7 @@ # 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/ @@ -20,6 +20,6 @@ WORKDIR /go/src/krm-functions/vlan-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"] diff --git a/krm-functions/vlan-fn/go.mod b/krm-functions/vlan-fn/go.mod index 4783c50d..d7b9b5c3 100644 --- a/krm-functions/vlan-fn/go.mod +++ b/krm-functions/vlan-fn/go.mod @@ -1,6 +1,6 @@ module github.com/nephio-project/nephio/krm-functions/vlan-fn -go 1.24.3 +go 1.25.6 replace github.com/nephio-project/nephio/krm-functions/lib => ../lib diff --git a/operators/focom-operator/Dockerfile b/operators/focom-operator/Dockerfile index ecf32f60..c452efb8 100644 --- a/operators/focom-operator/Dockerfile +++ b/operators/focom-operator/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.24.3@sha256:81bf5927dc91aefb42e2bc3a5abdbe9bb3bae8ba8b107e2a4cf43ce3402534c6 AS builder +FROM golang:1.25.6@sha256:ce63a16e0f7063787ebb4eb28e72d477b00b4726f79874b3205a965ffd797ab2 AS builder ARG TARGETOS ARG TARGETARCH @@ -39,7 +39,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ma # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static@sha256:6ec5aa99dc335666e79dc64e4a6c8b89c33a543a1967f20d360922a80dd21f02 +FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764 WORKDIR / COPY --from=builder /workspace/manager . USER 65532:65532 diff --git a/operators/focom-operator/Makefile b/operators/focom-operator/Makefile index 1ccd32a7..309e021a 100644 --- a/operators/focom-operator/Makefile +++ b/operators/focom-operator/Makefile @@ -237,7 +237,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint ## Tool Versions KUSTOMIZE_VERSION ?= v5.4.3 -CONTROLLER_TOOLS_VERSION ?= v0.16.1 +CONTROLLER_TOOLS_VERSION ?= v0.20.0 ENVTEST_VERSION ?= release-0.19 GOLANGCI_LINT_VERSION ?= v1.59.1 diff --git a/operators/focom-operator/README.md b/operators/focom-operator/README.md index 153ef731..5e95b505 100644 --- a/operators/focom-operator/README.md +++ b/operators/focom-operator/README.md @@ -53,7 +53,7 @@ make deploy IMG=your-docker-repository/focom-operator-poc:2.0.0 ### Prerequisites -- go version v1.22.0+ +- go version v1.25.6+ - docker version 17.03+. - kubectl version v1.11.3+. - Access to a Kubernetes v1.11.3+ cluster. diff --git a/operators/focom-operator/config/crd/bases/focom.nephio.org_focomprovisioningrequests.yaml b/operators/focom-operator/config/crd/bases/focom.nephio.org_focomprovisioningrequests.yaml index 8a973efc..36c1464b 100644 --- a/operators/focom-operator/config/crd/bases/focom.nephio.org_focomprovisioningrequests.yaml +++ b/operators/focom-operator/config/crd/bases/focom.nephio.org_focomprovisioningrequests.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.20.0 name: focomprovisioningrequests.focom.nephio.org spec: group: focom.nephio.org diff --git a/operators/focom-operator/config/crd/bases/focom.nephio.org_oclouds.yaml b/operators/focom-operator/config/crd/bases/focom.nephio.org_oclouds.yaml index cd56fd18..33d5c9fe 100644 --- a/operators/focom-operator/config/crd/bases/focom.nephio.org_oclouds.yaml +++ b/operators/focom-operator/config/crd/bases/focom.nephio.org_oclouds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.20.0 name: oclouds.focom.nephio.org spec: group: focom.nephio.org diff --git a/operators/focom-operator/config/crd/bases/provisioning.oran.org_templateinfoes.yaml b/operators/focom-operator/config/crd/bases/provisioning.oran.org_templateinfoes.yaml index 2b097c58..3d622a47 100644 --- a/operators/focom-operator/config/crd/bases/provisioning.oran.org_templateinfoes.yaml +++ b/operators/focom-operator/config/crd/bases/provisioning.oran.org_templateinfoes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.1 + controller-gen.kubebuilder.io/version: v0.20.0 name: templateinfoes.provisioning.oran.org spec: group: provisioning.oran.org diff --git a/operators/focom-operator/go.mod b/operators/focom-operator/go.mod index f3419b60..82bb8eaf 100644 --- a/operators/focom-operator/go.mod +++ b/operators/focom-operator/go.mod @@ -1,6 +1,6 @@ module github.com/nephio-project/nephio/operators/focom-operator -go 1.24.3 +go 1.25.6 require ( github.com/go-logr/logr v1.4.2 @@ -15,9 +15,8 @@ require ( ) require ( - cel.dev/expr v0.18.0 // indirect + cel.dev/expr v0.24.0 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -27,7 +26,7 @@ require ( github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/fxamacker/cbor/v2 v2.9.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/zapr v1.3.0 // indirect @@ -37,12 +36,12 @@ require ( github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/btree v1.1.3 // indirect - github.com/google/cel-go v0.22.0 // indirect + github.com/google/cel-go v0.26.0 // indirect github.com/google/gnostic-models v0.7.0 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -52,49 +51,50 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.22.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/spf13/cobra v1.8.1 // indirect + github.com/spf13/cobra v1.9.1 // indirect github.com/spf13/pflag v1.0.6 // indirect github.com/stoewer/go-strcase v1.3.0 // indirect github.com/x448/float16 v0.8.4 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect + go.opentelemetry.io/otel v1.35.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.35.0 // indirect + go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/net v0.38.0 // indirect + golang.org/x/net v0.40.0 // indirect golang.org/x/oauth2 v0.27.0 // indirect - golang.org/x/sync v0.12.0 // indirect - golang.org/x/sys v0.31.0 // indirect - golang.org/x/term v0.30.0 // indirect - golang.org/x/text v0.23.0 // indirect + golang.org/x/sync v0.14.0 // indirect + golang.org/x/sys v0.33.0 // indirect + golang.org/x/term v0.32.0 // indirect + golang.org/x/text v0.25.0 // indirect golang.org/x/time v0.9.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.33.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect - google.golang.org/grpc v1.65.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect + google.golang.org/grpc v1.72.1 // indirect google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.32.2 // indirect - k8s.io/component-base v0.32.2 // indirect + k8s.io/apiserver v0.34.1 // indirect + k8s.io/component-base v0.34.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect sigs.k8s.io/randfill v1.0.0 // indirect sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect diff --git a/operators/focom-operator/go.sum b/operators/focom-operator/go.sum index 3cfe17ab..edf029ba 100644 --- a/operators/focom-operator/go.sum +++ b/operators/focom-operator/go.sum @@ -1,9 +1,7 @@ -cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo= -cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= +cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= +cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= @@ -12,7 +10,7 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -26,8 +24,8 @@ github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjT github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -49,10 +47,12 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= -github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g= -github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= +github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI= +github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM= github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo= github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -64,8 +64,8 @@ github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/Z github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= @@ -74,6 +74,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -81,6 +83,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -100,20 +104,19 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= -github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= @@ -133,22 +136,26 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= +go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= +go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= +go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk= +go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w= +go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= +go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -170,46 +177,46 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= -golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= -google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950= +google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I= +google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= +google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -228,20 +235,20 @@ k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscgh k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= k8s.io/apimachinery v0.34.1 h1:dTlxFls/eikpJxmAC7MVE8oOeP1zryV7iRyIjB0gky4= k8s.io/apimachinery v0.34.1/go.mod h1:/GwIlEcWuTX9zKIg2mbw0LRFIsXwrfoVxn+ef0X13lw= -k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= -k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= +k8s.io/apiserver v0.34.1 h1:U3JBGdgANK3dfFcyknWde1G6X1F4bg7PXuvlqt8lITA= +k8s.io/apiserver v0.34.1/go.mod h1:eOOc9nrVqlBI1AFCvVzsob0OxtPZUCPiUJL45JOTBG0= k8s.io/client-go v0.34.1 h1:ZUPJKgXsnKwVwmKKdPfw4tB58+7/Ik3CrjOEhsiZ7mY= k8s.io/client-go v0.34.1/go.mod h1:kA8v0FP+tk6sZA0yKLRG67LWjqufAoSHA2xVGKw9Of8= -k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= -k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= +k8s.io/component-base v0.34.1 h1:v7xFgG+ONhytZNFpIz5/kecwD+sUhVE6HU7qQUiRM4A= +k8s.io/component-base v0.34.1/go.mod h1:mknCpLlTSKHzAQJJnnHVKqjxR7gBeHRv0rPXA7gdtQ0= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOPolHyvO06MXG5TUIj2mNAA= k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y= k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/controller-runtime v0.20.2 h1:/439OZVxoEc02psi1h4QO3bHzTgu49bb347Xp4gW1pc= sigs.k8s.io/controller-runtime v0.20.2/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= diff --git a/operators/nephio-controller-manager/Dockerfile b/operators/nephio-controller-manager/Dockerfile index 01b27a70..861945dd 100644 --- a/operators/nephio-controller-manager/Dockerfile +++ b/operators/nephio-controller-manager/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary -FROM golang:1.24.3@sha256:81bf5927dc91aefb42e2bc3a5abdbe9bb3bae8ba8b107e2a4cf43ce3402534c6 AS builder +FROM golang:1.25.6@sha256:ce63a16e0f7063787ebb4eb28e72d477b00b4726f79874b3205a965ffd797ab2 AS builder ARG TARGETOS ARG TARGETARCH @@ -33,7 +33,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o /u # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details -FROM gcr.io/distroless/static@sha256:6ec5aa99dc335666e79dc64e4a6c8b89c33a543a1967f20d360922a80dd21f02 +FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764 #FROM alpine:latest WORKDIR / COPY --from=builder /usr/local/bin/manager . diff --git a/operators/nephio-controller-manager/Dockerfile.local b/operators/nephio-controller-manager/Dockerfile.local index e4a4c496..81376534 100644 --- a/operators/nephio-controller-manager/Dockerfile.local +++ b/operators/nephio-controller-manager/Dockerfile.local @@ -13,7 +13,7 @@ # limitations under the License. # Builds a debug image -FROM gcr.io/distroless/static@sha256:6ec5aa99dc335666e79dc64e4a6c8b89c33a543a1967f20d360922a80dd21f02 +FROM gcr.io/distroless/static:nonroot@sha256:cba10d7abd3e203428e86f5b2d7fd5eb7d8987c387864ae4996cf97191b33764 WORKDIR / COPY bin/manager . USER 65532:65532 diff --git a/operators/nephio-controller-manager/Makefile b/operators/nephio-controller-manager/Makefile index ce584a2c..7232f380 100644 --- a/operators/nephio-controller-manager/Makefile +++ b/operators/nephio-controller-manager/Makefile @@ -162,7 +162,7 @@ KPTGEN ?= $(LOCALBIN)/kptgen # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.25.0 KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.9.2 +CONTROLLER_TOOLS_VERSION ?= v0.20.0 KPT_VERSION ?= main KPTGEN_VERSION ?= v0.0.9 diff --git a/operators/nephio-controller-manager/go.mod b/operators/nephio-controller-manager/go.mod index 7ac2eadc..3d9045fe 100644 --- a/operators/nephio-controller-manager/go.mod +++ b/operators/nephio-controller-manager/go.mod @@ -1,6 +1,6 @@ module github.com/nephio-project/nephio/operators/nephio-controller-manager -go 1.24.3 +go 1.25.6 replace ( github.com/nephio-project/nephio/controllers/pkg => ../../controllers/pkg diff --git a/operators/o2ims-operator/Dockerfile b/operators/o2ims-operator/Dockerfile index b60d9c3e..5e61e31e 100644 --- a/operators/o2ims-operator/Dockerfile +++ b/operators/o2ims-operator/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ########################################################################## -FROM python:3.12.10-alpine3.21@sha256:4cad1c099a56dafcfee656a1bdd88c97a1372db02e14fcffa9b1869515956deb AS builder +FROM python:3.12.10-alpine3.21@sha256:9c51ecce261773a684c8345b2d4673700055c513b4d54bc0719337d3e4ee552e AS builder # Create a non-root user and group RUN addgroup -g 65535 o2ims && \ diff --git a/operators/o2ims-operator/api/app.py b/operators/o2ims-operator/api/app.py index cef5b5e6..ae6f62a6 100644 --- a/operators/o2ims-operator/api/app.py +++ b/operators/o2ims-operator/api/app.py @@ -1,10 +1,11 @@ -from flask import Flask, request, jsonify -from kubernetes import client, config -from kubernetes.client.rest import ApiException -import os import logging from datetime import datetime + +from flask import Flask, request, jsonify +from kubernetes import client, config + from controllers.utils import validate_cluster_creation_request + app = Flask(__name__) @app.route('/O2ims_infrastructureProvisioning/v1/provisioningRequests ', methods=['POST']) diff --git a/operators/o2ims-operator/controllers/manager.py b/operators/o2ims-operator/controllers/manager.py index 8466ac44..cba24f8b 100644 --- a/operators/o2ims-operator/controllers/manager.py +++ b/operators/o2ims-operator/controllers/manager.py @@ -14,18 +14,15 @@ # limitations under the License. ########################################################################## -from utils import LOG_LEVEL, CLUSTER_PROVISIONER, CREATION_TIMEOUT -from provisioning_request_controller import * -from provisioning_request_validation_controller import * -from datetime import datetime import logging +import threading + import kopf -import os -from flask import Flask -import threading from api import app # Import the Flask app - +from controllers.utils import LOG_LEVEL, CLUSTER_PROVISIONER, CREATION_TIMEOUT +from provisioning_request_controller import * +from provisioning_request_validation_controller import * # Start Flask in a separate thread diff --git a/operators/o2ims-operator/controllers/provisioning_request_controller.py b/operators/o2ims-operator/controllers/provisioning_request_controller.py index 6cd3d99c..efe23e6e 100644 --- a/operators/o2ims-operator/controllers/provisioning_request_controller.py +++ b/operators/o2ims-operator/controllers/provisioning_request_controller.py @@ -14,9 +14,12 @@ # limitations under the License. ########################################################################## -from utils import * import time import uuid +from datetime import datetime + +from controllers.utils import check_o2ims_provisioning_request, UPSTREAM_PKG_REPO, create_package_variant, \ + get_package_variant, get_capi_cluster, TIME_FORMAT def check_creation_request_status( diff --git a/operators/o2ims-operator/controllers/utils.py b/operators/o2ims-operator/controllers/utils.py index 5db114ef..449cdd30 100644 --- a/operators/o2ims-operator/controllers/utils.py +++ b/operators/o2ims-operator/controllers/utils.py @@ -15,8 +15,7 @@ ########################################################################## import os -from datetime import datetime -from dateutil.tz import tzutc + import requests requests.packages.urllib3.disable_warnings() diff --git a/operators/o2ims-operator/requirements.txt b/operators/o2ims-operator/requirements.txt index ed8afb43..298da354 100644 --- a/operators/o2ims-operator/requirements.txt +++ b/operators/o2ims-operator/requirements.txt @@ -1,6 +1,7 @@ -## requirements.txt +Flask==3.1.2 +kopf==1.40.1 +kubernetes==35.0.0 +python_kubernetes==0.2 +Requests==2.32.5 +responses==0.25.8 jinja2==3.1.6 -kopf==1.36.0 -requests==2.32.4 -python-dateutil==2.8.2 -flask==2.3.3 \ No newline at end of file diff --git a/operators/o2ims-operator/tests/unit_test_requirements.txt b/operators/o2ims-operator/tests/unit_test_requirements.txt index 2ec506dc..7b9a0fef 100644 --- a/operators/o2ims-operator/tests/unit_test_requirements.txt +++ b/operators/o2ims-operator/tests/unit_test_requirements.txt @@ -1,2 +1,2 @@ -responses -pytest \ No newline at end of file +pytest==9.0.2 +responses \ No newline at end of file diff --git a/testing/mockeryutils/go.mod b/testing/mockeryutils/go.mod index c140d890..33ae3e7c 100644 --- a/testing/mockeryutils/go.mod +++ b/testing/mockeryutils/go.mod @@ -1,6 +1,6 @@ module github.com/nephio-project/nephio/testing/mockeryutils -go 1.24.3 +go 1.25.6 require github.com/stretchr/testify v1.10.0