Merge pull request #70 from Nordix/bump_go_version

Bump go version and dependencies

Author: efiacor

.gitignore

@@ -12,5 +12,10 @@ bin/*
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+# Test coverage files
+coverage_unit.html
+lcov.info
+func_coverage.out
+
 # Dependency directories (remove the comment below to include it)
 # vendor/

.golangci.yml

@@ -1,3 +1,5 @@
+version: 2
+
 run:
   skip-dirs:
     - vendor
@@ -11,18 +13,16 @@ linters:
   enable:
     # errcheck is a program for checking for unchecked errors in Go code. These unchecked errors can be critical bugs in some cases
     - errcheck
-    # checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
-    - gofmt
-    # Linter for Go source code that specializes in simplifying code
-    - gosimple
     # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - govet
     # Detects when assignments to existing variables are not used
     - ineffassign
-    # Checks for misuse of Sprintf to construct a host with port in a URL.
-    - nosprintfhostport
+    # It's the set of rules from staticcheck (includes gosimple)
     - staticcheck
-    # Like the front-end of a Go compiler, parses and type-checks Go code
-    - typecheck
     # Checks Go code for unused constants, variables, functions and types
     - unused
+
+formatters:
+  enable:
+    # checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
+    - gofmt

.prow.yaml

@@ -4,31 +4,40 @@ presubmits:
     run_if_changed: "^.*.go$"
     spec:
       containers:
-      - image: nephio/gotests:1783899289886396416
+      - image: golang:1.25-alpine
         command:
-        - make
+        - "/bin/sh"
+        - "-c"
         args:
-        - unit
+        - |
+          apk add --no-cache make bash
+          make unit
   - name: presubmit-api-gosec
     decorate: true
     run_if_changed: "^.*.go$"
     spec:
       containers:
-      - image: nephio/gotests:1783899289886396416
+      - image: golang:1.25-alpine
         command:
-        - make
+        - "/bin/sh"
+        - "-c"
         args:
-        - gosec
+        - |
+          apk add --no-cache make bash git
+          make gosec
   - name: presubmit-api-golangci-lint
     decorate: true
     run_if_changed: "^.*.go$"
     spec:
       containers:
-      - image: nephio/gotests:1783899289886396416
+      - image: golangci/golangci-lint:v2.8.0-alpine
         command:
-        - make
+        - "/bin/sh"
+        - "-c"
         args:
-        - lint
+        - |
+          apk add --no-cache make bash
+          make lint
   - name: presubmit-api-license-header-check
     decorate: true
     run_if_changed: "^.*.go$"

Makefile

@@ -12,9 +12,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-GO_VERSION ?= 1.20.2
-GOLANG_CI_VER ?= v1.52
-GOSEC_VER ?= 2.15.0
+GO_VERSION ?= 1.25
+GOLANG_CI_VER ?= v2.8.0
+GOSEC_VER ?= latest
 TEST_COVERAGE_FILE=lcov.info
 TEST_COVERAGE_HTML_FILE=coverage_unit.html
 TEST_COVERAGE_FUNC_FILE=func_coverage.out
@@ -78,16 +78,24 @@ $(LOCALBIN):
 
 ## Tool Binaries
 CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
+GOSEC ?= $(LOCALBIN)/gosec
 
 ## Tool Versions
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-CONTROLLER_TOOLS_VERSION ?= v0.13.0
+CONTROLLER_TOOLS_VERSION ?= v0.20.0
+GOSEC_VERSION ?= latest
 
 .PHONY: controller-gen
 controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
 $(CONTROLLER_GEN): $(LOCALBIN)
 	test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
 
+.PHONY: gosec
+gosec: $(GOSEC) ## inspects source code for security problem by scanning the Go Abstract Syntax Tree
+	$(GOSEC) ./...
+$(GOSEC): $(LOCALBIN)
+	test -s $(LOCALBIN)/gosec || GOBIN=$(LOCALBIN) go install github.com/securego/gosec/v2/cmd/gosec@$(GOSEC_VERSION)
+
 .PHONY: unit_clean
 unit_clean: ## clean up the unit test artifacts created
 ifeq ($(CONTAINER_RUNNABLE), 0)
@@ -98,7 +106,7 @@ endif
 .PHONY: unit
 unit: ## Run unit tests against code.
 ifeq ($(CONTAINER_RUNNABLE), 0)
-		$(CONTAINER_RUNTIME) run -it -v ${PWD}:/go/src -w /go/src docker.io/library/golang:${GO_VERSION}-alpine3.17 \
+		$(CONTAINER_RUNTIME) run -it -v ${PWD}:/go/src -w /go/src docker.io/library/golang:${GO_VERSION}-alpine \
          /bin/sh -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}"
@@ -116,12 +124,3 @@ ifeq ($(CONTAINER_RUNNABLE), 0)
 else
 		golangci-lint run ./... -v --timeout 10m
 endif
-
-# Install link at https://github.com/securego/gosec#install if not running inside a container
-.PHONY: gosec
-gosec: ## inspects source code for security problem by scanning the Go Abstract Syntax Tree
-ifeq ($(CONTAINER_RUNNABLE), 0)
-		$(CONTAINER_RUNTIME) run -it -v ${PWD}:/go/src -w /go/src docker.io/securego/gosec:${GOSEC_VER} ./...
-else
-		gosec ./...
-endif

cfg/v1alpha1/zz_generated.deepcopy.go

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: networks.config.nephio.org
 spec:
   group: config.nephio.org
@@ -28,14 +27,19 @@ spec:
         description: Network is the Schema for the Network API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -48,14 +52,16 @@ spec:
                 type: object
                 x-kubernetes-preserve-unknown-fields: true
               lifecycle:
-                description: Lifecycle determines the lifecycle policies the resource
-                  e.g. delete is orphan or delete will follow
+                description: |-
+                  Lifecycle determines the lifecycle policies the resource e.g. delete is orphan or delete
+                  will follow
                 properties:
                   deletionPolicy:
                     default: delete
-                    description: DeletionPolicy specifies what will happen to the
-                      underlying resource when this resource is deleted - either "delete"
-                      or "orphan" the resource.
+                    description: |-
+                      DeletionPolicy specifies what will happen to the underlying resource
+                      when this resource is deleted - either "delete" or "orphan" the
+                      resource.
                     enum:
                     - delete
                     - orphan
@@ -70,32 +76,31 @@ spec:
                 items:
                   properties:
                     lastTransitionTime:
-                      description: lastTransitionTime is the last time the condition
-                        transitioned from one status to another. This should be when
-                        the underlying condition changed.  If that is not known, then
-                        using the time when the API field changed is acceptable.
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
-                      description: message is a human readable message indicating
-                        details about the transition. This may be an empty string.
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
                       maxLength: 32768
                       type: string
                     observedGeneration:
-                      description: observedGeneration represents the .metadata.generation
-                        that the condition was set based upon. For instance, if .metadata.generation
-                        is currently 12, but the .status.conditions[x].observedGeneration
-                        is 9, the condition is out of date with respect to the current
-                        state of the instance.
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-                      description: reason contains a programmatic identifier indicating
-                        the reason for the condition's last transition. Producers
-                        of specific condition types may define expected values and
-                        meanings for this field, and whether the values are considered
-                        a guaranteed API. The value should be a CamelCase string.
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -110,10 +115,6 @@ spec:
                       type: string
                     type:
                       description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                        --- Many .condition.type values are consistent across resources
-                        like Available, but because arbitrary conditions can be useful
-                        (see .node.status.conditions), the ability to deconflict is
-                        important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

config/crd/bases/config.nephio.org_networks.yaml

@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.9.2
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.20.0
   name: clustercontexts.infra.nephio.org
 spec:
   group: infra.nephio.org
@@ -21,14 +20,19 @@ spec:
         description: ClusterContext is the Schema for the clustercontexts API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object