feat:wasm deploy support istiodDeployName arg in command (#248)

* feat:wasm deploy support istiodDeployName arg in command

Author: tanjunchen

tools/wasme/changelog/v0.0.33/istiod-deployment-name.yaml

@@ -0,0 +1,5 @@
+changelog:
+  - type: NEW_FEATURE
+    description: >
+      Add istiod deployment name support in wasme deploy istio command
+    issueLink: https://github.com/solo-io/wasm/issues/245

tools/wasme/cli/docs/content/reference/cli/wasme_deploy_istio.md

@@ -35,6 +35,7 @@ wasme deploy istio <image> --id=<unique name> [--config=<inline string>] [--root
   -h, --help                             help for istio
       --ignore-version-check             set to disable abi version compatability check.
       --istio-namespace string           the namespace where the Istio control plane is installed (default "istio-system")
+      --istiod-name string               deployment name of the istiod (default "istiod")
   -l, --labels stringToString            labels of the deployment or daemonset into which to inject the filter. if not set, will apply to all workloads in the target namespace (default [])
   -n, --namespace string                 namespace of the workload(s) to inject the filter. (default "default")
       --patch-context string             patch context of the filter. possible values are any, inbound, outbound, gateway (default "inbound")

tools/wasme/cli/docs/content/reference/cli/wasme_undeploy_istio.md

@@ -27,6 +27,7 @@ wasme undeploy istio --id=<unique name> --namespace=<deployment namespace> [--na
   -h, --help                     help for istio
       --ignore-version-check     set to disable abi version compatability check.
       --istio-namespace string   the namespace where the Istio control plane is installed (default "istio-system")
+      --istiod-name string       deployment name of the istiod (default "istiod")
   -l, --labels stringToString    labels of the deployment or daemonset into which to inject the filter. if not set, will apply to all workloads in the target namespace (default [])
   -n, --namespace string         namespace of the workload(s) to inject the filter. (default "default")
       --patch-context string     patch context of the filter. possible values are any, inbound, outbound, gateway (default "inbound")

tools/wasme/cli/example/tinygo/go.mod

@@ -2,6 +2,4 @@ module main
 
 go 1.15
 
-require (
-	github.com/tetratelabs/proxy-wasm-go-sdk v0.0.8
-)
+require github.com/tetratelabs/proxy-wasm-go-sdk v0.0.8

tools/wasme/cli/example/tinygo/go.sum

@@ -0,0 +1,7 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tetratelabs/proxy-wasm-go-sdk v0.0.8/go.mod h1:y1ZQT4bQEBnR8Do4nSOzb3roczzPvcAp8UrF6NEYWNY=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

tools/wasme/cli/go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/gogo/protobuf v1.3.1
 	github.com/golang/mock v1.4.4
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.5.2
 	github.com/hashicorp/go-multierror v1.0.0
 	github.com/lyft/protoc-gen-star v0.4.15 // indirect
 	github.com/manifoldco/promptui v0.7.0

tools/wasme/cli/pkg/cmd/deploy/options.go

@@ -82,18 +82,20 @@ func (opts *glooOpts) addToFlags(flags *pflag.FlagSet) {
 }
 
 type istioOpts struct {
-	workload           istio.Workload
-	patchContext       string
-	istioNamespace     string
-	cacheTimeout       time.Duration
-	ignoreVersionCheck bool
+	workload             istio.Workload
+	patchContext         string
+	istioNamespace       string
+	istiodDeploymentName string
+	cacheTimeout         time.Duration
+	ignoreVersionCheck   bool
 
 	puller pull.ImagePuller // set by load
 }
 
 func (opts *istioOpts) addToFlags(flags *pflag.FlagSet) {
 	flags.StringToStringVarP(&opts.workload.Labels, "labels", "l", nil, "labels of the deployment or daemonset into which to inject the filter. if not set, will apply to all workloads in the target namespace")
 	flags.StringVarP(&opts.workload.Namespace, "namespace", "n", "default", "namespace of the workload(s) to inject the filter.")
+	flags.StringVar(&opts.istiodDeploymentName, "istiod-name", "istiod", "deployment name of the istiod")
 	flags.StringVarP(&opts.workload.Kind, "workload-type", "t", istio.WorkloadTypeDeployment, "type of workload into which the filter should be injected. possible values are "+strings.Join(SupportedWorkloadTypes, ", "))
 	flags.StringVar(&opts.patchContext, "patch-context", istio.PatchContextInbound, "patch context of the filter. possible values are "+strings.Join(istio.SupportedPatchContexts, ", "))
 	flags.StringVar(&opts.istioNamespace, "istio-namespace", "istio-system", "the namespace where the Istio control plane is installed")
@@ -216,6 +218,7 @@ func (opts *options) makeProvider(ctx context.Context) (deploy.Provider, error)
 			nil, // no parent object when using CLI
 			nil, // no callback when using CLI
 			opts.istioOpts.istioNamespace,
+			opts.istioOpts.istiodDeploymentName,
 			opts.istioOpts.cacheTimeout,
 			opts.istioOpts.ignoreVersionCheck,
 		)