Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
golang-version=1.23
golang-version=1.24
kind-version=v0.25.0
kind-image=kindest/node:v1.32.0
6 changes: 3 additions & 3 deletions .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
- name: Import environment variables from file
run: |
cat ".github/env" >> "$GITHUB_ENV"
Expand All @@ -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.2
- name: Import environment variables from file
run: |
cat ".github/env" >> "$GITHUB_ENV"
Expand All @@ -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.2
- name: Import environment variables from file
run: |
cat ".github/env" >> "$GITHUB_ENV"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/govuln.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
- run: |
set -euo pipefail

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
- name: tests
run: |
go install github.com/onsi/ginkgo/v2/ginkgo
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
- 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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
- name: tests
run: |
make test
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM golang:1.23.6 AS builder
FROM golang:1.24.2 AS builder
ARG TARGETOS
ARG TARGETARCH

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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.2

require (
github.com/go-logr/logr v1.4.2
Expand Down
3 changes: 1 addition & 2 deletions pkg/netbox/api/ip_address.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/netbox/api/ip_range.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
3 changes: 1 addition & 2 deletions pkg/netbox/api/prefix.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down