feature(service): Implements traffic splitting and tagging targets

CHANGELOG.adoc

@@ -42,6 +42,11 @@
 | Add --revision-name flag
 | https://github.com/knative/client/pull/282[#282]
 
+| 🎁
+| Support traffic splitting and tagging targets
+| https://github.com/knative/client/pull/345[#345]
+
+
 |===
 
 ## v0.2.0 (2019-07-10)

docs/cmd/kn_service_update.md

@@ -14,14 +14,25 @@ kn service update NAME [flags]
 
 ```
 
-  # Updates a service 'mysvc' with new environment variables
-  kn service update mysvc --env KEY1=VALUE1 --env KEY2=VALUE2
+  # Updates a service 'svc' with new environment variables
+  kn service update svc --env KEY1=VALUE1 --env KEY2=VALUE2
 
-  # Update a service 'mysvc' with new port
-  kn service update mysvc --port 80
+  # Update a service 'svc' with new port
+  kn service update svc --port 80
 
-  # Updates a service 'mysvc' with new requests and limits parameters
-  kn service update mysvc --requests-cpu 500m --limits-memory 1024Mi
+  # Updates a service 'svc' with new requests and limits parameters
+  kn service update svc --requests-cpu 500m --limits-memory 1024Mi
+
+  # Assign tag 'latest' and 'stable' to revisions 'echo-v2' and 'echo-v1' respectively
+  kn service update svc --tag echo-v2=latest --tag echo-v1=stable
+  OR
+  kn service update svc --tag echo-v2=latest,echo-v1=stable
+
+  # Update tag from 'testing' to 'staging' for latest ready revision of service
+  kn service update svc --untag testing --tag @latest=staging
+
+  # Add tag 'test' to echo-v3 revision with 10% traffic and rest to latest ready revision of service
+  kn service update svc --tag echo-v3=test --traffic test=10,@latest=90
 ```
 
 ### Options
@@ -43,6 +54,9 @@ kn service update NAME [flags]
       --requests-cpu string      The requested CPU (e.g., 250m).
       --requests-memory string   The requested memory (e.g., 64Mi).
       --revision-name string     The revision name to set. Must start with the service name and a dash as a prefix. Empty revision name will result in the server generating a name for the revision. Accepts golang templates, allowing {{.Service}} for the service name, {{.Generation}} for the generation, and {{.Random [n]}} for n random consonants. (default "{{.Service}}-{{.Random 5}}-{{.Generation}}")
+      --tag strings              Set tag (format: --tag revisionRef=tagName) where revisionRef can be a revision or '@latest' string representing latest ready revision. This flag can be specified multiple times.
+      --traffic strings          Set traffic distribution (format: --traffic revisionRef=percent) where revisionRef can be a revision or a tag or '@latest' string representing latest ready revision. This flag can be given multiple times with percent summing up to 100%.
+      --untag strings            Untag revision (format: --untag tagName). This flag can be spcified multiple times.
       --wait-timeout int         Seconds to wait before giving up on waiting for service to be ready. (default 60)
 ```
 

pkg/kn/commands/flags/traffic.go

@@ -0,0 +1,56 @@
+// Copyright © 2019 The Knative Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package flags
+
+import (
+	"github.com/spf13/cobra"
+)
+
+type Traffic struct {
+	RevisionsPercentages []string
+	RevisionsTags        []string
+	UntagRevisions       []string
+}
+
+func (t *Traffic) Add(cmd *cobra.Command) {
+	cmd.Flags().StringSliceVar(&t.RevisionsPercentages,
+		"traffic",
+		nil,
+		"Set traffic distribution (format: --traffic revisionRef=percent) where revisionRef can be a revision or a tag or '@latest' string "+
+			"representing latest ready revision. This flag can be given multiple times with percent summing up to 100%.")
+
+	cmd.Flags().StringSliceVar(&t.RevisionsTags,
+		"tag",
+		nil,
+		"Set tag (format: --tag revisionRef=tagName) where revisionRef can be a revision or '@latest' string representing latest ready revision. "+
+			"This flag can be specified multiple times.")
+
+	cmd.Flags().StringSliceVar(&t.UntagRevisions,
+		"untag",
+		nil,
+		"Untag revision (format: --untag tagName). This flag can be spcified multiple times.")
+}
+
+func (t *Traffic) PercentagesChanged(cmd *cobra.Command) bool {
+	return cmd.Flags().Changed("traffic")
+}
+
+func (t *Traffic) TagsChanged(cmd *cobra.Command) bool {
+	return cmd.Flags().Changed("tag") || cmd.Flags().Changed("untag")
+}
+
+func (t *Traffic) Changed(cmd *cobra.Command) bool {
+	return t.PercentagesChanged(cmd) || t.TagsChanged(cmd)
+}

pkg/kn/commands/service/service_update.go

@@ -18,6 +18,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/knative/client/pkg/kn/commands/flags"
+	"github.com/knative/client/pkg/kn/traffic"
 	"github.com/spf13/cobra"
 	api_errors "k8s.io/apimachinery/pkg/api/errors"
 
@@ -27,19 +29,30 @@ import (
 func NewServiceUpdateCommand(p *commands.KnParams) *cobra.Command {
 	var editFlags ConfigurationEditFlags
 	var waitFlags commands.WaitFlags
-
+	var trafficFlags flags.Traffic
 	serviceUpdateCommand := &cobra.Command{
 		Use:   "update NAME [flags]",
 		Short: "Update a service.",
 		Example: `
-  # Updates a service 'mysvc' with new environment variables
-  kn service update mysvc --env KEY1=VALUE1 --env KEY2=VALUE2
+  # Updates a service 'svc' with new environment variables
+  kn service update svc --env KEY1=VALUE1 --env KEY2=VALUE2
+
+  # Update a service 'svc' with new port
+  kn service update svc --port 80
+
+  # Updates a service 'svc' with new requests and limits parameters
+  kn service update svc --requests-cpu 500m --limits-memory 1024Mi
 
-  # Update a service 'mysvc' with new port
-  kn service update mysvc --port 80
+  # Assign tag 'latest' and 'stable' to revisions 'echo-v2' and 'echo-v1' respectively
+  kn service update svc --tag echo-v2=latest --tag echo-v1=stable
+  OR
+  kn service update svc --tag echo-v2=latest,echo-v1=stable
 
-  # Updates a service 'mysvc' with new requests and limits parameters
-  kn service update mysvc --requests-cpu 500m --limits-memory 1024Mi`,
+  # Update tag from 'testing' to 'staging' for latest ready revision of service
+  kn service update svc --untag testing --tag @latest=staging
+
+  # Add tag 'test' to echo-v3 revision with 10% traffic and rest to latest ready revision of service
+  kn service update svc --tag echo-v3=test --traffic test=10,@latest=90`,
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			if len(args) != 1 {
 				return errors.New("requires the service name.")
@@ -69,6 +82,15 @@ func NewServiceUpdateCommand(p *commands.KnParams) *cobra.Command {
 					return err
 				}
 
+				if trafficFlags.Changed(cmd) {
+					traffic, err := traffic.Compute(cmd, service.Spec.Traffic, &trafficFlags)
+					if err != nil {
+						return err
+					}
+
+					service.Spec.Traffic = traffic
+				}
+
 				err = client.UpdateService(service)
 				if err != nil {
 					// Retry to update when a resource version conflict exists
@@ -99,6 +121,7 @@ func NewServiceUpdateCommand(p *commands.KnParams) *cobra.Command {
 	commands.AddNamespaceFlags(serviceUpdateCommand.Flags(), false)
 	editFlags.AddUpdateFlags(serviceUpdateCommand)
 	waitFlags.AddConditionWaitFlags(serviceUpdateCommand, 60, "Update", "service")
+	trafficFlags.Add(serviceUpdateCommand)
 	return serviceUpdateCommand
 }