Skip to content

Commit

Permalink
Update go-control-plane API and fix test fails
Browse files Browse the repository at this point in the history 
* Fixed the pilot rbac build fail due to envoyproxy/envoy#4250
* Fixed the istioctl test fail due to envoyproxy/envoy#4306
  • Loading branch information
@yangminzhu
yangminzhu committed Sep 13, 2018
1 parent 436738e commit d009ee8
Show file tree
Hide file tree
Showing 86 changed files with 1,473 additions and 2,247 deletions.
2 changes: 1 addition & 1 deletion Gopkg.lock
View file

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

38 changes: 26 additions & 12 deletions istioctl/pkg/writer/envoy/clusters/testdata/clusterfiltered.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,34 @@
"portValue": 9093
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
{
"name": "cx_connect_fail"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "UNHEALTHY"
}
Expand Down
206 changes: 138 additions & 68 deletions istioctl/pkg/writer/envoy/clusters/testdata/clusters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,34 @@
"portValue": 443
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -42,20 +56,34 @@
"portValue": 443
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -73,20 +101,34 @@
"portValue": 443
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -104,20 +146,34 @@
"portValue": 443
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
{
"name": "cx_connect_fail"
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "HEALTHY"
}
Expand All @@ -135,20 +191,34 @@
"portValue": 9093
}
},
"stats": {
"cx_active": {
"type": "GAUGE"
"stats": [
{
"type": "GAUGE",
"name": "cx_active"
},
"cx_connect_fail": {},
"cx_total": {},
"rq_active": {
"type": "GAUGE"
{
"name": "cx_connect_fail"
},
"rq_error": {},
"rq_success": {},
"rq_timeout": {},
"rq_total": {}
},
{
"name": "cx_total"
},
{
"type": "GAUGE",
"name": "rq_active"
},
{
"name": "rq_error"
},
{
"name": "rq_success"
},
{
"name": "rq_timeout"
},
{
"name": "rq_total"
}
],
"healthStatus": {
"edsHealthStatus": "UNHEALTHY"
}
Expand Down
Loading

0 comments on commit d009ee8

Please sign in to comment.