Skip to content

Commit 27ae7c3

Browse files
dependabot[bot]bruelea
dependabot[bot]
and
bruelea
authored
Bump golang from 1.23.6 to 1.24.2 (#262)
* remove unnecessary else statements * 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] <support@github.com> * upgrade go from 1.24.1 to 1.24.2 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: bruelea <166021996+bruelea@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent f91ff48 commit 27ae7c3

File tree

12 files changed

+16
-19
lines changed

12 files changed

+16
-19
lines changed

‎.github/env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
golang-version=1.23
1+
golang-version=1.24
22
kind-version=v0.25.0
33
kind-image=kindest/node:v1.32.0

‎.github/workflows/e2e-tests.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2222
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
2323
with:
24-
go-version: 1.23.6
24+
go-version: 1.24.2
2525
- name: Import environment variables from file
2626
run: |
2727
cat ".github/env" >> "$GITHUB_ENV"
@@ -35,7 +35,7 @@ jobs:
3535
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3636
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
3737
with:
38-
go-version: 1.23.6
38+
go-version: 1.24.2
3939
- name: Import environment variables from file
4040
run: |
4141
cat ".github/env" >> "$GITHUB_ENV"
@@ -49,7 +49,7 @@ jobs:
4949
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5050
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
5151
with:
52-
go-version: 1.23.6
52+
go-version: 1.24.2
5353
- name: Import environment variables from file
5454
run: |
5555
cat ".github/env" >> "$GITHUB_ENV"

‎.github/workflows/govuln.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1616
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
1717
with:
18-
go-version: 1.23.6
18+
go-version: 1.24.2
1919
- run: |
2020
set -euo pipefail
2121

‎.github/workflows/integration-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1717
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
1818
with:
19-
go-version: 1.23.6
19+
go-version: 1.24.2
2020
- name: tests
2121
run: |
2222
go install github.com/onsi/ginkgo/v2/ginkgo

‎.github/workflows/lint.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ jobs:
1515
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1616
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
1717
with:
18-
go-version: 1.23.6
18+
go-version: 1.24.2
1919
- name: golangci-lint
2020
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6.5.2
2121
with:
22-
version: v1.60.3
22+
version: v1.64.6
2323
args: --config tools/.golangci.yaml
2424
- run: |
2525
set -euo pipefail

‎.github/workflows/unit-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1717
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
1818
with:
19-
go-version: 1.23.6
19+
go-version: 1.24.2
2020
- name: tests
2121
run: |
2222
make test

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.23.6 AS builder
2+
FROM golang:1.24.2 AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ NetBox Operator extends the Kubernetes API by allowing users to manage NetBox re
1010

1111
## Prerequisites
1212

13-
- go version v1.23.0+
13+
- go version v1.24.0+
1414
- docker version 17.03+
1515
- kubectl version v1.11.3+
1616
- Access to a Kubernetes v1.11.3+ cluster

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33

44
module github.com/netbox-community/netbox-operator
55

6-
go 1.23.0
6+
go 1.24.0
77

8-
toolchain go1.23.6
8+
toolchain go1.24.2
99

1010
require (
1111
github.com/go-logr/logr v1.4.2

‎pkg/netbox/api/ip_address.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ func (r *NetboxClient) DeleteIpAddress(ipAddressId int64) error {
104104
case *ipam.IpamIPAddressesDeleteDefault:
105105
if typedErr.IsCode(http.StatusNotFound) {
106106
return nil
107-
} else {
108-
return utils.NetboxError("Failed to delete ip address from Netbox", err)
109107
}
108+
return utils.NetboxError("Failed to delete ip address from Netbox", err)
110109
default:
111110
return utils.NetboxError("Failed to delete ip address from Netbox", err)
112111
}

0 commit comments

Comments
 (0)