Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(tools): add to resource-gen.go generation of kumactl options #2469

Merged
merged 3 commits into from
Aug 5, 2021
Merged

chore(tools): add to resource-gen.go generation of kumactl options #2469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
766181e
chore(ci): Add kumactl to resource-gen.go
lahabana Aug 3, 2021
4b76fd3
Review comments
lahabana Aug 5, 2021
5e5b8ee
Merge branch 'master' of github.com:kumahq/kuma into chore/generate_k…
lahabana Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 38 additions & 43 deletions api/mesh/options.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions api/mesh/options.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ message KumaResourceOptions {
// Name and value of the modelResourceType constant.
string type = 2;

// True if this resoure has global scope. Otherwise it will be mesh scope.
// True if this resource has global scope. Otherwise it will be mesh scope.
bool global = 3;

// Name of the resource's Go package.
Expand All @@ -24,6 +24,8 @@ message KumaResourceOptions {

// Whether to skip type registration for this resource.
bool skip_registration = 6;

KumaWsOptions ws = 7;
}

message KumaWsOptions {
Expand All @@ -41,5 +43,4 @@ message KumaWsOptions {

extend google.protobuf.MessageOptions {
KumaResourceOptions resource = 43534533; // 'kuma'
KumaWsOptions ws = 43534534;
}
20 changes: 10 additions & 10 deletions api/mesh/v1alpha1/circuit_breaker.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/mesh/v1alpha1/circuit_breaker.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ message CircuitBreaker {
option (kuma.mesh.resource).name = "CircuitBreakerResource";
option (kuma.mesh.resource).type = "CircuitBreaker";
option (kuma.mesh.resource).package = "mesh";
option (kuma.mesh.ws).name = "circuit-breaker";
option (kuma.mesh.resource).ws.name = "circuit-breaker";

// List of selectors to match dataplanes that are sources of traffic.
repeated Selector sources = 1;
Expand Down
14 changes: 7 additions & 7 deletions api/mesh/v1alpha1/dataplane.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/mesh/v1alpha1/dataplane.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ message Dataplane {
option (kuma.mesh.resource).name = "DataplaneResource";
option (kuma.mesh.resource).type = "Dataplane";
option (kuma.mesh.resource).package = "mesh";
option (kuma.mesh.ws).name = "dataplane";
option (kuma.mesh.resource).ws.name = "dataplane";

// Networking describes inbound and outbound interfaces of a dataplane.
message Networking {
Expand Down
Loading