update configs

istio · kyessenov · Aug 17, 2017 · Aug 17, 2017 · Aug 17, 2017 · Aug 17, 2017
commit 12b7f5303219a20dea3f8eed687453c6d832818b
diff --git a/adapter/config/crd/BUILD b/adapter/config/crd/BUILD
@@ -15,7 +15,6 @@ go_library(
         "//platform/kube:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@com_github_hashicorp_go_multierror//:go_default_library",
-        "@io_k8s_api//core/v1:go_default_library",
         "@io_k8s_apiextensions_apiserver//pkg/apis/apiextensions/v1beta1:go_default_library",
         "@io_k8s_apiextensions_apiserver//pkg/client/clientset/clientset:go_default_library",
         "@io_k8s_apimachinery//pkg/api/errors:go_default_library",

diff --git a/cmd/istioctl/BUILD b/cmd/istioctl/BUILD
@@ -17,7 +17,6 @@ go_library(
         "//platform/kube/inject:go_default_library",
         "//tools/version:go_default_library",
         "@com_github_ghodss_yaml//:go_default_library",
-        "@com_github_gogo_protobuf//proto:go_default_library",
         "@com_github_golang_glog//:go_default_library",
         "@com_github_googleapis_googleapis//:go_default_library",
         "@com_github_hashicorp_go_multierror//:go_default_library",

diff --git a/cmd/istioctl/main.go b/cmd/istioctl/main.go
@@ -95,6 +95,9 @@ istioctl mixer command documentation.
 				return errors.New("nothing to create")
 			}
 			for _, config := range varr {
+				if config.Namespace == "" {
+					config.Namespace = namespace
+				}
 				rev, err := configClient.Create(config)
 				if err != nil {
 					return err
@@ -125,6 +128,9 @@ istioctl mixer command documentation.
 				return errors.New("nothing to replace")
 			}
 			for _, config := range varr {
+				if config.Namespace == "" {
+					config.Namespace = namespace
+				}
 				// fill up revision
 				if config.ResourceVersion == "" {
 					current, exists := configClient.Get(config.Type, config.Name, config.Namespace)
@@ -360,15 +366,15 @@ func readInputs() ([]model.Config, error) {
 // Print a simple list of names
 func printShortOutput(configList []model.Config) {
 	for _, c := range configList {
-		fmt.Printf("%v\n", c.Key)
+		fmt.Printf("%v\n", c.Key())
 	}
 }
 
 // Print as YAML
 func printYamlOutput(configList []model.Config) {
 	for _, c := range configList {
 		yaml, _ := configClient.ConfigDescriptor().ToYAML(c)
-		fmt.Println(yaml)
+		fmt.Print(yaml)
 		fmt.Println("---")
 	}
 }
diff --git a/model/validation.go b/model/validation.go
@@ -647,12 +647,6 @@ func ValidateRouteRule(msg proto.Message) error {
 	}
 
 	var errs error
-	if value.Name == "" {
-		errs = multierror.Append(errs, fmt.Errorf("route rule must have a name"))
-	}
-	if !IsDNS1123Label(value.Name) {
-		errs = multierror.Append(errs, fmt.Errorf("route rule name must be a host name label"))
-	}
 	if value.Destination == "" {
 		errs = multierror.Append(errs, fmt.Errorf("route rule must have a destination service"))
 	}

diff --git a/proxy/envoy/BUILD b/proxy/envoy/BUILD
@@ -53,7 +53,7 @@ go_test(
         "//test/util:go_default_library",
         "@com_github_davecgh_go_spew//spew:go_default_library",
         "@com_github_emicklei_go_restful//:go_default_library",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_ghodss_yaml//:go_default_library",
         "@com_github_golang_protobuf//ptypes:go_default_library",
         "@io_istio_api//:go_default_library",
     ],

diff --git a/proxy/envoy/config_test.go b/proxy/envoy/config_test.go
@@ -15,14 +15,14 @@
 package envoy
 
 import (
-	"fmt"
 	"io/ioutil"
 	"reflect"
 	"sort"
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/proto"
+	"github.com/ghodss/yaml"
+
 	"github.com/golang/protobuf/ptypes"
 
 	proxyconfig "istio.io/api/proxy/v1/config"
@@ -229,76 +229,24 @@ const (
 	rewriteRouteRule  = "testdata/rewrite-route.yaml.golden"
 )
 
-func configObjectFromYAML(kind, file string) (proto.Message, error) {
-	schema, ok := model.IstioConfigTypes.GetByType(kind)
-	if !ok {
-		return nil, fmt.Errorf("Missing kind %q", kind)
-	}
+func addConfig(r model.ConfigStore, file string, t *testing.T) {
 	content, err := ioutil.ReadFile(file)
 	if err != nil {
-		return nil, err
-	}
-	return schema.FromYAML(string(content))
-}
-
-func addCircuitBreaker(r model.ConfigStore, t *testing.T) {
-	msg, err := configObjectFromYAML(model.DestinationPolicy.Type, cbPolicy)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = r.Create(msg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func addRewrite(r model.ConfigStore, t *testing.T) {
-	msg, err := configObjectFromYAML(model.RouteRule.Type, rewriteRouteRule)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = r.Create(msg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func addRedirect(r model.ConfigStore, t *testing.T) {
-	msg, err := configObjectFromYAML(model.RouteRule.Type, redirectRouteRule)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = r.Create(msg); err != nil {
 		t.Fatal(err)
 	}
-}
-
-func addTimeout(r model.ConfigStore, t *testing.T) {
-	msg, err := configObjectFromYAML(model.RouteRule.Type, timeoutRouteRule)
+	out := model.JSONConfig{}
+	err = yaml.Unmarshal(content, &out)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = r.Create(msg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func addWeightedRoute(r model.ConfigStore, t *testing.T) {
-	msg, err := configObjectFromYAML(model.RouteRule.Type, weightedRouteRule)
+	config, err := model.IstioConfigTypes.FromJSON(out)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = r.Create(msg); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func addFaultRoute(r model.ConfigStore, t *testing.T) {
-	msg, err := configObjectFromYAML(model.RouteRule.Type, faultRouteRule)
+	_, err = r.Create(*config)
 	if err != nil {
 		t.Fatal(err)
 	}
-	if _, err = r.Create(msg); err != nil {
-		t.Fatal(err)
-	}
 }
 
 func makeMeshConfig() proxyconfig.ProxyMeshConfig {

diff --git a/proxy/envoy/discovery_test.go b/proxy/envoy/discovery_test.go
@@ -158,7 +158,7 @@ func TestClusterDiscovery(t *testing.T) {
 func TestClusterDiscoveryCircuitBreaker(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
-	addCircuitBreaker(registry, t)
+	addConfig(registry, cbPolicy, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 	url := fmt.Sprintf("/v1/clusters/%s/%s", ds.Mesh.IstioServiceCluster, mock.ProxyV0.ServiceNode())
 	response := makeDiscoveryRequest(ds, "GET", url, t)
@@ -230,7 +230,7 @@ func TestRouteDiscoveryV1(t *testing.T) {
 func TestRouteDiscoveryTimeout(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
-	addTimeout(registry, t)
+	addConfig(registry, timeoutRouteRule, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 	url := fmt.Sprintf("/v1/routes/80/%s/%s", ds.Mesh.IstioServiceCluster, mock.ProxyV0.ServiceNode())
 	response := makeDiscoveryRequest(ds, "GET", url, t)
@@ -240,7 +240,7 @@ func TestRouteDiscoveryTimeout(t *testing.T) {
 func TestRouteDiscoveryWeighted(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
-	addWeightedRoute(registry, t)
+	addConfig(registry, weightedRouteRule, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 	url := fmt.Sprintf("/v1/routes/80/%s/%s", ds.Mesh.IstioServiceCluster, mock.ProxyV0.ServiceNode())
 	response := makeDiscoveryRequest(ds, "GET", url, t)
@@ -250,7 +250,7 @@ func TestRouteDiscoveryWeighted(t *testing.T) {
 func TestRouteDiscoveryFault(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
-	addFaultRoute(registry, t)
+	addConfig(registry, faultRouteRule, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 
 	// fault rule is source based: we check that the rule only affect v0 and not v1
@@ -266,7 +266,7 @@ func TestRouteDiscoveryFault(t *testing.T) {
 func TestRouteDiscoveryRedirect(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
-	addRedirect(registry, t)
+	addConfig(registry, redirectRouteRule, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 
 	// fault rule is source based: we check that the rule only affect v0 and not v1
@@ -278,7 +278,7 @@ func TestRouteDiscoveryRedirect(t *testing.T) {
 func TestRouteDiscoveryRewrite(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
-	addRewrite(registry, t)
+	addConfig(registry, rewriteRouteRule, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 
 	// fault rule is source based: we check that the rule only affect v0 and not v1
@@ -306,7 +306,7 @@ func TestRouteDiscoveryIngressWeighted(t *testing.T) {
 	mesh := makeMeshConfig()
 	registry := memory.Make(model.IstioConfigTypes)
 	addIngressRoutes(registry, t)
-	addWeightedRoute(registry, t)
+	addConfig(registry, weightedRouteRule, t)
 	ds := makeDiscoveryService(t, registry, &mesh)
 
 	url := fmt.Sprintf("/v1/routes/80/%s/%s", ds.Mesh.IstioServiceCluster, mock.Ingress.ServiceNode())
@@ -333,33 +333,27 @@ func TestSidecarListenerDiscovery(t *testing.T) {
 		/* these configs do not affect listeners
 		{
 			name: "cb",
-			typ:  model.DestinationPolicy,
 			file: cbPolicy,
 		},
 		{
 			name: "redirect",
-			typ:  model.RouteRule,
 			file: redirectRouteRule,
 		},
 		{
 			name: "rewrite",
-			typ:  model.RouteRule,
 			file: rewriteRouteRule,
 		},
 		{
 			name: "timeout",
-			typ:  model.RouteRule,
 			file: timeoutRouteRule,
 		},
 		*/
 		{
 			name: "weighted",
-			typ:  model.RouteRule.Type,
 			file: weightedRouteRule,
 		},
 		{
 			name: "fault",
-			typ:  model.RouteRule.Type,
 			file: faultRouteRule,
 		},
 	}
@@ -368,14 +362,8 @@ func TestSidecarListenerDiscovery(t *testing.T) {
 		t.Run(testCase.name, func(t *testing.T) {
 			registry := memory.Make(model.IstioConfigTypes)
 
-			if testCase.typ != "" {
-				msg, err := configObjectFromYAML(testCase.typ, testCase.file)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if _, err = registry.Create(msg); err != nil {
-					t.Fatal(err)
-				}
+			if testCase.file != "" {
+				addConfig(registry, testCase.file, t)
 			}
 
 			// test with no auth

diff --git a/proxy/envoy/ingress_test.go b/proxy/envoy/ingress_test.go
@@ -15,15 +15,8 @@ const (
 )
 
 func addIngressRoutes(r model.ConfigStore, t *testing.T) {
-	for _, file := range []string{ingressRouteRule1, ingressRouteRule2} {
-		msg, err := configObjectFromYAML(model.IngressRule.Type, file)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err = r.Create(msg); err != nil {
-			t.Fatal(err)
-		}
-	}
+	addConfig(r, ingressRouteRule1, t)
+	addConfig(r, ingressRouteRule2, t)
 }
 
 func TestRouteCombination(t *testing.T) {

diff --git a/proxy/envoy/testdata/cb-policy.yaml.golden b/proxy/envoy/testdata/cb-policy.yaml.golden
@@ -1,12 +1,16 @@
-destination: world.default.svc.cluster.local
-policy:
-- circuit_breaker:
-    simple_cb:
-      max_connections: 100
-      sleep_window: 15.5s
-      http_max_requests: 100
-      http_max_requests_per_connection: 100
-      http_max_pending_requests: 100
-      http_consecutive_errors: 10
-      http_detection_interval: 30s
-      http_max_ejection_percent: 100
+type: destination-policy
+name: world
+namespace: default
+spec:
+  destination: world.default.svc.cluster.local
+  policy:
+  - circuit_breaker:
+      simple_cb:
+        max_connections: 100
+        sleep_window: 15.5s
+        http_max_requests: 100
+        http_max_requests_per_connection: 100
+        http_max_pending_requests: 100
+        http_consecutive_errors: 10
+        http_detection_interval: 30s
+        http_max_ejection_percent: 100
diff --git a/proxy/envoy/testdata/fault-route.yaml.golden b/proxy/envoy/testdata/fault-route.yaml.golden
@@ -1,23 +1,25 @@
-destination: world.default.svc.cluster.local
+type: route-rule
 name: fault-route
-match:
-  source: hello.default.svc.cluster.local
-  source_tags:
-    version: v0
-  httpHeaders:
-    scooby:
-      exact: doo
-    animal:
-      prefix: dog.cat
-    name:
-      regex: "sco+do+"
-route:
-  - tags:
-       version: v1
-http_fault:
-  delay:
-    percent: 100
-    fixed_delay: 5s
-  abort:
-    percent: 100
-    http_status: 503
+spec:
+  destination: world.default.svc.cluster.local
+  match:
+    source: hello.default.svc.cluster.local
+    source_tags:
+      version: v0
+    httpHeaders:
+      scooby:
+        exact: doo
+      animal:
+        prefix: dog.cat
+      name:
+        regex: "sco+do+"
+  route:
+    - tags:
+         version: v1
+  http_fault:
+    delay:
+      percent: 100
+      fixed_delay: 5s
+    abort:
+      percent: 100
+      http_status: 503