Skip to content

Commit 2038942

Browse files
authored
Merge pull request #94 from High10Hunter/feat-update-v1beta2-cluster-api-support
feat: update v1beta2 cluster api support
2 parents 08a4fad + 03f4efb commit 2038942

File tree

9 files changed

+263
-322
lines changed

9 files changed

+263
-322
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN npm run build
1717
# Build the Go binary.
1818
# Alpine is chosen for its small footprint
1919
# compared to Ubuntu
20-
FROM golang:1.22-alpine as builder
20+
FROM golang:1.24-alpine as builder
2121

2222
# Need to redeclare ARCH to use in Go build stage
2323
ARG ARCH
@@ -31,7 +31,7 @@ COPY go.mod ./
3131
COPY go.sum ./
3232

3333
RUN --mount=type=cache,target=/go/pkg/mod \
34-
go mod download
34+
go mod download
3535

3636
COPY ./main.go /app/
3737
COPY ./internal /app/internal

go.mod

Lines changed: 59 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,127 +1,98 @@
11
module github.com/Jont828/cluster-api-visualizer
22

3-
go 1.22.0
3+
go 1.24.0
4+
5+
toolchain go1.24.3
46

57
require (
68
github.com/gobuffalo/flect v1.0.3
79
github.com/pkg/errors v0.9.1
810
gopkg.in/yaml.v2 v2.4.0
9-
k8s.io/api v0.30.3
10-
k8s.io/apiextensions-apiserver v0.30.3
11-
k8s.io/apimachinery v0.30.3
12-
k8s.io/client-go v0.30.3
13-
k8s.io/klog/v2 v2.120.1
14-
sigs.k8s.io/cluster-api v1.8.5
15-
sigs.k8s.io/controller-runtime v0.18.5
11+
k8s.io/api v0.33.3
12+
k8s.io/apiextensions-apiserver v0.33.3
13+
k8s.io/apimachinery v0.33.3
14+
k8s.io/client-go v0.33.3
15+
k8s.io/klog/v2 v2.130.1
16+
sigs.k8s.io/cluster-api v1.11.1
17+
sigs.k8s.io/controller-runtime v0.21.0
1618

1719
)
1820

1921
require (
20-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
21-
github.com/felixge/httpsnoop v1.0.4 // indirect
22-
github.com/go-logr/stdr v1.2.2 // indirect
23-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
24-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
25-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
26-
go.opentelemetry.io/otel v1.24.0 // indirect
27-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 // indirect
28-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.20.0 // indirect
29-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
30-
go.opentelemetry.io/otel/sdk v1.20.0 // indirect
31-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
32-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
33-
google.golang.org/grpc v1.62.2 // indirect
34-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.0 // indirect
22+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
23+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
24+
github.com/google/btree v1.1.3 // indirect
25+
github.com/x448/float16 v0.8.4 // indirect
26+
go.opentelemetry.io/otel v1.34.0 // indirect
27+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
28+
go.yaml.in/yaml/v2 v2.4.2 // indirect
29+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
30+
sigs.k8s.io/randfill v1.0.0 // indirect
3531
)
3632

3733
require (
3834
github.com/MakeNowJust/heredoc v1.0.0 // indirect
39-
github.com/Masterminds/goutils v1.1.1 // indirect
40-
github.com/Masterminds/semver/v3 v3.2.0 // indirect
41-
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4235
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
43-
github.com/adrg/xdg v0.5.0 // indirect
44-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
45-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
36+
github.com/adrg/xdg v0.5.3 // indirect
4637
github.com/beorn7/perks v1.0.1 // indirect
4738
github.com/blang/semver/v4 v4.0.0 // indirect
48-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
49-
github.com/cloudflare/circl v1.3.7 // indirect
39+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
40+
github.com/cloudflare/circl v1.6.1 // indirect
5041
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5142
github.com/distribution/reference v0.6.0 // indirect
5243
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
53-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
54-
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
55-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
56-
github.com/fsnotify/fsnotify v1.7.0 // indirect
57-
github.com/go-logr/logr v1.4.2 // indirect
58-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
44+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
45+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
46+
github.com/fsnotify/fsnotify v1.8.0 // indirect
47+
github.com/go-logr/logr v1.4.3 // indirect
48+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5949
github.com/go-openapi/jsonreference v0.20.2 // indirect
60-
github.com/go-openapi/swag v0.22.3 // indirect
50+
github.com/go-openapi/swag v0.23.0 // indirect
6151
github.com/gogo/protobuf v1.3.2 // indirect
62-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
63-
github.com/golang/protobuf v1.5.4 // indirect
64-
github.com/google/cel-go v0.17.8 // indirect
65-
github.com/google/gnostic-models v0.6.8 // indirect
66-
github.com/google/go-cmp v0.6.0 // indirect
52+
github.com/google/gnostic-models v0.6.9 // indirect
53+
github.com/google/go-cmp v0.7.0 // indirect
6754
github.com/google/go-github/v53 v53.2.0 // indirect
6855
github.com/google/go-querystring v1.1.0 // indirect
69-
github.com/google/gofuzz v1.2.0 // indirect
7056
github.com/google/uuid v1.6.0 // indirect
71-
github.com/hashicorp/hcl v1.0.0 // indirect
72-
github.com/huandu/xstrings v1.3.3 // indirect
73-
github.com/imdario/mergo v0.3.13 // indirect
7457
github.com/josharian/intern v1.0.0 // indirect
7558
github.com/json-iterator/go v1.1.12 // indirect
76-
github.com/magiconair/properties v1.8.7 // indirect
7759
github.com/mailru/easyjson v0.7.7 // indirect
78-
github.com/mitchellh/copystructure v1.2.0 // indirect
79-
github.com/mitchellh/mapstructure v1.5.0 // indirect
80-
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8160
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8261
github.com/modern-go/reflect2 v1.0.2 // indirect
8362
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
84-
github.com/onsi/gomega v1.36.0
63+
github.com/onsi/gomega v1.38.0
8564
github.com/opencontainers/go-digest v1.0.0 // indirect
86-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
87-
github.com/prometheus/client_golang v1.18.0 // indirect
88-
github.com/prometheus/client_model v0.6.0 // indirect
89-
github.com/prometheus/common v0.45.0 // indirect
90-
github.com/prometheus/procfs v0.12.0 // indirect
91-
github.com/sagikazarmark/locafero v0.4.0 // indirect
92-
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
93-
github.com/shopspring/decimal v1.3.1 // indirect
65+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
66+
github.com/prometheus/client_golang v1.22.0 // indirect
67+
github.com/prometheus/client_model v0.6.1 // indirect
68+
github.com/prometheus/common v0.62.0 // indirect
69+
github.com/prometheus/procfs v0.15.1 // indirect
70+
github.com/sagikazarmark/locafero v0.7.0 // indirect
9471
github.com/sourcegraph/conc v0.3.0 // indirect
95-
github.com/spf13/afero v1.11.0 // indirect
96-
github.com/spf13/cast v1.6.0 // indirect
97-
github.com/spf13/pflag v1.0.5 // indirect
98-
github.com/spf13/viper v1.19.0 // indirect
99-
github.com/stoewer/go-strcase v1.2.0 // indirect
72+
github.com/spf13/afero v1.12.0 // indirect
73+
github.com/spf13/cast v1.7.1 // indirect
74+
github.com/spf13/pflag v1.0.7 // indirect
75+
github.com/spf13/viper v1.20.1 // indirect
10076
github.com/subosito/gotenv v1.6.0 // indirect
101-
github.com/valyala/fastjson v1.6.4 // indirect
10277
go.uber.org/multierr v1.11.0 // indirect
103-
golang.org/x/crypto v0.28.0 // indirect
104-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
105-
golang.org/x/net v0.30.0 // indirect
106-
golang.org/x/oauth2 v0.21.0 // indirect
107-
golang.org/x/sync v0.8.0 // indirect
108-
golang.org/x/sys v0.26.0 // indirect
109-
golang.org/x/term v0.25.0 // indirect
110-
golang.org/x/text v0.19.0 // indirect
111-
golang.org/x/time v0.5.0 // indirect
112-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
113-
google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
114-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
115-
google.golang.org/protobuf v1.35.1 // indirect
78+
golang.org/x/crypto v0.40.0 // indirect
79+
golang.org/x/net v0.42.0 // indirect
80+
golang.org/x/oauth2 v0.30.0 // indirect
81+
golang.org/x/sync v0.16.0 // indirect
82+
golang.org/x/sys v0.34.0 // indirect
83+
golang.org/x/term v0.33.0 // indirect
84+
golang.org/x/text v0.27.0 // indirect
85+
golang.org/x/time v0.9.0 // indirect
86+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
87+
google.golang.org/protobuf v1.36.6 // indirect
11688
gopkg.in/inf.v0 v0.9.1 // indirect
117-
gopkg.in/ini.v1 v1.67.0 // indirect
11889
gopkg.in/yaml.v3 v3.0.1 // indirect
119-
k8s.io/apiserver v0.30.3 // indirect
120-
k8s.io/cluster-bootstrap v0.30.3 // indirect
121-
k8s.io/component-base v0.30.3 // indirect
122-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
123-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
124-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
125-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
126-
sigs.k8s.io/yaml v1.4.0 // indirect
90+
k8s.io/apiserver v0.33.3 // indirect
91+
k8s.io/cluster-bootstrap v0.33.3 // indirect
92+
k8s.io/component-base v0.33.3 // indirect
93+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
94+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
95+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
96+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
97+
sigs.k8s.io/yaml v1.6.0 // indirect
12798
)

0 commit comments

Comments
 (0)