rename missed v1alpha2 references to v1alpha3 (istio#4328)

* rename missed v1alpha2 references to v1alpha3 * comment fixes * lint fixes
ddyycao · Mar 17, 2018 · 40cc353 · 40cc353
1 parent ac70fa8
commit 40cc353
Show file tree

Hide file tree

Showing 31 changed files with 100 additions and 99 deletions.
diff --git a/pilot/pkg/model/config.go b/pilot/pkg/model/config.go
@@ -340,7 +340,7 @@ var (
 		Validate:    ValidateRouteRule,
 	}
 
-	// VirtualService describes v1alpha2 route rules
+	// VirtualService describes v1alpha3 route rules
 	VirtualService = ProtoSchema{
 		Type:        "virtual-service",
 		Plural:      "virtual-services",

diff --git a/pilot/pkg/model/validation.go b/pilot/pkg/model/validation.go
@@ -1870,11 +1870,11 @@ func ValidateEndUserAuthenticationPolicySpecBinding(msg proto.Message) error {
 	return errs
 }
 
-// ValidateVirtualService checks that a v1alpha2 route rule is well-formed.
+// ValidateVirtualService checks that a v1alpha3 route rule is well-formed.
 func ValidateVirtualService(msg proto.Message) (errs error) {
 	routeRule, ok := msg.(*networking.VirtualService)
 	if !ok {
-		return errors.New("cannot cast to v1alpha2 routing rule")
+		return errors.New("cannot cast to v1alpha3 routing rule")
 	}
 
 	// TODO: routeRule.Gateways

diff --git a/pilot/pkg/proxy/envoy/v1/config.go b/pilot/pkg/proxy/envoy/v1/config.go
@@ -595,8 +595,8 @@ func buildDestinationHTTPRoutes(node model.Proxy, service *model.Service,
 		useDefaultRoute := true
 		rules := config.RouteRules(proxyInstances, service.Hostname, node.Domain)
 		// sort for output uniqueness
-		// if v1alpha2 rules are returned, len(rules) <= 1 is guaranteed
-		// because v1alpha2 rules are unique per host.
+		// if v1alpha3 rules are returned, len(rules) <= 1 is guaranteed
+		// because v1alpha3 rules are unique per host.
 		model.SortRouteRules(rules)
 
 		for _, rule := range rules {
@@ -808,8 +808,8 @@ func buildInboundListeners(mesh *meshconfig.MeshConfig, node model.Proxy,
 				rules := config.RouteRulesByDestination(proxyInstances, node.Domain)
 
 				// sort for output uniqueness
-				// if v1alpha2 rules are returned, len(rules) <= 1 is guaranteed
-				// because v1alpha2 rules are unique per host.
+				// if v1alpha3 rules are returned, len(rules) <= 1 is guaranteed
+				// because v1alpha3 rules are unique per host.
 				model.SortRouteRules(rules)
 				for _, config := range rules {
 					switch config.Spec.(type) {
@@ -830,7 +830,7 @@ func buildInboundListeners(mesh *meshconfig.MeshConfig, node model.Proxy,
 						rule := config.Spec.(*networking.VirtualService)
 
 						// if no routes are returned, it is a TCP RouteRule
-						routes := BuildInboundRoutesV2(proxyInstances, config, rule, cluster)
+						routes := BuildInboundRoutesV3(proxyInstances, config, rule, cluster)
 						for _, route := range routes {
 							// set server-side mixer filter config for inbound HTTP routes
 							// Note: websocket routes do not call the filter chain. Will be

diff --git a/pilot/pkg/proxy/envoy/v1/config_test.go b/pilot/pkg/proxy/envoy/v1/config_test.go
@@ -229,52 +229,52 @@ const (
 var (
 	destinationRuleWorld = fileConfig{
 		meta: model.ConfigMeta{Type: model.DestinationRule.Type, Name: "destination-world"},
-		file: "testdata/destination-world-v1alpha2.yaml.golden",
+		file: "testdata/destination-world-v1alpha3.yaml.golden",
 	}
 
 	destinationRuleWorldCB = fileConfig{
 		meta: model.ConfigMeta{Type: model.DestinationRule.Type, Name: "destination-world-cb"},
-		file: "testdata/destination-world-cb-v1alpha2.yaml.golden",
+		file: "testdata/destination-world-cb-v1alpha3.yaml.golden",
 	}
 
 	destinationRuleHello = fileConfig{
 		meta: model.ConfigMeta{Type: model.DestinationRule.Type, Name: "destination-hello"},
-		file: "testdata/destination-hello-v1alpha2.yaml.golden",
+		file: "testdata/destination-hello-v1alpha3.yaml.golden",
 	}
 
 	destinationRuleExternal = fileConfig{
 		meta: model.ConfigMeta{Type: model.DestinationRule.Type, Name: "destination-google"},
-		file: "testdata/subset-google-v1alpha2.yaml.golden",
+		file: "testdata/subset-google-v1alpha3.yaml.golden",
 	}
 
 	cbPolicy = fileConfig{
 		meta: model.ConfigMeta{Type: model.DestinationPolicy.Type, Name: "circuit-breaker"},
 		file: "testdata/cb-policy.yaml.golden",
 	}
 
-	cbRouteRuleV2 = fileConfig{
+	cbRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "circuit-breaker"},
-		file: "testdata/cb-route-rule-v1alpha2.yaml.golden",
+		file: "testdata/cb-route-rule-v1alpha3.yaml.golden",
 	}
 
 	timeoutRouteRule = fileConfig{
 		meta: model.ConfigMeta{Type: model.RouteRule.Type, Name: "timeout"},
 		file: "testdata/timeout-route-rule.yaml.golden",
 	}
 
-	timeoutRouteRuleV2 = fileConfig{
+	timeoutRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "timeout"},
-		file: "testdata/timeout-route-rule-v1alpha2.yaml.golden",
+		file: "testdata/timeout-route-rule-v1alpha3.yaml.golden",
 	}
 
 	weightedRouteRule = fileConfig{
 		meta: model.ConfigMeta{Type: model.RouteRule.Type, Name: "weighted"},
 		file: "testdata/weighted-route.yaml.golden",
 	}
 
-	weightedRouteRuleV2 = fileConfig{
+	weightedRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "weighted"},
-		file: "testdata/weighted-route-v1alpha2.yaml.golden",
+		file: "testdata/weighted-route-v1alpha3.yaml.golden",
 	}
 
 	gatewayWeightedRouteRule = fileConfig{
@@ -317,24 +317,24 @@ var (
 		file: "testdata/fault-route.yaml.golden",
 	}
 
-	faultRouteRuleV2 = fileConfig{
+	faultRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "fault"},
-		file: "testdata/fault-route-v1alpha2.yaml.golden",
+		file: "testdata/fault-route-v1alpha3.yaml.golden",
 	}
 
-	multiMatchFaultRouteRuleV2 = fileConfig{
+	multiMatchFaultRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "multi-match-fault"},
-		file: "testdata/multi-match-fault-v1alpha2.yaml.golden",
+		file: "testdata/multi-match-fault-v1alpha3.yaml.golden",
 	}
 
 	redirectRouteRule = fileConfig{
 		meta: model.ConfigMeta{Type: model.RouteRule.Type, Name: "redirect"},
 		file: "testdata/redirect-route.yaml.golden",
 	}
 
-	redirectRouteRuleV2 = fileConfig{
+	redirectRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "redirect"},
-		file: "testdata/redirect-route-v1alpha2.yaml.golden",
+		file: "testdata/redirect-route-v1alpha3.yaml.golden",
 	}
 
 	redirectRouteToEgressRule = fileConfig{
@@ -347,29 +347,29 @@ var (
 		file: "testdata/rewrite-route.yaml.golden",
 	}
 
-	rewriteRouteRuleV2 = fileConfig{
+	rewriteRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "rewrite"},
-		file: "testdata/rewrite-route-v1alpha2.yaml.golden",
+		file: "testdata/rewrite-route-v1alpha3.yaml.golden",
 	}
 
-	multiMatchRewriteRouteRuleV2 = fileConfig{
+	multiMatchRewriteRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "multi-match-rewrite"},
-		file: "testdata/multi-match-rewrite-route-v1alpha2.yaml.golden",
+		file: "testdata/multi-match-rewrite-route-v1alpha3.yaml.golden",
 	}
 
-	googleTimeoutRuleV2 = fileConfig{
-		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "egress-timeout"}, // FIXME: rename after switch to v1alpha2
-		file: "testdata/google-timeout-rule-v1alpha2.yaml.golden",
+	googleTimeoutRuleV3 = fileConfig{
+		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "egress-timeout"}, // FIXME: rename after switch to v1alpha3
+		file: "testdata/google-timeout-rule-v1alpha3.yaml.golden",
 	}
 
 	websocketRouteRule = fileConfig{
 		meta: model.ConfigMeta{Type: model.RouteRule.Type, Name: "websocket"},
 		file: "testdata/websocket-route.yaml.golden",
 	}
 
-	websocketRouteRuleV2 = fileConfig{
+	websocketRouteRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "websocket"},
-		file: "testdata/websocket-route-v1alpha2.yaml.golden",
+		file: "testdata/websocket-route-v1alpha3.yaml.golden",
 	}
 
 	egressRule = fileConfig{
@@ -419,7 +419,7 @@ var (
 
 	destinationRuleGoogleCB = fileConfig{
 		meta: model.ConfigMeta{Type: model.DestinationRule.Type, Name: "google"},
-		file: "testdata/subset-google-cb-v1alpha2.yaml.golden",
+		file: "testdata/subset-google-cb-v1alpha3.yaml.golden",
 	}
 
 	egressRuleCBPolicy = fileConfig{
@@ -452,29 +452,29 @@ var (
 		file: "testdata/addheaders-route.yaml.golden",
 	}
 
-	addHeaderRuleV2 = fileConfig{
+	addHeaderRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "append-headers"},
-		file: "testdata/addheaders-route-v1alpha2.yaml.golden",
+		file: "testdata/addheaders-route-v1alpha3.yaml.golden",
 	}
 
 	corsPolicyRule = fileConfig{
 		meta: model.ConfigMeta{Type: model.RouteRule.Type, Name: "cors-policy"},
 		file: "testdata/corspolicy-route.yaml.golden",
 	}
 
-	corsPolicyRuleV2 = fileConfig{
+	corsPolicyRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "cors-policy"},
-		file: "testdata/corspolicy-route-v1alpha2.yaml.golden",
+		file: "testdata/corspolicy-route-v1alpha3.yaml.golden",
 	}
 
 	mirrorRule = fileConfig{
 		meta: model.ConfigMeta{Type: model.RouteRule.Type, Name: "mirror-requests"},
 		file: "testdata/mirror-route.yaml.golden",
 	}
 
-	mirrorRuleV2 = fileConfig{
+	mirrorRuleV3 = fileConfig{
 		meta: model.ConfigMeta{Type: model.VirtualService.Type, Name: "mirror-requests"},
-		file: "testdata/mirror-route-v1alpha2.yaml.golden",
+		file: "testdata/mirror-route-v1alpha3.yaml.golden",
 	}
 
 	// mixerclient service configuration