Break out openfaas-ce app and support values.yaml files overrides

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

cmd/apps/chart_app.go

@@ -36,7 +36,7 @@ before using the generic helm chart installer command.`,
 
 	chartCmd.Flags().StringP("namespace", "n", "default", "The namespace to install the chart")
 	chartCmd.Flags().String("repo", "", "The chart repo to install from")
-	chartCmd.Flags().String("values-file", "", "Give the values.yaml file to use from the upstream chart repo")
+	chartCmd.Flags().StringArrayP("values", "f", []string{"values.yaml"}, "Give the values.yaml file to use from the upstream chart repo")
 	chartCmd.Flags().String("repo-name", "", "Chart name")
 	chartCmd.Flags().String("repo-url", "", "Chart repo")
 
@@ -119,8 +119,10 @@ before using the generic helm chart installer command.`,
 			}
 		}
 
+		valuesFlag, _ := chartCmd.Flags().GetStringArray("values")
+
 		err = helm.Helm3Upgrade(chartRepoName, namespace,
-			"values.yaml",
+			valuesFlag,
 			defaultVersion,
 			setMap,
 			false)

cmd/apps/confluentkafka.go

@@ -112,7 +112,7 @@ func MakeInstallConfluentPlatformKafka() *cobra.Command {
 		appOpts.
 			WithKubeconfigPath(kubeConfigPath).
 			WithOverrides(overrides).
-			WithValuesFile("values.yaml").
+			WithValuesFiles([]string{"values.yaml"}).
 			WithHelmURL("https://confluentinc.github.io/cp-helm-charts/").
 			WithHelmRepo("confluentinc/cp-helm-charts").
 			WithHelmUpdateRepo(updateRepo).

cmd/apps/crossplane_app.go

@@ -97,7 +97,7 @@ schedule workloads to any Kubernetes cluster`,
 		}
 
 		err = helm.Helm3Upgrade("crossplane-alpha/crossplane",
-			namespace, "values.yaml", "", values, wait)
+			namespace, []string{"values.yaml"}, "", values, wait)
 		if err != nil {
 			return err
 		}

cmd/apps/inletsoperator_app.go

@@ -213,7 +213,7 @@ IngressController`,
 		}
 
 		err = helm.Helm3Upgrade("inlets/inlets-operator",
-			namespace, "values.yaml", "", overrides, wait)
+			namespace, []string{"values.yaml"}, "", overrides, wait)
 		if err != nil {
 			return err
 		}

cmd/apps/mongodb_app.go

@@ -96,7 +96,7 @@ func MakeInstallMongoDB() *cobra.Command {
 		}
 
 		err = helm.Helm3Upgrade("bitnami/mongodb",
-			namespace, "values.yaml", defaultVersion, overrides, wait)
+			namespace, []string{"values.yaml"}, defaultVersion, overrides, wait)
 		if err != nil {
 			return fmt.Errorf("unable to mongodb chart with helm %s", err)
 		}

cmd/apps/of_loki.go

@@ -59,7 +59,7 @@ func MakeInstallOpenFaaSLoki() *cobra.Command {
 
 		// The default options includes the `values.yaml` file but this is already
 		// implied when using the OCI chart.
-		lokiOptions.Helm.ValuesFile = ""
+		lokiOptions.Helm.ValuesFiles = []string{}
 
 		_, err := apps.MakeInstallChart(lokiOptions)
 		if err != nil {

cmd/apps/openfaas_app.go

@@ -42,12 +42,12 @@ func MakeInstallOpenFaaS() *cobra.Command {
 	openfaas.Flags().String("pull-policy", "IfNotPresent", "Pull policy for OpenFaaS core services")
 	openfaas.Flags().String("function-pull-policy", "Always", "Pull policy for functions")
 
-	openfaas.Flags().Bool("operator", false, "Create OpenFaaS Operator")
+	openfaas.Flags().Bool("operator", true, "Create OpenFaaS Operator")
 	openfaas.Flags().Bool("clusterrole", false, "Create a ClusterRole for OpenFaaS instead of a limited scope Role")
 	openfaas.Flags().Bool("direct-functions", false, "Invoke functions directly from the gateway, or load-balance via endpoint IPs when set to false")
-	openfaas.Flags().Bool("autoscaler", false, "Deploy OpenFaaS with the autoscaler enabled")
-	openfaas.Flags().Bool("jetstream", false, "Deploy OpenFaaS with jetstream queue mode")
-	openfaas.Flags().Bool("dashboard", false, "Deploy OpenFaaS with the dashboard enabled")
+	openfaas.Flags().Bool("autoscaler", true, "Deploy OpenFaaS with the autoscaler enabled")
+	openfaas.Flags().String("queue-mode", "static", "Configure the consumer mode for the queue-worker: \"static\" or \"function\"")
+	openfaas.Flags().Bool("dashboard", true, "Deploy OpenFaaS with the dashboard enabled")
 
 	openfaas.Flags().Int("queue-workers", 1, "Replicas of queue-worker for HA")
 	openfaas.Flags().Int("max-inflight", 1, "Max tasks for queue-worker to process in parallel")
@@ -61,6 +61,8 @@ func MakeInstallOpenFaaS() *cobra.Command {
 
 	openfaas.Flags().String("license-file", "", "Path to OpenFaaS Pro license file")
 
+	openfaas.Flags().StringArrayP("values", "f", []string{}, "Specify one or more local values.yaml files for overrides.")
+
 	openfaas.RunE = func(command *cobra.Command, args []string) error {
 		appOpts := types.DefaultInstallOptions()
 
@@ -77,19 +79,17 @@ func MakeInstallOpenFaaS() *cobra.Command {
 		clusterRole, _ := command.Flags().GetBool("clusterrole")
 		directFunctions, _ := command.Flags().GetBool("direct-functions")
 		autoscaler, _ := command.Flags().GetBool("autoscaler")
-		jetstream, _ := command.Flags().GetBool("jetstream")
 		dashboard, _ := command.Flags().GetBool("dashboard")
 		gateways, _ := command.Flags().GetInt("gateways")
 		maxInflight, _ := command.Flags().GetInt("max-inflight")
 		queueWorkers, _ := command.Flags().GetInt("queue-workers")
 		ingressOperator, _ := command.Flags().GetBool("ingress-operator")
 		lb, _ := command.Flags().GetBool("load-balancer")
+		queueMode, _ := command.Flags().GetString("queue-mode")
+		valuesFiles, _ := command.Flags().GetStringArray("values")
 
 		overrides := map[string]string{}
 
-		arch := k8s.GetNodeArchitecture()
-		valuesSuffix := getValuesSuffix(arch)
-
 		_, err := k8s.KubectlTask("apply", "-f",
 			"https://raw.githubusercontent.com/openfaas/faas-netes/master/namespaces.yml")
 
@@ -120,17 +120,14 @@ func MakeInstallOpenFaaS() *cobra.Command {
 			overrides["gateway.logsProviderURL"] = logUrl
 		}
 
-		// If license file is sent, then we assume to set the --pro flag and create the secret
-		if len(licenseFile) != 0 {
-			overrides["openfaasPro"] = "true"
-			secretData := []types.SecretsData{
-				{Type: types.FromFileSecret, Key: "license", Value: licenseFile},
-			}
-
-			proLicense := types.NewGenericSecret("openfaas-license", namespace, secretData)
-			appOpts.WithSecret(proLicense)
+		overrides["openfaasPro"] = "true"
+		secretData := []types.SecretsData{
+			{Type: types.FromFileSecret, Key: "license", Value: licenseFile},
 		}
 
+		proLicense := types.NewGenericSecret("openfaas-license", namespace, secretData)
+		appOpts.WithSecret(proLicense)
+
 		if dashboard {
 			privateKey, publicKey, err := generateJWTKeyPair()
 			if err != nil {
@@ -146,49 +143,77 @@ func MakeInstallOpenFaaS() *cobra.Command {
 			appOpts.WithSecret(dashboardJWT)
 		}
 
-		overrides["clusterRole"] = strconv.FormatBool(clusterRole)
-		overrides["gateway.directFunctions"] = strconv.FormatBool(directFunctions)
-		overrides["operator.create"] = strconv.FormatBool(createOperator)
-		overrides["openfaasImagePullPolicy"] = pullPolicy
-		overrides["faasnetes.imagePullPolicy"] = functionPullPolicy
-		overrides["basicAuthPlugin.replicas"] = "1"
-		overrides["gateway.replicas"] = fmt.Sprintf("%d", gateways)
+		overrides["jetstreamQueueWorker.mode"] = queueMode
+
+		if command.Flags().Changed("clusterrole") {
+			overrides["clusterRole"] = strconv.FormatBool(clusterRole)
+		}
+
+		if command.Flags().Changed("direct-functions") {
+			overrides["gateway.directFunctions"] = strconv.FormatBool(directFunctions)
+		}
+
+		if command.Flags().Changed("operator") {
+			overrides["operator.create"] = strconv.FormatBool(createOperator)
+		}
+
+		if command.Flags().Changed("pull-policy") {
+			overrides["openfaasImagePullPolicy"] = pullPolicy
+			overrides["faasnetes.imagePullPolicy"] = functionPullPolicy
+		}
+
+		if command.Flags().Changed("gateways") {
+			overrides["gateway.replicas"] = fmt.Sprintf("%d", gateways)
+		}
+
+		if command.Flags().Changed("queue-workers") {
+			overrides["queueWorker.replicas"] = fmt.Sprintf("%d", queueWorkers)
+		}
+
+		if command.Flags().Changed("max-inflight") {
+			overrides["queueWorker.maxInflight"] = fmt.Sprintf("%d", maxInflight)
+		}
+
+		if command.Flags().Changed("autoscaler") {
+			overrides["autoscaler.enabled"] = strconv.FormatBool(autoscaler)
+		}
+
+		if command.Flags().Changed("dashboard") {
+			overrides["dashboard.enabled"] = strconv.FormatBool(dashboard)
+		}
+
 		overrides["ingressOperator.create"] = strconv.FormatBool(ingressOperator)
-		overrides["queueWorker.replicas"] = fmt.Sprintf("%d", queueWorkers)
-		overrides["queueWorker.maxInflight"] = fmt.Sprintf("%d", maxInflight)
-		overrides["autoscaler.enabled"] = strconv.FormatBool(autoscaler)
-		overrides["dashboard.enabled"] = strconv.FormatBool(dashboard)
-		overrides["dashboard.publicURL"] = "http://127.0.0.1:8080"
 
-		// the value in the template is "basic_auth" not the more usual basicAuth
-		overrides["basic_auth"] = strconv.FormatBool(basicAuthEnabled)
+		if command.Flags().Changed("basic-auth") {
+			overrides["basic_auth"] = strconv.FormatBool(basicAuthEnabled)
+		}
 
 		overrides["serviceType"] = "NodePort"
 
 		if lb {
 			overrides["serviceType"] = "LoadBalancer"
 		}
 
-		if jetstream {
-			overrides["queueMode"] = "jetstream"
-		}
-
 		customFlags, _ := command.Flags().GetStringArray("set")
 		if err := config.MergeFlags(overrides, customFlags); err != nil {
 			return err
 		}
 
 		appOpts.
 			WithKubeconfigPath(kubeConfigPath).
+			WithValuesFiles([]string{`https://raw.githubusercontent.com/openfaas/faas-netes/refs/heads/master/chart/openfaas/values-pro.yaml`}).
 			WithOverrides(overrides).
-			WithValuesFile(fmt.Sprintf("values%s.yaml", valuesSuffix)).
 			WithHelmURL("https://openfaas.github.io/faas-netes/").
 			WithHelmRepo("openfaas/openfaas").
 			WithHelmUpdateRepo(updateRepo).
 			WithNamespace(namespace).
 			WithInstallNamespace(false).
 			WithWait(wait)
 
+		if len(valuesFiles) > 0 {
+			appOpts.WithValuesFiles(valuesFiles)
+		}
+
 		if _, err := apps.MakeInstallChart(appOpts); err != nil {
 			return err
 		}
@@ -238,11 +263,6 @@ func MakeInstallOpenFaaS() *cobra.Command {
 			return err
 		}
 
-		_, err = cmd.Flags().GetBool("jetstream")
-		if err != nil {
-			return err
-		}
-
 		_, err = cmd.Flags().GetBool("dashboard")
 		if err != nil {
 			return err
@@ -321,8 +341,14 @@ func generateJWTKeyPair() ([]byte, []byte, error) {
 	return privOut.Bytes(), pubOut.Bytes(), nil
 }
 
-const OpenFaaSInfoMsg = `# Get the faas-cli
-curl -SLsf https://cli.openfaas.com | sudo sh
+const OpenFaaSInfoMsg = `# You've installed OpenFaaS Pro 👍
+# OpenFaaS Standard or for Enterprises is now running (depending on your license)
+
+# Read the EULA before continuing:
+https://github.com/openfaas/faas/blob/master/pro/EULA.md
+
+# Get the faas-cli
+arkade get faas-cli
 
 # Forward the gateway to your machine
 kubectl rollout status -n openfaas deploy/gateway
@@ -332,18 +358,12 @@ kubectl port-forward -n openfaas svc/gateway 8080:8080 &
 PASSWORD=$(kubectl get secret -n openfaas basic-auth -o jsonpath="{.data.basic-auth-password}" | base64 --decode; echo)
 echo -n $PASSWORD | faas-cli login --username admin --password-stdin
 
-faas-cli store deploy figlet
+faas-cli store deploy env
 faas-cli list
-
-# For Raspberry Pi
-faas-cli store list \
- --platform armhf
-
-faas-cli store deploy figlet \
- --platform armhf
+faas-cli describe env
 
 # Find out more at:
-# https://github.com/openfaas/faas`
+# https://docs.openfaas.com/`
 
 const openfaasPostInstallMsg = `=======================================================================
 = OpenFaaS has been installed.                                        =