[WIP] v1alpha2 conversion tool by ijsnellf · Pull Request #3822 · istio/istio

ijsnellf · 2018-02-27T22:53:54Z

Converts multiple v1alpha1 configs into equivalent v1alpha2 configs.

edit:
From the command summary:

Converts sets of v1alpha1 configs to v1alpha2 equivalents on a best effort basis. The output should be considered a starting point for your v1alpha2 configs and probably require some minor modification. Warnings will (hopefully) be generated where configs cannot be converted perfectly, or in certain edge cases. The input must be the set of configs that would be in place in an environment at a given time. This allows the command to attempt to create and merge output configs intelligently.

…ion-tool

ijsnellf · 2018-02-27T22:54:19Z

#3621

istio-merge-robot · 2018-02-27T22:54:36Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
We suggest the following additional approver: gnirodi

Assign the PR to them by writing /assign @gnirodi in a comment when ready.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these OWNERS Files:

pilot/OWNERS

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

ijsnellf · 2018-02-27T23:00:51Z

Potential things to expand on:

Convert k8s ingress into gateways.
Automatically create destination rules for route rule if there is not an existing destination policy.

ijsnellf · 2018-02-27T23:05:32Z

@ZackButcher: I'd appreciate a quick scan if you have the time

rshriram · 2018-02-28T19:59:04Z

@ijsnellf can you expand on the description please? This is actually pretty cool.
cc @louiscryan - this is the tool I was talking about.

codecov · 2018-02-28T21:57:46Z

Codecov Report

Merging #3822 into master will decrease coverage by 1%.
The diff coverage is 44%.

@@           Coverage Diff           @@
##           master   #3822    +/-   ##
=======================================
- Coverage      76%     76%   -<1%     
=======================================
  Files         291     295     +4     
  Lines       26939   27419   +480     
=======================================
+ Hits        20426   20630   +204     
- Misses       5205    5440   +235     
- Partials     1308    1349    +41

Impacted Files	Coverage Δ
pilot/cmd/istioctl/convert/egress.go	`17% <17%> (ø)`
pilot/cmd/istioctl/convert/cmd.go	`36% <36%> (ø)`
pilot/cmd/istioctl/convert/routes.go	`69% <69%> (ø)`
pilot/cmd/istioctl/convert/destination.go	`8% <8%> (ø)`
pilot/pkg/serviceregistry/kube/queue.go	`86% <0%> (-3%)`	⬇️
mixer/adapter/opa/opa.go	`79% <0%> (-3%)`	⬇️
mixer/adapter/prometheus/server.go	`95% <0%> (-1%)`	⬇️
mixer/adapter/rbac/rbacStore.go	`83% <0%> (-1%)`	⬇️
pilot/pkg/proxy/envoy/v2/mesh.go	`75% <0%> (ø)`	⬇️
mixer/adapter/list/list.go	`95% <0%> (ø)`	⬇️
... and 14 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6d53121...3c0f376. Read the comment docs.

ijsnellf · 2018-02-28T22:01:44Z

@rshriram: I added a description. Please let me know if it makes sense.

istio-testing · 2018-02-28T22:42:43Z

@ijsnellf: The following test failed, say /retest to rerun them all:

Test name	Commit	Details	Rerun command
prow/e2e-simpleTests.sh	`3c0f376`	link	`/test e2e-simple`

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

istio-merge-robot · 2018-03-01T08:03:09Z

@ijsnellf PR needs rebase

ZackButcher

Very cool, and exciting to have this tooling before we adopt the new APIs!

ZackButcher · 2018-03-02T04:19:26Z

pilot/cmd/istioctl/convert/destination.go

+		out = append(out, model.Config{
+			ConfigMeta: model.ConfigMeta{
+				Type:            model.V1alpha2RouteRule.Type,
+				Name:            "FIXME",


host, since we're aggregating by host

ZackButcher · 2018-03-02T04:23:15Z

pilot/cmd/istioctl/convert/destination.go

+				Type:            model.V1alpha2RouteRule.Type,
+				Name:            "FIXME",
+				Namespace:       "FIXME",
+				Domain:          "FIXME",


I think to be correct we'd have to create a route rule per (host, namespace, domain), instead of just host. However, given the nature of the tool, I think it'd also be fair to just pick the namespace + domain of one of the source DestinationPolicies (e.g. the first we touch for that host) and print a warning to STDERR saying it merged rules across namespaces and advising to only process files with objects belonging to a single namespace at a time.

That's a good suggestion, thanks

GregHanson · 2018-03-02T14:46:34Z

pilot/cmd/istioctl/convert/cmd.go

+func convertConfigs(readers []io.Reader, writer io.Writer) error {
+	configDescriptor := model.ConfigDescriptor{
+		model.RouteRule,
+		model.V1alpha2RouteRule,


update for VirtualService rename

GregHanson · 2018-03-02T14:48:08Z

pilot/cmd/istioctl/convert/cmd.go

+func Command() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "convert",
+		Short: "Convert configs from v1alpha1 to v1alpha2",


"Convert configs from v1alpha1 to v1alpha2" -> "Convert configs from v1alpha1 to v1alpha3"

GregHanson · 2018-03-02T14:48:37Z

pilot/cmd/istioctl/convert/cmd.go

+	cmd := &cobra.Command{
+		Use:   "convert",
+		Short: "Convert configs from v1alpha1 to v1alpha2",
+		Long: "Converts sets of v1alpha1 configs to v1alpha2 equivalents on a best effort basis. " +


GregHanson · 2018-03-02T14:49:09Z

pilot/cmd/istioctl/convert/cmd.go

+		Use:   "convert",
+		Short: "Convert configs from v1alpha1 to v1alpha2",
+		Long: "Converts sets of v1alpha1 configs to v1alpha2 equivalents on a best effort basis. " +
+			"The output should be considered a starting point for your v1alpha2 configs and probably " +


GregHanson · 2018-03-02T14:57:05Z

pilot/cmd/istioctl/convert/cmd.go

+		case model.RouteRule.Type:
+			err = model.ValidateRouteRule(config.Spec)
+		case model.V1alpha2RouteRule.Type:
+			err = model.ValidateRouteRuleV2(config.Spec)


VirtualService name change

GregHanson · 2018-03-02T15:16:39Z

pilot/cmd/istioctl/convert/routes.go

+	"github.com/golang/protobuf/ptypes/duration"
+
+	routing "istio.io/api/routing/v1alpha1"
+	routingv2 "istio.io/api/routing/v1alpha2"


import rename

GregHanson · 2018-03-02T16:57:02Z

pilot/cmd/istioctl/convert/testdata/v1alpha2/rule-content-route.yaml.golden

@@ -0,0 +1,24 @@
+apiVersion: config.istio.io/v1alpha2
+kind: V1alpha2RouteRule


VirtualService

GregHanson · 2018-03-02T16:57:11Z

pilot/cmd/istioctl/convert/testdata/v1alpha2/rule-default-route-append-headers.yaml.golden

@@ -0,0 +1,18 @@
+apiVersion: config.istio.io/v1alpha2
+kind: V1alpha2RouteRule


VirtualService

GregHanson · 2018-03-02T16:57:23Z

pilot/cmd/istioctl/convert/testdata/v1alpha2/rule-default-route-cors-policy.yaml.golden

@@ -0,0 +1,29 @@
+apiVersion: config.istio.io/v1alpha2
+kind: V1alpha2RouteRule


VirtualService

GregHanson · 2018-03-02T16:57:34Z

pilot/cmd/istioctl/convert/testdata/v1alpha2/rule-default-route-mirrored.yaml.golden

@@ -0,0 +1,14 @@
+apiVersion: config.istio.io/v1alpha2
+kind: V1alpha2RouteRule


VirtualService

ijsnellf · 2018-03-05T20:25:49Z

pilot/cmd/istioctl/convert/cmd.go

+			readers := make([]io.Reader, 0)
+			for _, filename := range inFilenames {
+				if filename == "-" {
+					readers = append(readers, os.Stdin)


TODO: set readers and break here

ijsnellf · 2018-03-16T15:50:32Z

Closing in favor of #4308

Isaiah Snell-Feikema added 3 commits February 27, 2018 16:26

dirty poc

c39c635

Merge branch 'master' of github.com:istio/istio into v1alpha2-convers…

384ae9e

…ion-tool

cleanup

5010b10

ijsnellf requested a review from a team February 27, 2018 22:53

googlebot added the cla: yes label Feb 27, 2018

add help text

563cc7b

add tests

593b2a0

add copyright

52b5420

lint fixes

3c0f376

istio-merge-robot added the needs-rebase Indicates a PR needs to be rebased before being merged label Mar 1, 2018

ZackButcher reviewed Mar 2, 2018

View reviewed changes

GregHanson reviewed Mar 2, 2018

View reviewed changes

ijsnellf commented Mar 5, 2018

View reviewed changes

ijsnellf closed this Mar 16, 2018

		@@ -0,0 +1,24 @@
		apiVersion: config.istio.io/v1alpha2
		kind: V1alpha2RouteRule

		@@ -0,0 +1,18 @@
		apiVersion: config.istio.io/v1alpha2
		kind: V1alpha2RouteRule

		@@ -0,0 +1,29 @@
		apiVersion: config.istio.io/v1alpha2
		kind: V1alpha2RouteRule

		@@ -0,0 +1,14 @@
		apiVersion: config.istio.io/v1alpha2
		kind: V1alpha2RouteRule

Conversation

ijsnellf commented Feb 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ijsnellf commented Feb 27, 2018

Uh oh!

istio-merge-robot commented Feb 27, 2018

Uh oh!

ijsnellf commented Feb 27, 2018

Uh oh!

ijsnellf commented Feb 27, 2018

Uh oh!

rshriram commented Feb 28, 2018

Uh oh!

codecov bot commented Feb 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ijsnellf commented Feb 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-testing commented Feb 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-merge-robot commented Mar 1, 2018

Uh oh!

ZackButcher left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ijsnellf commented Mar 16, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ijsnellf commented Feb 27, 2018 •

edited

Loading

codecov bot commented Feb 28, 2018 •

edited

Loading

ijsnellf commented Feb 28, 2018 •

edited

Loading

istio-testing commented Feb 28, 2018 •

edited

Loading