Rename deploy-type arg to deployer to align with other arg names

Author: creydr

cmd/deploy.go

@@ -131,7 +131,7 @@ EXAMPLES
 		PreRunE: bindEnv("build", "build-timestamp", "builder", "builder-image",
 			"base-image", "confirm", "domain", "env", "git-branch", "git-dir",
 			"git-url", "image", "namespace", "path", "platform", "push", "pvc-size",
-			"service-account", "deploy-type", "registry", "registry-insecure", "remote",
+			"service-account", "deployer", "registry", "registry-insecure", "remote",
 			"username", "password", "token", "verbose", "remote-storage-class"),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runDeploy(cmd, newClient)
@@ -192,7 +192,7 @@ EXAMPLES
 		"When triggering a remote deployment, set a custom volume size to allocate for the build operation ($FUNC_PVC_SIZE)")
 	cmd.Flags().String("service-account", f.Deploy.ServiceAccountName,
 		"Service account to be used in the deployed function ($FUNC_SERVICE_ACCOUNT)")
-	cmd.Flags().String("deploy-type", f.Deploy.DeployType,
+	cmd.Flags().String("deployer", f.Deploy.Deployer,
 		fmt.Sprintf("Type of deployment to use: '%s' for Knative Service (default) or '%s' for Kubernetes Deployment ($FUNC_DEPLOY_TYPE)", knative.KnativeDeployerName, k8s.KubernetesDeployerName))
 	// Static Flags:
 	// Options which have static defaults only (not globally configurable nor
@@ -567,8 +567,8 @@ type deployConfig struct {
 	//Service account to be used in deployed function
 	ServiceAccountName string
 
-	// DeployType specifies the type of deployment: "knative" or "deployment"
-	DeployType string
+	// Deployer specifies the type of deployment: "knative" or "raw"
+	Deployer string
 
 	// Remote indicates the deployment (and possibly build) process are to
 	// be triggered in a remote environment rather than run locally.
@@ -603,7 +603,7 @@ func newDeployConfig(cmd *cobra.Command) deployConfig {
 		PVCSize:            viper.GetString("pvc-size"),
 		Timestamp:          viper.GetBool("build-timestamp"),
 		ServiceAccountName: viper.GetString("service-account"),
-		DeployType:         viper.GetString("deploy-type"),
+		Deployer:           viper.GetString("deployer"),
 	}
 	// NOTE: .Env should be viper.GetStringSlice, but this returns unparsed
 	// results and appears to be an open issue since 2017:
@@ -638,7 +638,7 @@ func (c deployConfig) Configure(f fn.Function) (fn.Function, error) {
 	f.Build.Git.Revision = c.GitBranch // TODO: should match; perhaps "refSpec"
 	f.Build.RemoteStorageClass = c.RemoteStorageClass
 	f.Deploy.ServiceAccountName = c.ServiceAccountName
-	f.Deploy.DeployType = c.DeployType
+	f.Deploy.Deployer = c.Deployer
 	f.Local.Remote = c.Remote
 
 	// PVCSize
@@ -805,18 +805,18 @@ func (c deployConfig) clientOptions() ([]fn.Option, error) {
 	}
 
 	// Add the appropriate deployer based on deploy type
-	deployType := c.DeployType
-	if deployType == "" {
-		deployType = knative.KnativeDeployerName // default to knative for backwards compatibility
+	deployer := c.Deployer
+	if deployer == "" {
+		deployer = knative.KnativeDeployerName // default to knative for backwards compatibility
 	}
 
-	switch deployType {
+	switch deployer {
 	case knative.KnativeDeployerName:
 		o = append(o, fn.WithDeployer(newKnativeDeployer(c.Verbose)))
 	case k8s.KubernetesDeployerName:
 		o = append(o, fn.WithDeployer(newK8sDeployer(c.Verbose)))
 	default:
-		return o, fmt.Errorf("unsupported deploy type: %s (supported: %s, %s)", deployType, knative.KnativeDeployerName, k8s.KubernetesDeployerName)
+		return o, fmt.Errorf("unsupported deploy type: %s (supported: %s, %s)", deployer, knative.KnativeDeployerName, k8s.KubernetesDeployerName)
 	}
 
 	return o, nil

cmd/describe.go

@@ -153,8 +153,8 @@ func (i info) Human(w io.Writer) error {
 		fmt.Fprintf(w, "  %v\n", route)
 	}
 
-	fmt.Fprintln(w, "Deploy-Type:")
-	fmt.Fprintf(w, "  %v\n", i.DeployType)
+	fmt.Fprintln(w, "Deployer:")
+	fmt.Fprintf(w, "  %v\n", i.Deployer)
 
 	if len(i.Subscriptions) > 0 {
 		fmt.Fprintln(w, "Subscriptions (Source, Type, Broker):")
@@ -181,7 +181,7 @@ func (i info) Plain(w io.Writer) error {
 		fmt.Fprintf(w, "Route %v\n", route)
 	}
 
-	fmt.Fprintf(w, "Deploy-Type %v\n", i.DeployType)
+	fmt.Fprintf(w, "Deployer %v\n", i.Deployer)
 
 	if len(i.Subscriptions) > 0 {
 		for _, s := range i.Subscriptions {

cmd/list.go

@@ -187,9 +187,9 @@ func (items listItems) Plain(w io.Writer) error {
 	tabWriter := tabwriter.NewWriter(w, 0, 8, 2, ' ', 0)
 	defer tabWriter.Flush()
 
-	fmt.Fprintf(tabWriter, "%s\t%s\t%s\t%s\t%s\t%s\n", "NAME", "NAMESPACE", "RUNTIME", "DEPLOY-TYPE", "URL", "READY")
+	fmt.Fprintf(tabWriter, "%s\t%s\t%s\t%s\t%s\t%s\n", "NAME", "NAMESPACE", "RUNTIME", "DEPLOYER", "URL", "READY")
 	for _, item := range items {
-		fmt.Fprintf(tabWriter, "%s\t%s\t%s\t%s\t%s\t%s\n", item.Name, item.Namespace, item.Runtime, item.DeployType, item.URL, item.Ready)
+		fmt.Fprintf(tabWriter, "%s\t%s\t%s\t%s\t%s\t%s\n", item.Name, item.Namespace, item.Runtime, item.Deployer, item.URL, item.Ready)
 	}
 	return nil
 }

docs/reference/func_deploy.md

@@ -119,7 +119,7 @@ func deploy
   -b, --builder string                Builder to use when creating the function's container. Currently supported builders are "host", "pack" and "s2i". (default "pack")
       --builder-image string          Specify a custom builder image for use by the builder other than its default. ($FUNC_BUILDER_IMAGE)
   -c, --confirm                       Prompt to confirm options interactively ($FUNC_CONFIRM)
-      --deploy-type string            Type of deployment to use: 'knative' for Knative Service (default) or 'raw' for Kubernetes Deployment ($FUNC_DEPLOY_TYPE)
+      --deployer string               Type of deployment to use: 'knative' for Knative Service (default) or 'raw' for Kubernetes Deployment ($FUNC_DEPLOY_TYPE)
       --domain string                 Domain to use for the function's route.  Cluster must be configured with domain matching for the given domain (ignored if unrecognized) ($FUNC_DOMAIN)
   -e, --env stringArray               Environment variable to set in the form NAME=VALUE. You may provide this flag multiple times for setting multiple environment variables. To unset, specify the environment variable name followed by a "-" (e.g., NAME-).
   -t, --git-branch string             Git revision (branch) to be used when deploying via the Git repository ($FUNC_GIT_BRANCH)

hack/component-versions.json

@@ -1,11 +1,11 @@
 {
 	"Contour": {
-		"version": "v1.19.6",
+		"version": "v1.20.0",
 		"owner": "knative-extensions",
 		"repo": "net-contour"
 	},
 	"Eventing": {
-		"version": "v1.19.7",
+		"version": "v1.20.0",
 		"owner": "knative",
 		"repo": "eventing"
 	},
@@ -16,7 +16,7 @@
 		"version": "v0.35.2"
 	},
 	"Serving": {
-		"version": "v1.19.7",
+		"version": "v1.20.0",
 		"owner": "knative",
 		"repo": "serving"
 	},

hack/component-versions.sh

@@ -11,9 +11,9 @@ set_versions() {
 	kind_node_version=v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027
 
 	# find source-of-truth in component-versions.json to add/modify components
-	knative_serving_version="v1.19.7"
-	knative_eventing_version="v1.19.7"
-	contour_version="v1.19.6"
+	knative_serving_version="v1.20.0"
+	knative_eventing_version="v1.20.0"
+	contour_version="v1.20.0"
 	tekton_version="v1.1.0"
 	pac_version="v0.35.2"
 }

pkg/deployer/common.go

@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	DeployTypeAnnotation = "function.knative.dev/deploy-type"
+	DeployerNameAnnotation = "function.knative.dev/deployer"
 
 	// Dapr constants
 	DaprEnabled          = "true"
@@ -43,7 +43,7 @@ func GenerateCommonLabels(f fn.Function, decorator DeployDecorator) (map[string]
 }
 
 // GenerateCommonAnnotations creates annotations common to both Knative and K8s deployments
-func GenerateCommonAnnotations(f fn.Function, decorator DeployDecorator, daprInstalled bool, deployType string) map[string]string {
+func GenerateCommonAnnotations(f fn.Function, decorator DeployDecorator, daprInstalled bool, deployerName string) map[string]string {
 	aa := make(map[string]string)
 
 	// Add Dapr annotations if Dapr is installed
@@ -53,8 +53,8 @@ func GenerateCommonAnnotations(f fn.Function, decorator DeployDecorator, daprIns
 		}
 	}
 
-	if len(deployType) > 0 {
-		aa[DeployTypeAnnotation] = deployType
+	if len(deployerName) > 0 {
+		aa[DeployerNameAnnotation] = deployerName
 	}
 
 	// Add user-defined annotations