From 0db6e556be7c564b1aa82a6461992791315efa83 Mon Sep 17 00:00:00 2001 From: bruelea <166021996+bruelea@users.noreply.github.com> Date: Wed, 9 Apr 2025 16:07:08 +0200 Subject: [PATCH 1/3] remove unnecessary else statements --- pkg/netbox/api/ip_address.go | 3 +-- pkg/netbox/api/ip_range.go | 3 +-- pkg/netbox/api/prefix.go | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/netbox/api/ip_address.go b/pkg/netbox/api/ip_address.go index 666837d4..ee3df7ad 100644 --- a/pkg/netbox/api/ip_address.go +++ b/pkg/netbox/api/ip_address.go @@ -104,9 +104,8 @@ func (r *NetboxClient) DeleteIpAddress(ipAddressId int64) error { case *ipam.IpamIPAddressesDeleteDefault: if typedErr.IsCode(http.StatusNotFound) { return nil - } else { - return utils.NetboxError("Failed to delete ip address from Netbox", err) } + return utils.NetboxError("Failed to delete ip address from Netbox", err) default: return utils.NetboxError("Failed to delete ip address from Netbox", err) } diff --git a/pkg/netbox/api/ip_range.go b/pkg/netbox/api/ip_range.go index adc2ddf1..be00ff81 100644 --- a/pkg/netbox/api/ip_range.go +++ b/pkg/netbox/api/ip_range.go @@ -106,9 +106,8 @@ func (r *NetboxClient) DeleteIpRange(ipRangeId int64) error { case *ipam.IpamIPRangesDeleteDefault: if typedErr.IsCode(http.StatusNotFound) { return nil - } else { - return utils.NetboxError("Failed to delete ip range from Netbox", err) } + return utils.NetboxError("Failed to delete ip range from Netbox", err) default: return utils.NetboxError("Failed to delete ip range from Netbox", err) } diff --git a/pkg/netbox/api/prefix.go b/pkg/netbox/api/prefix.go index 8c78e388..2dbdc827 100644 --- a/pkg/netbox/api/prefix.go +++ b/pkg/netbox/api/prefix.go @@ -115,9 +115,8 @@ func (r *NetboxClient) DeletePrefix(prefixId int64) error { case *ipam.IpamPrefixesDeleteDefault: if typedErr.IsCode(http.StatusNotFound) { return nil - } else { - return utils.NetboxError("Failed to delete prefix from Netbox", err) } + return utils.NetboxError("Failed to delete prefix from Netbox", err) default: return utils.NetboxError("Failed to delete prefix from Netbox", err) } From df490907bfcc250b326389ebda81f948d09f7b82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:25:16 +0000 Subject: [PATCH 2/3] Bump golang from 1.23.6 to 1.24.1 Bumps golang from 1.23.6 to 1.24.1. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/env | 2 +- .github/workflows/e2e-tests.yaml | 6 +++--- .github/workflows/govuln.yaml | 2 +- .github/workflows/integration-test.yaml | 2 +- .github/workflows/lint.yaml | 4 ++-- .github/workflows/unit-test.yaml | 2 +- Dockerfile | 2 +- README.md | 2 +- go.mod | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/env b/.github/env index fb51957d..474f0da9 100644 --- a/.github/env +++ b/.github/env @@ -1,3 +1,3 @@ -golang-version=1.23 +golang-version=1.24 kind-version=v0.25.0 kind-image=kindest/node:v1.32.0 diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index d351f4dd..0bfa3ccc 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - name: Import environment variables from file run: | cat ".github/env" >> "$GITHUB_ENV" @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - name: Import environment variables from file run: | cat ".github/env" >> "$GITHUB_ENV" @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - name: Import environment variables from file run: | cat ".github/env" >> "$GITHUB_ENV" diff --git a/.github/workflows/govuln.yaml b/.github/workflows/govuln.yaml index f0bc0b66..35548543 100644 --- a/.github/workflows/govuln.yaml +++ b/.github/workflows/govuln.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - run: | set -euo pipefail diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index c961fb8c..5b901e2b 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - name: tests run: | go install github.com/onsi/ginkgo/v2/ginkgo diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7b2f21e0..eedb1ec7 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,11 +15,11 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - name: golangci-lint uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2 with: - version: v1.60.3 + version: v1.64.6 args: --config tools/.golangci.yaml - run: | set -euo pipefail diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 3929f433..6964cdaa 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.23.6 + go-version: 1.24.1 - name: tests run: | make test diff --git a/Dockerfile b/Dockerfile index 1659e64e..a3c5ef4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.23.6 AS builder +FROM golang:1.24.1 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/README.md b/README.md index da7136b7..0f1a44f4 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ NetBox Operator extends the Kubernetes API by allowing users to manage NetBox re ## Prerequisites -- go version v1.23.0+ +- go version v1.24.0+ - docker version 17.03+ - kubectl version v1.11.3+ - Access to a Kubernetes v1.11.3+ cluster diff --git a/go.mod b/go.mod index e02b5fd3..a2c67b99 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,9 @@ module github.com/netbox-community/netbox-operator -go 1.23.0 +go 1.24.0 -toolchain go1.23.6 +toolchain go1.24.1 require ( github.com/go-logr/logr v1.4.2 From 5846a7bdfe136ef29757f46fc7a6de108cdf58f3 Mon Sep 17 00:00:00 2001 From: bruelea <166021996+bruelea@users.noreply.github.com> Date: Wed, 9 Apr 2025 15:48:53 +0200 Subject: [PATCH 3/3] upgrade go from 1.24.1 to 1.24.2 --- .github/workflows/e2e-tests.yaml | 6 +++--- .github/workflows/govuln.yaml | 2 +- .github/workflows/integration-test.yaml | 2 +- .github/workflows/lint.yaml | 2 +- .github/workflows/unit-test.yaml | 2 +- Dockerfile | 2 +- go.mod | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml index 0bfa3ccc..dbbe7b88 100644 --- a/.github/workflows/e2e-tests.yaml +++ b/.github/workflows/e2e-tests.yaml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - name: Import environment variables from file run: | cat ".github/env" >> "$GITHUB_ENV" @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - name: Import environment variables from file run: | cat ".github/env" >> "$GITHUB_ENV" @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - name: Import environment variables from file run: | cat ".github/env" >> "$GITHUB_ENV" diff --git a/.github/workflows/govuln.yaml b/.github/workflows/govuln.yaml index 35548543..8d9199ee 100644 --- a/.github/workflows/govuln.yaml +++ b/.github/workflows/govuln.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - run: | set -euo pipefail diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml index 5b901e2b..c83dcb96 100644 --- a/.github/workflows/integration-test.yaml +++ b/.github/workflows/integration-test.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - name: tests run: | go install github.com/onsi/ginkgo/v2/ginkgo diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index eedb1ec7..d67aed81 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - name: golangci-lint uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2 with: diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index 6964cdaa..33a45980 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0 with: - go-version: 1.24.1 + go-version: 1.24.2 - name: tests run: | make test diff --git a/Dockerfile b/Dockerfile index a3c5ef4c..e2629473 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.24.1 AS builder +FROM golang:1.24.2 AS builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index a2c67b99..a5dc2192 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ module github.com/netbox-community/netbox-operator go 1.24.0 -toolchain go1.24.1 +toolchain go1.24.2 require ( github.com/go-logr/logr v1.4.2