Skip to content

Commit c9a4a38

Browse files
author
Lin Yang
authored
Merge pull request #1 from flomesh-io/deps/gateway-api-v1.4.0
build(deps): bump GatewayAPI to v1.4.0
2 parents 0d809a8 + 1abd4d6 commit c9a4a38

Some content is hidden

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

43 files changed

+245
-243
lines changed

‎.goreleaser.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ builds:
2929
# Reduce the size of the binary. Ref: https://pkg.go.dev/cmd/link
3030
- -s -w
3131
# Embed versioning and build information in the binary.
32-
- -X sigs.k8s.io/gwctl/pkg/version.version={{.Version}}
33-
- -X sigs.k8s.io/gwctl/pkg/version.gitCommit={{.FullCommit}}
34-
- -X sigs.k8s.io/gwctl/pkg/version.buildDate={{.Date}}
32+
- -X github.com/flomesh-io/gwctl/pkg/version.version={{.Version}}
33+
- -X github.com/flomesh-io/gwctl/pkg/version.gitCommit={{.FullCommit}}
34+
- -X github.com/flomesh-io/gwctl/pkg/version.buildDate={{.Date}}
3535

3636
archives:
3737
- format: tar.gz

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ build: deps
3232
@echo "Building gwctl..."
3333
@echo "GIT_COMMIT=$(GIT_COMMIT)"
3434
@echo "BUILD_DATE=$(BUILD_DATE)"
35-
go build -ldflags="-X sigs.k8s.io/gwctl/pkg/version.gitCommit=$(GIT_COMMIT) -X sigs.k8s.io/gwctl/pkg/version.buildDate=$(BUILD_DATE)" -o $(BIN_DIR)/gwctl main.go
35+
go build -ldflags="-X github.com/flomesh-io/gwctl/pkg/version.gitCommit=$(GIT_COMMIT) -X github.com/flomesh-io/gwctl/pkg/version.buildDate=$(BUILD_DATE)" -o $(BIN_DIR)/gwctl main.go
3636
@echo "Done"
3737

3838
.PHONY: clean

‎cmd/analyze/analyze.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ import (
3131
"k8s.io/cli-runtime/pkg/genericiooptions"
3232
"k8s.io/cli-runtime/pkg/resource"
3333

34-
"sigs.k8s.io/gwctl/pkg/common"
35-
"sigs.k8s.io/gwctl/pkg/extension"
36-
"sigs.k8s.io/gwctl/pkg/extension/directlyattachedpolicy"
37-
"sigs.k8s.io/gwctl/pkg/extension/gatewayeffectivepolicy"
38-
"sigs.k8s.io/gwctl/pkg/extension/notfoundrefvalidator"
39-
"sigs.k8s.io/gwctl/pkg/extension/refgrantvalidator"
40-
extensionutils "sigs.k8s.io/gwctl/pkg/extension/utils"
41-
"sigs.k8s.io/gwctl/pkg/policymanager"
42-
"sigs.k8s.io/gwctl/pkg/topology"
43-
topologygw "sigs.k8s.io/gwctl/pkg/topology/gateway"
34+
"github.com/flomesh-io/gwctl/pkg/common"
35+
"github.com/flomesh-io/gwctl/pkg/extension"
36+
"github.com/flomesh-io/gwctl/pkg/extension/directlyattachedpolicy"
37+
"github.com/flomesh-io/gwctl/pkg/extension/gatewayeffectivepolicy"
38+
"github.com/flomesh-io/gwctl/pkg/extension/notfoundrefvalidator"
39+
"github.com/flomesh-io/gwctl/pkg/extension/refgrantvalidator"
40+
extensionutils "github.com/flomesh-io/gwctl/pkg/extension/utils"
41+
"github.com/flomesh-io/gwctl/pkg/policymanager"
42+
"github.com/flomesh-io/gwctl/pkg/topology"
43+
topologygw "github.com/flomesh-io/gwctl/pkg/topology/gateway"
4444
)
4545

4646
func NewCmd(factory common.Factory, iostreams genericiooptions.IOStreams) *cobra.Command {

‎cmd/apply/apply.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"k8s.io/cli-runtime/pkg/resource"
3131
"k8s.io/utils/ptr"
3232

33-
"sigs.k8s.io/gwctl/pkg/common"
33+
"github.com/flomesh-io/gwctl/pkg/common"
3434
)
3535

3636
const (

‎cmd/delete/delete.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"k8s.io/cli-runtime/pkg/resource"
2828
"k8s.io/utils/ptr"
2929

30-
"sigs.k8s.io/gwctl/pkg/common"
30+
"github.com/flomesh-io/gwctl/pkg/common"
3131
)
3232

3333
func NewCmd(factory common.Factory, iostreams genericiooptions.IOStreams) *cobra.Command {

‎cmd/get/get.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ import (
2828
"k8s.io/cli-runtime/pkg/genericiooptions"
2929
"k8s.io/utils/clock"
3030

31-
"sigs.k8s.io/gwctl/pkg/common"
32-
"sigs.k8s.io/gwctl/pkg/extension"
33-
"sigs.k8s.io/gwctl/pkg/extension/directlyattachedpolicy"
34-
"sigs.k8s.io/gwctl/pkg/extension/gatewayeffectivepolicy"
35-
"sigs.k8s.io/gwctl/pkg/extension/notfoundrefvalidator"
36-
"sigs.k8s.io/gwctl/pkg/extension/refgrantvalidator"
37-
gwctlflags "sigs.k8s.io/gwctl/pkg/flags"
38-
"sigs.k8s.io/gwctl/pkg/policymanager"
39-
"sigs.k8s.io/gwctl/pkg/printer"
40-
"sigs.k8s.io/gwctl/pkg/topology"
41-
topologygw "sigs.k8s.io/gwctl/pkg/topology/gateway"
31+
"github.com/flomesh-io/gwctl/pkg/common"
32+
"github.com/flomesh-io/gwctl/pkg/extension"
33+
"github.com/flomesh-io/gwctl/pkg/extension/directlyattachedpolicy"
34+
"github.com/flomesh-io/gwctl/pkg/extension/gatewayeffectivepolicy"
35+
"github.com/flomesh-io/gwctl/pkg/extension/notfoundrefvalidator"
36+
"github.com/flomesh-io/gwctl/pkg/extension/refgrantvalidator"
37+
gwctlflags "github.com/flomesh-io/gwctl/pkg/flags"
38+
"github.com/flomesh-io/gwctl/pkg/policymanager"
39+
"github.com/flomesh-io/gwctl/pkg/printer"
40+
"github.com/flomesh-io/gwctl/pkg/topology"
41+
topologygw "github.com/flomesh-io/gwctl/pkg/topology/gateway"
4242
)
4343

4444
func NewCmd(factory common.Factory, iostreams genericiooptions.IOStreams, isDescribe bool) *cobra.Command {

‎cmd/root.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ import (
2626
"k8s.io/cli-runtime/pkg/genericiooptions"
2727
"k8s.io/klog/v2"
2828

29-
cmdanalyze "sigs.k8s.io/gwctl/cmd/analyze"
30-
cmdapply "sigs.k8s.io/gwctl/cmd/apply"
31-
cmddelete "sigs.k8s.io/gwctl/cmd/delete"
32-
cmdget "sigs.k8s.io/gwctl/cmd/get"
33-
"sigs.k8s.io/gwctl/pkg/common"
34-
"sigs.k8s.io/gwctl/pkg/version"
29+
cmdanalyze "github.com/flomesh-io/gwctl/cmd/analyze"
30+
cmdapply "github.com/flomesh-io/gwctl/cmd/apply"
31+
cmddelete "github.com/flomesh-io/gwctl/cmd/delete"
32+
cmdget "github.com/flomesh-io/gwctl/cmd/get"
33+
"github.com/flomesh-io/gwctl/pkg/common"
34+
"github.com/flomesh-io/gwctl/pkg/version"
3535
)
3636

3737
func newRootCmd() *cobra.Command {

‎go.mod‎

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
1-
module sigs.k8s.io/gwctl
1+
module github.com/flomesh-io/gwctl
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.25
64

75
require (
86
github.com/evanphx/json-patch v5.9.11+incompatible
97
github.com/goccy/go-graphviz v0.2.9
108
github.com/google/go-cmp v0.7.0
11-
github.com/spf13/cobra v1.9.1
12-
github.com/spf13/pflag v1.0.7
13-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
14-
k8s.io/api v0.33.2
15-
k8s.io/apiextensions-apiserver v0.33.2
16-
k8s.io/apimachinery v0.33.2
17-
k8s.io/cli-runtime v0.33.2
18-
k8s.io/client-go v0.33.2
9+
github.com/spf13/cobra v1.10.1
10+
github.com/spf13/pflag v1.0.10
11+
golang.org/x/exp v0.0.0-20251002181428-27f1f14c8bb9
12+
k8s.io/api v0.34.1
13+
k8s.io/apiextensions-apiserver v0.34.1
14+
k8s.io/apimachinery v0.34.1
15+
k8s.io/cli-runtime v0.34.1
16+
k8s.io/client-go v0.34.1
1917
k8s.io/klog/v2 v2.130.1
20-
k8s.io/kubectl v0.33.2
21-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
22-
sigs.k8s.io/controller-runtime v0.21.0
23-
sigs.k8s.io/gateway-api v1.3.0
24-
sigs.k8s.io/yaml v1.5.0
18+
k8s.io/kubectl v0.34.1
19+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
20+
sigs.k8s.io/controller-runtime v0.22.1
21+
sigs.k8s.io/gateway-api v1.4.0
22+
sigs.k8s.io/yaml v1.6.0
2523
)
2624

2725
require (
@@ -31,65 +29,63 @@ require (
3129
github.com/chai2010/gettext-go v1.0.2 // indirect
3230
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3331
github.com/disintegration/imaging v1.6.2 // indirect
34-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
32+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3533
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3634
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
3735
github.com/flopp/go-findfont v0.1.0 // indirect
3836
github.com/fogleman/gg v1.3.0 // indirect
39-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
37+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4038
github.com/go-errors/errors v1.4.2 // indirect
41-
github.com/go-logr/logr v1.4.2 // indirect
42-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
39+
github.com/go-logr/logr v1.4.3 // indirect
40+
github.com/go-openapi/jsonpointer v0.21.2 // indirect
4341
github.com/go-openapi/jsonreference v0.21.0 // indirect
44-
github.com/go-openapi/swag v0.23.0 // indirect
42+
github.com/go-openapi/swag v0.23.1 // indirect
4543
github.com/gogo/protobuf v1.3.2 // indirect
4644
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
4745
github.com/google/btree v1.1.3 // indirect
48-
github.com/google/gnostic-models v0.6.9 // indirect
49-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
46+
github.com/google/gnostic-models v0.7.0 // indirect
5047
github.com/google/uuid v1.6.0 // indirect
5148
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5249
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
5350
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5451
github.com/josharian/intern v1.0.0 // indirect
5552
github.com/json-iterator/go v1.1.12 // indirect
5653
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
57-
github.com/mailru/easyjson v0.7.7 // indirect
54+
github.com/mailru/easyjson v0.9.0 // indirect
5855
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
5956
github.com/moby/spdystream v0.5.0 // indirect
6057
github.com/moby/term v0.5.0 // indirect
6158
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
62-
github.com/modern-go/reflect2 v1.0.2 // indirect
59+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6360
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6461
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6562
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6663
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
67-
github.com/pkg/errors v0.9.1 // indirect
6864
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6965
github.com/russross/blackfriday/v2 v2.1.0 // indirect
70-
github.com/stretchr/testify v1.10.0 // indirect
66+
github.com/stretchr/testify v1.11.0 // indirect
7167
github.com/tetratelabs/wazero v1.8.1 // indirect
7268
github.com/x448/float16 v0.8.4 // indirect
7369
github.com/xlab/treeprint v1.2.0 // indirect
7470
go.yaml.in/yaml/v2 v2.4.2 // indirect
75-
go.yaml.in/yaml/v3 v3.0.3 // indirect
71+
go.yaml.in/yaml/v3 v3.0.4 // indirect
7672
golang.org/x/image v0.21.0 // indirect
77-
golang.org/x/net v0.39.0 // indirect
78-
golang.org/x/oauth2 v0.27.0 // indirect
79-
golang.org/x/sync v0.13.0 // indirect
80-
golang.org/x/sys v0.32.0 // indirect
81-
golang.org/x/term v0.31.0 // indirect
82-
golang.org/x/text v0.24.0 // indirect
83-
golang.org/x/time v0.9.0 // indirect
84-
google.golang.org/protobuf v1.36.6 // indirect
85-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
73+
golang.org/x/net v0.43.0 // indirect
74+
golang.org/x/oauth2 v0.30.0 // indirect
75+
golang.org/x/sync v0.17.0 // indirect
76+
golang.org/x/sys v0.35.0 // indirect
77+
golang.org/x/term v0.34.0 // indirect
78+
golang.org/x/text v0.28.0 // indirect
79+
golang.org/x/time v0.12.0 // indirect
80+
google.golang.org/protobuf v1.36.8 // indirect
81+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
8682
gopkg.in/inf.v0 v0.9.1 // indirect
8783
gopkg.in/yaml.v3 v3.0.1 // indirect
88-
k8s.io/component-base v0.33.2 // indirect
89-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
90-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
91-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
92-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
84+
k8s.io/component-base v0.34.1 // indirect
85+
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
86+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
87+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
88+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
9389
sigs.k8s.io/randfill v1.0.0 // indirect
94-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
90+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
9591
)

0 commit comments

Comments
 (0)