Skip to content

Commit

Permalink
feat(kuma-cp) introduce Health Discovery Service (HDS) (#1418)
Browse files Browse the repository at this point in the history
* feat(kuma-cp) initial hds support

* feat(kuma-cp) get rid of old tests

* feat(kuma-cp) authn for hds

* feat(kuma-cp) metrics for hds

* feat(kuma-cp) fix install metrics test

Signed-off-by: Ilya Lobkov <ilya.lobkov@konghq.com>
(cherry picked from commit f6636c8)

# Conflicts:
#	app/kumactl/pkg/install/k8s/control-plane/helmtemplates_vfsdata.go
#	pkg/xds/bootstrap/generator_test.go
#	pkg/xds/bootstrap/template_v3.go
#	pkg/xds/bootstrap/testdata/generator.default-config.golden.yaml
  • Loading branch information
lobkovilya authored and mergify-bot committed Jan 22, 2021
1 parent 270de3a commit 975163b
Show file tree
Hide file tree
Showing 69 changed files with 5,155 additions and 454 deletions.
366 changes: 283 additions & 83 deletions api/mesh/v1alpha1/dataplane.pb.go

Large diffs are not rendered by default.

27 changes: 26 additions & 1 deletion api/mesh/v1alpha1/dataplane.proto
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ package kuma.mesh.v1alpha1;
option go_package = "github.com/kumahq/kuma/api/mesh/v1alpha1";

import "mesh/v1alpha1/metrics.proto";

import "google/protobuf/duration.proto";
import "google/protobuf/wrappers.proto";
import "validate/validate.proto";

// Dataplane defines configuration of a side-car proxy.
Expand Down Expand Up @@ -76,6 +77,30 @@ message Dataplane {
// equal to nil we consider dataplane as healthy. Unhealthy dataplanes
// will be excluded from Endpoints Discovery Service (EDS)
Health health = 7;

// ServiceProbe defines parameters for probing service's port
message ServiceProbe {
// Interval between consecutive health checks.
google.protobuf.Duration interval = 1;

// Maximum time to wait for a health check response.
google.protobuf.Duration timeout = 2;

// Number of consecutive unhealthy checks before considering a host
// unhealthy.
google.protobuf.UInt32Value unhealthy_threshold = 3;

// Number of consecutive healthy checks before considering a host
// healthy.
google.protobuf.UInt32Value healthy_threshold = 4;

message Tcp {}
// Tcp checker tries to establish tcp connection with destination
Tcp tcp = 5;
}

// ServiceProbe defines parameters for probing service's port
ServiceProbe serviceProbe = 8;
}

// Outbound describes a service consumed by the dataplane.
Expand Down
4 changes: 2 additions & 2 deletions api/mesh/v1alpha1/traffic_route.pb.go

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

Original file line number Diff line number Diff line change
Expand Up @@ -7129,6 +7129,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "false"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: kubernetes
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6962,6 +6962,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "false"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: kubernetes
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6971,6 +6971,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "false"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: kubernetes
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6962,6 +6962,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "true"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: "kubernetes"
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down Expand Up @@ -7182,4 +7184,4 @@ webhooks:
- DELETE
resources:
- secrets
sideEffects: None
sideEffects: None
Original file line number Diff line number Diff line change
Expand Up @@ -6972,6 +6972,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "false"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: kubernetes
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6966,6 +6966,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "false"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: "kubernetes"
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6991,6 +6991,8 @@ spec:
value: "true"
- name: KUMA_DEFAULTS_SKIP_MESH_CREATION
value: "false"
- name: KUMA_DP_SERVER_HDS_ENABLED
value: "false"
- name: KUMA_ENVIRONMENT
value: kubernetes
- name: KUMA_GENERAL_TLS_CERT_FILE
Expand Down
Loading

0 comments on commit 975163b

Please sign in to comment.