Skip to content

Commit 077e3ee

Browse files
tknatkna
authored
Merge pull request #1843 from cybozu/update-neco-exporter-k8s-1.34
Update for K8s 1.34
2 parents 20ce6cc + 162dcd3 commit 077e3ee

File tree

5 files changed

+80
-78
lines changed

5 files changed

+80
-78
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66
- "main"
77
jobs:
88
prepare_matrix:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
outputs:
1111
jobs: ${{ steps.prepare-matrix.outputs.jobs }}
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- uses: ./.github/actions/prepare_matrix
1515
id: prepare-matrix
1616
with:
@@ -292,11 +292,11 @@ jobs:
292292
strategy:
293293
matrix:
294294
job: ${{ fromJson(needs.prepare_matrix.outputs.jobs) }}
295-
runs-on: ubuntu-22.04
295+
runs-on: ubuntu-24.04
296296
env:
297-
go-version: "1.25.6"
297+
go-version: "1.25.7"
298298
steps:
299-
- uses: actions/checkout@v5
299+
- uses: actions/checkout@v6
300300
- name: Setup build environment
301301
uses: ./.github/actions/setup
302302
with:

‎neco-exporter/TAG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.1
1+
0.3.2

‎neco-exporter/e2e/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
GOARCH ?= $(shell go env GOARCH)
22
OS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
33

4-
E2ETEST_K8S_VERSION := 1.33.7
4+
E2ETEST_K8S_VERSION := 1.34.3
55
KIND_VERSION := 0.31.0
66
CILIUM_VERSION := $(shell go list -m -f '{{.Version}}' github.com/cilium/cilium | cut -c2-)
7-
CILIUM_CLI_VERSION := 0.19.0
7+
CILIUM_CLI_VERSION := 0.19.1
88

99
PROJECT_DIR := $(CURDIR)/../
1010
BIN_DIR := $(PROJECT_DIR)/bin

‎neco-exporter/go.mod‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/cybozu/neco-containers/neco-exporter
22

3-
go 1.25.6
3+
go 1.25.7
44

55
require (
6-
github.com/VictoriaMetrics/metrics v1.40.2
6+
github.com/VictoriaMetrics/metrics v1.41.1
77
github.com/cilium/cilium v1.16.12
88
github.com/cilium/ebpf v0.20.0
99
github.com/go-logr/logr v1.4.3
10-
github.com/onsi/ginkgo/v2 v2.27.5
11-
github.com/onsi/gomega v1.39.0
10+
github.com/onsi/ginkgo/v2 v2.28.1
11+
github.com/onsi/gomega v1.39.1
1212
github.com/spf13/cobra v1.10.2
13-
k8s.io/api v0.33.7
14-
k8s.io/apimachinery v0.33.7
15-
k8s.io/client-go v0.33.7
13+
k8s.io/api v0.34.4
14+
k8s.io/apimachinery v0.34.4
15+
k8s.io/client-go v0.34.4
1616
k8s.io/klog/v2 v2.130.1
17-
sigs.k8s.io/controller-runtime v0.21.0
17+
sigs.k8s.io/controller-runtime v0.22.5
1818
)
1919

2020
require (
@@ -24,10 +24,10 @@ require (
2424
github.com/blang/semver/v4 v4.0.0 // indirect
2525
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
27+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2828
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
29-
github.com/fsnotify/fsnotify v1.7.0 // indirect
30-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
29+
github.com/fsnotify/fsnotify v1.9.0 // indirect
30+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3131
github.com/go-logr/stdr v1.2.2 // indirect
3232
github.com/go-openapi/analysis v0.23.0 // indirect
3333
github.com/go-openapi/errors v0.22.0 // indirect
@@ -42,7 +42,7 @@ require (
4242
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/google/btree v1.1.3 // indirect
45-
github.com/google/gnostic-models v0.6.9 // indirect
45+
github.com/google/gnostic-models v0.7.0 // indirect
4646
github.com/google/go-cmp v0.7.0 // indirect
4747
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
4848
github.com/google/uuid v1.6.0 // indirect
@@ -55,13 +55,14 @@ require (
5555
github.com/mailru/easyjson v0.7.7 // indirect
5656
github.com/mitchellh/mapstructure v1.5.0 // indirect
5757
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
58-
github.com/modern-go/reflect2 v1.0.2 // indirect
58+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5959
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6060
github.com/oklog/ulid v1.3.1 // indirect
6161
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
6262
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
6363
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
6464
github.com/pkg/errors v0.9.1 // indirect
65+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6566
github.com/prometheus/client_golang v1.22.0 // indirect
6667
github.com/prometheus/client_model v0.6.1 // indirect
6768
github.com/prometheus/common v0.62.0 // indirect
@@ -73,7 +74,7 @@ require (
7374
github.com/sourcegraph/conc v0.3.0 // indirect
7475
github.com/spf13/afero v1.11.0 // indirect
7576
github.com/spf13/cast v1.6.0 // indirect
76-
github.com/spf13/pflag v1.0.10 // indirect
77+
github.com/spf13/pflag v1.0.9 // indirect
7778
github.com/spf13/viper v1.19.0 // indirect
7879
github.com/subosito/gotenv v1.6.0 // indirect
7980
github.com/valyala/fastrand v1.1.0 // indirect
@@ -83,10 +84,11 @@ require (
8384
github.com/x448/float16 v0.8.4 // indirect
8485
go.mongodb.org/mongo-driver v1.14.0 // indirect
8586
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
86-
go.opentelemetry.io/otel v1.34.0 // indirect
87-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
88-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
87+
go.opentelemetry.io/otel v1.35.0 // indirect
88+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
89+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
8990
go.uber.org/multierr v1.11.0 // indirect
91+
go.yaml.in/yaml/v2 v2.4.2 // indirect
9092
go.yaml.in/yaml/v3 v3.0.4 // indirect
9193
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
9294
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
@@ -105,11 +107,11 @@ require (
105107
gopkg.in/inf.v0 v0.9.1 // indirect
106108
gopkg.in/ini.v1 v1.67.0 // indirect
107109
gopkg.in/yaml.v3 v3.0.1 // indirect
108-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
109-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
110-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
111-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
110+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
111+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
112+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
113+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
112114
sigs.k8s.io/randfill v1.0.0 // indirect
113-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
114-
sigs.k8s.io/yaml v1.4.0 // indirect
115+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
116+
sigs.k8s.io/yaml v1.6.0 // indirect
115117
)

0 commit comments

Comments
 (0)