Add kubernetes deployment deployer

Author: creydr

cmd/client.go

@@ -9,6 +9,8 @@ import (
 	"knative.dev/func/pkg/builders/buildpacks"
 	"knative.dev/func/pkg/config"
 	"knative.dev/func/pkg/creds"
+	k8sdeployer "knative.dev/func/pkg/deployer/k8s"
+	knativedeployer "knative.dev/func/pkg/deployer/knative"
 	"knative.dev/func/pkg/docker"
 	fn "knative.dev/func/pkg/functions"
 	fnhttp "knative.dev/func/pkg/http"
@@ -58,7 +60,7 @@ func NewClient(cfg ClientConfig, options ...fn.Option) (*fn.Client, func()) {
 	var (
 		t  = newTransport(cfg.InsecureSkipVerify)    // may provide a custom impl which proxies
 		c  = newCredentialsProvider(config.Dir(), t) // for accessing registries
-		d  = newKnativeDeployer(cfg.Verbose)
+		d  = newKnativeDeployer(cfg.Verbose)         // default deployer (can be overridden via options)
 		pp = newTektonPipelinesProvider(c, cfg.Verbose)
 		o  = []fn.Option{ // standard (shared) options for all commands
 			fn.WithVerbose(cfg.Verbose),
@@ -127,12 +129,21 @@ func newTektonPipelinesProvider(creds oci.CredentialsProvider, verbose bool) *te
 }
 
 func newKnativeDeployer(verbose bool) fn.Deployer {
-	options := []knative.DeployerOpt{
-		knative.WithDeployerVerbose(verbose),
-		knative.WithDeployerDecorator(deployDecorator{}),
+	options := []knativedeployer.DeployerOpt{
+		knativedeployer.WithDeployerVerbose(verbose),
+		knativedeployer.WithDeployerDecorator(deployDecorator{}),
 	}
 
-	return knative.NewDeployer(options...)
+	return knativedeployer.NewDeployer(options...)
+}
+
+func newK8sDeployer(verbose bool) fn.Deployer {
+	options := []k8sdeployer.DeployerOpt{
+		k8sdeployer.WithDeployerVerbose(verbose),
+		k8sdeployer.WithDeployerDecorator(deployDecorator{}),
+	}
+
+	return k8sdeployer.NewDeployer(options...)
 }
 
 type deployDecorator struct {

cmd/deploy.go

@@ -15,6 +15,7 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/apimachinery/pkg/api/resource"
 	"knative.dev/client/pkg/util"
+	"knative.dev/func/pkg/deployer"
 
 	"knative.dev/func/pkg/builders"
 	"knative.dev/func/pkg/config"
@@ -131,7 +132,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", "registry", "registry-insecure", "remote",
+			"service-account", "deploy-type", "registry", "registry-insecure", "remote",
 			"username", "password", "token", "verbose", "remote-storage-class"),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runDeploy(cmd, newClient)
@@ -192,6 +193,8 @@ 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,
+		fmt.Sprintf("Type of deployment to use: '%s' for Knative Service (default) or '%s' for Kubernetes Deployment ($FUNC_DEPLOY_TYPE)", deployer.KnativeDeployerName, deployer.KubernetesDeployerName))
 	// Static Flags:
 	// Options which have static defaults only (not globally configurable nor
 	// persisted with the function)
@@ -567,6 +570,9 @@ type deployConfig struct {
 	//Service account to be used in deployed function
 	ServiceAccountName string
 
+	// DeployType specifies the type of deployment: "knative" or "deployment"
+	DeployType string
+
 	// Remote indicates the deployment (and possibly build) process are to
 	// be triggered in a remote environment rather than run locally.
 	Remote bool
@@ -600,6 +606,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"),
 	}
 	// NOTE: .Env should be viper.GetStringSlice, but this returns unparsed
 	// results and appears to be an open issue since 2017:
@@ -634,6 +641,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.Local.Remote = c.Remote
 
 	// PVCSize
@@ -791,6 +799,34 @@ func (c deployConfig) Validate(cmd *cobra.Command) (err error) {
 	return
 }
 
+// clientOptions returns client options specific to deploy, including the appropriate deployer
+func (c deployConfig) clientOptions() ([]fn.Option, error) {
+	// Start with build config options
+	o, err := c.buildConfig.clientOptions()
+	if err != nil {
+		return o, err
+	}
+
+	// Add the appropriate deployer based on deploy type
+	deployType := c.DeployType
+	if deployType == "" {
+		deployType = deployer.KnativeDeployerName // default to knative for backwards compatibility
+	}
+
+	var d fn.Deployer
+	switch deployType {
+	case deployer.KnativeDeployerName:
+		d = newKnativeDeployer(c.Verbose)
+	case deployer.KubernetesDeployerName:
+		d = newK8sDeployer(c.Verbose)
+	default:
+		return o, fmt.Errorf("unsupported deploy type: %s (supported: %s, %s)", deployType, deployer.KnativeDeployerName, deployer.KubernetesDeployerName)
+	}
+
+	o = append(o, fn.WithDeployer(d))
+	return o, nil
+}
+
 // printDeployMessages to the output.  Non-error deployment messages.
 func printDeployMessages(out io.Writer, f fn.Function) {
 	digest, err := isDigested(f.Image)