Skip to content

Commit 753919b

Browse files
authored
bump go1.25, bump k8s (#451)
1 parent 0c58eee commit 753919b

File tree

1,362 files changed

+46106
-68650
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,362 files changed

+46106
-68650
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
namespace: openshift
33
name: release
4-
tag: rhel-9-release-golang-1.24-openshift-4.20
4+
tag: rhel-9-release-golang-1.25-openshift-4.21

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v3
1616
with:
17-
go-version: '1.24'
17+
go-version: '1.25'
1818
- name: Install make
1919
run: sudo apt -y install make
2020
- name: run build

.github/workflows/pull_request_e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: set up go 1.x
2424
uses: actions/setup-go@v3
2525
with:
26-
go-version: '1.24'
26+
go-version: '1.25'
2727
- name: checkout
2828
uses: actions/checkout@v3
2929
- name: get kernel version

.github/workflows/push_image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: set up go 1.x
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: '1.24'
22+
go-version: '1.25'
2323
- name: checkout
2424
uses: actions/checkout@v3
2525
- name: docker login to quay.io
@@ -47,7 +47,7 @@ jobs:
4747
- name: set up go 1.x
4848
uses: actions/setup-go@v3
4949
with:
50-
go-version: '1.24'
50+
go-version: '1.25'
5151
- name: checkout
5252
uses: actions/checkout@v3
5353
- name: Test

.github/workflows/push_image_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: set up go 1.x
2121
uses: actions/setup-go@v3
2222
with:
23-
go-version: '1.24'
23+
go-version: '1.25'
2424
- name: checkout
2525
uses: actions/checkout@v3
2626
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: set up go 1.x
3232
uses: actions/setup-go@v3
3333
with:
34-
go-version: '1.24'
34+
go-version: '1.25'
3535
- name: docker login to quay.io
3636
uses: docker/login-action@v2
3737
with:

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
ARG TARGETARCH=amd64
33

44
# Build the manager binary
5-
FROM docker.io/library/golang:1.24 as builder
5+
FROM docker.io/library/golang:1.25 as builder
66

77
ARG TARGETARCH
88
ARG LDFLAGS

Dockerfile.downstream

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BUILDVERSION_Y
55
FROM registry.redhat.io/openshift4/ose-cli-rhel9:v4.18.0-202502040032.p0.ga50d4c0.assembly.stream.el9 as ose-cli
66

77
# Build the manager binary
8-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.24 as builder
8+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.25 as builder
99
ARG BUILDVERSION
1010
ARG IMAGE=registry.redhat.io/network-observability/network-observability-cli-rhel9:${BUILDVERSION}
1111
ARG AGENT_IMAGE=registry.redhat.io/network-observability/network-observability-ebpf-agent-rhel9:${BUILDVERSION}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ifneq ($(CLEAN_BUILD),)
5151
LDFLAGS ?= -X 'main.buildVersion=${VERSION}-${BUILD_SHA}' -X 'main.buildDate=${BUILD_DATE}'
5252
endif
5353

54-
GOLANGCI_LINT_VERSION = v2.2.1
54+
GOLANGCI_LINT_VERSION = v2.8.0
5555
BASH_VERSION = v4.2.0
5656
YQ_VERSION = v4.45.1
5757

go.mod

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/netobserv/network-observability-cli
22

3-
go 1.24.0
4-
5-
toolchain go1.24.4
3+
go 1.25.0
64

75
require (
86
github.com/gdamore/tcell/v2 v2.13.7
@@ -42,7 +40,6 @@ require (
4240
github.com/go-openapi/jsonreference v0.21.0 // indirect
4341
github.com/go-openapi/swag v0.23.1 // indirect
4442
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
45-
github.com/gogo/protobuf v1.3.2 // indirect
4643
github.com/google/gnostic-models v0.7.0 // indirect
4744
github.com/google/go-cmp v0.7.0 // indirect
4845
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
@@ -63,7 +60,6 @@ require (
6360
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6461
github.com/netsampler/goflow2 v1.3.7 // indirect
6562
github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250227173154-57a2590a1d16 // indirect
66-
github.com/pkg/errors v0.9.1 // indirect
6763
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6864
github.com/prometheus/client_golang v1.23.2
6965
github.com/prometheus/client_model v0.6.2 // indirect
@@ -92,17 +88,17 @@ require (
9288
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
9389
google.golang.org/grpc v1.78.0 // indirect
9490
google.golang.org/protobuf v1.36.11
95-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
91+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
9692
gopkg.in/inf.v0 v0.9.1 // indirect
97-
k8s.io/api v0.34.3
98-
k8s.io/apimachinery v0.34.3
99-
k8s.io/client-go v0.34.3
93+
k8s.io/api v0.35.0
94+
k8s.io/apimachinery v0.35.0
95+
k8s.io/client-go v0.35.0
10096
k8s.io/component-base v0.32.3 // indirect
10197
k8s.io/klog/v2 v2.130.1 // indirect
102-
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
103-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
98+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
99+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect
104100
sigs.k8s.io/controller-runtime v0.20.4 // indirect
105-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
101+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
106102
sigs.k8s.io/randfill v1.0.0 // indirect
107103
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
108104
sigs.k8s.io/yaml v1.6.0 // indirect

0 commit comments

Comments
 (0)