Skip to content

Commit 7b0315c

Browse files
authored
refactor(v2): upgrade module to github.com/alibaba/higress/v2 (higress-group#2922)
Signed-off-by: Xijun Dai <daixijun1990@gmail.com>
1 parent 5e98497 commit 7b0315c

235 files changed

Lines changed: 1074 additions & 1042 deletions

File tree

Some content is hidden

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

Makefile.core.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export BASE_VERSION ?= $(HIGRESS_BASE_VERSION)
1010

1111
export CHARTS ?= higress-registry.cn-hangzhou.cr.aliyuncs.com/charts
1212

13-
VERSION_PACKAGE := github.com/alibaba/higress/pkg/cmd/lversion
13+
VERSION_PACKAGE := github.com/alibaba/higress/v2/pkg/cmd/lversion
1414

1515
GIT_COMMIT:=$(shell git rev-parse HEAD)
1616

api/cue.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Cuelang configuration to generate OpenAPI schema for Higress configs.
22

3-
module: github.com/alibaba/higress/api
3+
module: github.com/alibaba/higress/v2/api
44

55
openapi:
66
selfContained: true

api/extensions/v1alpha1/wasmplugin.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import "google/protobuf/struct.proto";
2424

2525
package higress.extensions.v1alpha1;
2626

27-
option go_package="github.com/alibaba/higress/api/extensions/v1alpha1";
27+
option go_package="github.com/alibaba/higress/v2/api/extensions/v1alpha1";
2828

2929
// <!-- crd generation tags
3030
// +cue-gen:WasmPlugin:groupName:extensions.higress.io

api/gen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ buf generate \
77
--path networking \
88
--path extensions
99

10-
# Generate CRDs
10+
# Generate CRDs
1111
cue-gen -verbose -f=./cue.yaml -crd=true

api/networking/v1/http_2_rpc.proto

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright (c) 2022 Alibaba Group Holding Ltd.
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ import "google/api/field_behavior.proto";
2323

2424
package higress.networking.v1;
2525

26-
option go_package = "github.com/alibaba/higress/api/networking/v1";
26+
option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
2727

2828
// <!-- crd generation tags
2929
// +cue-gen:Http2Rpc:groupName:networking.higress.io

api/networking/v1/mcp_bridge.proto

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Copyright (c) 2022 Alibaba Group Holding Ltd.
2-
//
2+
//
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
//
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
8+
//
99
// Unless required by applicable law or agreed to in writing, software
1010
// distributed under the License is distributed on an "AS IS" BASIS,
1111
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@ import "google/protobuf/struct.proto";
2525

2626
package higress.networking.v1;
2727

28-
option go_package = "github.com/alibaba/higress/api/networking/v1";
28+
option go_package = "github.com/alibaba/higress/v2/api/networking/v1";
2929

3030
// <!-- crd generation tags
3131
// +cue-gen:McpBridge:groupName:networking.higress.io
@@ -50,7 +50,7 @@ message McpBridge {
5050
}
5151

5252
message RegistryConfig {
53-
string type = 1 [(google.api.field_behavior) = REQUIRED];
53+
string type = 1 [(google.api.field_behavior) = REQUIRED];
5454
string name = 2;
5555
string domain = 3 [(google.api.field_behavior) = REQUIRED];
5656
uint32 port = 4 [(google.api.field_behavior) = REQUIRED];

client/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ comma := ,
2929

3030
# source packages to scan for kubetype-gen tags
3131
kube_source_packages = $(subst $(space),$(empty), \
32-
github.com/alibaba/higress/api/networking/v1, \
33-
github.com/alibaba/higress/api/extensions/v1alpha1 \
32+
github.com/alibaba/higress/v2/api/networking/v1, \
33+
github.com/alibaba/higress/v2/api/extensions/v1alpha1 \
3434
)
3535

3636
# base output package for generated files
37-
kube_base_output_package = github.com/alibaba/higress/client/pkg
37+
kube_base_output_package = github.com/alibaba/higress/v2/client/pkg
3838
# base output package for kubernetes types, register, etc...
3939
kube_api_base_package = $(kube_base_output_package)/apis
4040
# source packages to scan for kubernetes generator tags, e.g. deepcopy-gen, client-gen, etc.
@@ -72,7 +72,7 @@ else
7272
endif
7373

7474
rename_generated_files=\
75-
find $(subst github.com/alibaba/higress/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
75+
find $(subst github.com/alibaba/higress/v2/client/, $(empty), $(subst $(comma), $(space), $(kube_api_packages)) $(kube_clientset_package) $(kube_listers_package) $(kube_informers_package)) \
7676
-name '*.go' -and -not -name 'doc.go' -and -not -name '*.gen.go' -type f -exec sh -c 'mv "$$1" "$${1%.go}".gen.go' - '{}' \;
7777

7878
.PHONY: generate-k8s-client

client/pkg/apis/extensions/v1alpha1/types.gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/pkg/apis/networking/v1/types.gen.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/pkg/applyconfiguration/extensions/v1alpha1/wasmplugin.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)