Skip to content

Commit

Permalink
Merge branch 'master' into feat/serviceMap
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Aug 24, 2021
2 parents 60ca5c7 + 3665e51 commit 5d32a44
Show file tree
Hide file tree
Showing 126 changed files with 3,355 additions and 4,255 deletions.
4 changes: 4 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ linters-settings:
alias: mesh_proto
- pkg: github.com/kumahq/kuma/pkg/util/proto
alias: util_proto
misspell:
locale: US
ignore-words:
- cancelled # US English should be "canceled", but this is in the Retry API, so we can't change it.

issues:
fix: true
Expand Down
5 changes: 1 addition & 4 deletions api/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,17 +163,14 @@ clean: ## Remove generated files
find . -name '*.pb.go' -delete
find . -name '*.pb.validate.go' -delete

generate: clean protoc/mesh protoc/mesh/v1alpha1 protoc/observability/v1alpha1 protoc/observability/v1 protoc/system/v1alpha1 ## Process .proto definitions
generate: clean protoc/mesh protoc/mesh/v1alpha1 protoc/observability/v1 protoc/system/v1alpha1 ## Process .proto definitions

protoc/mesh:
$(PROTOC_GO) mesh/*.proto

protoc/mesh/v1alpha1:
$(PROTOC_GO) mesh/v1alpha1/*.proto

protoc/observability/v1alpha1:
$(PROTOC_GO) observability/v1alpha1/*.proto

protoc/observability/v1:
$(PROTOC_GO) observability/v1/*.proto

Expand Down
245 changes: 123 additions & 122 deletions api/mesh/v1alpha1/circuit_breaker.pb.go

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions api/mesh/v1alpha1/circuit_breaker.proto
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ message CircuitBreaker {
option (kuma.mesh.resource).ws.name = "circuit-breaker";

// List of selectors to match dataplanes that are sources of traffic.
repeated Selector sources = 1;
repeated Selector sources = 1 [ (doc.required) = true ];

// List of selectors to match services that are destinations of traffic.
repeated Selector destinations = 2;
repeated Selector destinations = 2 [ (doc.required) = true ];

message Conf {
// Time interval between ejection analysis sweeps
Expand Down Expand Up @@ -102,5 +102,5 @@ message CircuitBreaker {
Thresholds thresholds = 6;
}

Conf conf = 3;
Conf conf = 3 [ (doc.required) = true ];
}
23 changes: 12 additions & 11 deletions api/mesh/v1alpha1/externalservice.pb.go

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

7 changes: 4 additions & 3 deletions api/mesh/v1alpha1/externalservice.proto
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ message ExternalService {
// Networking describes the properties of the external service connectivity
message Networking {
// Address of the external service
string address = 1;
string address = 1 [ (doc.required) = true ];

// TLS
message TLS {
Expand Down Expand Up @@ -59,9 +59,10 @@ message ExternalService {
TLS tls = 2;
}

Networking networking = 1;
Networking networking = 1 [ (doc.required) = true ];

// Tags associated with the external service,
// e.g. kuma.io/service=web, kuma.io/protocol, version=1.0.
map<string, string> tags = 2 [ (validate.rules).map.min_pairs = 1 ];
map<string, string> tags = 2
[ (validate.rules).map.min_pairs = 1, (doc.required) = true ];
}
127 changes: 65 additions & 62 deletions api/mesh/v1alpha1/fault_injection.pb.go

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

Loading

0 comments on commit 5d32a44

Please sign in to comment.