Skip to content

Commit

Permalink
Fix gofmt
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
alexellis committed Feb 21, 2020
1 parent 2941dfd commit 2fd0c74
Showing 11 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion cmd/apps/cronconnector_app.go
Original file line number Diff line number Diff line change
@@ -142,4 +142,4 @@ kubectl logs deploy/cron-connector -n openfaas -f
const cronConnectorInstallMsg = `=======================================================================
= cron-connector has been installed. =
=======================================================================` +
"\n\n" + CronConnectorInfoMsg + "\n\n" + pkg.ThanksForUsing
"\n\n" + CronConnectorInfoMsg + "\n\n" + pkg.ThanksForUsing
3 changes: 1 addition & 2 deletions cmd/apps/kubernetes_dashboard_app.go
Original file line number Diff line number Diff line change
@@ -43,7 +43,6 @@ func MakeInstallKubernetesDashboard() *cobra.Command {
return kubeDashboard
}


const KubernetesDashboardInfoMsg = `# To create the Service Account and the ClusterRoleBinding
# @See https://github.com/kubernetes/dashboard/blob/master/docs/user/access-control/creating-sample-user.md#creating-sample-user
@@ -82,4 +81,4 @@ http://localhost:8001/api/v1/namespaces/kubernetes-dashboard/services/https:kube
const KubernetesDashboardInstallMsg = `=======================================================================
= Kubernetes Dashboard has been installed. =
=======================================================================` +
"\n\n" + KubernetesDashboardInfoMsg + "\n\n" + pkg.ThanksForUsing
"\n\n" + KubernetesDashboardInfoMsg + "\n\n" + pkg.ThanksForUsing
6 changes: 2 additions & 4 deletions cmd/apps/kubernetes_exec.go
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ func fetchChart(path, chart, version string, helm3 bool) error {
return mkErr
}

println(fmt.Sprintf("%s fetch %s --untar=true --untardir %s %s", env.LocalBinary("helm", subdir), chart, path, versionStr))
println(fmt.Sprintf("%s fetch %s --untar=true --untardir %s %s", env.LocalBinary("helm", subdir), chart, path, versionStr))
task := execute.ExecTask{
Command: fmt.Sprintf("%s fetch %s --untar=true --untardir %s%s", env.LocalBinary("helm", subdir), chart, path, versionStr),
Env: os.Environ(),
@@ -65,9 +65,7 @@ func helm3Upgrade(basePath, chart, namespace, values, version string, overrides

chartRoot := basePath



args := []string{"upgrade", "--install", chartName, chart, "--namespace", namespace,}
args := []string{"upgrade", "--install", chartName, chart, "--namespace", namespace}
if len(version) > 0 {
args = append(args, "--version", version)
}
1 change: 0 additions & 1 deletion cmd/apps/metricsserver_app.go
Original file line number Diff line number Diff line change
@@ -56,7 +56,6 @@ func MakeInstallMetricsServer() *cobra.Command {
log.Printf("User dir established as: %s\n", userPath)
os.Setenv("HELM_HOME", path.Join(userPath, ".helm"))


_, err = helm.TryDownloadHelm(userPath, clientArch, clientOS, helm3)
if err != nil {
return err
2 changes: 1 addition & 1 deletion cmd/apps/minio_app.go
Original file line number Diff line number Diff line change
@@ -168,4 +168,4 @@ mc ls minio
var minioInstallMsg = `=======================================================================
= Minio has been installed. =
=======================================================================` +
"\n\n" + MinioInfoMsg + "\n\n" + pkg.ThanksForUsing
"\n\n" + MinioInfoMsg + "\n\n" + pkg.ThanksForUsing
2 changes: 1 addition & 1 deletion cmd/apps/mongodb_app.go
Original file line number Diff line number Diff line change
@@ -101,7 +101,7 @@ func MakeInstallMongoDB() *cobra.Command {
}

err = helm3Upgrade(outputPath, "stable/mongodb",
namespace, "values.yaml", defaultVersion,overrides, wait)
namespace, "values.yaml", defaultVersion, overrides, wait)
if err != nil {
return fmt.Errorf("unable to mongodb chart with helm %s", err)
}
3 changes: 1 addition & 2 deletions cmd/apps/openfaas_app.go
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ import (
"github.com/spf13/cobra"
)

const latestVersion = ""
const latestVersion = ""

func MakeInstallOpenFaaS() *cobra.Command {
var openfaas = &cobra.Command{
@@ -82,7 +82,6 @@ func MakeInstallOpenFaaS() *cobra.Command {
log.Printf("User dir established as: %s\n", userPath)
os.Setenv("HELM_HOME", path.Join(userPath, ".helm"))


_, err = helm.TryDownloadHelm(userPath, clientArch, clientOS, helm3)
if err != nil {
return err
2 changes: 1 addition & 1 deletion cmd/apps/openfaas_ingress_app.go
Original file line number Diff line number Diff line change
@@ -207,4 +207,4 @@ spec:
solvers:
- http01:
ingress:
class: {{.IngressClass}}`
class: {{.IngressClass}}`
2 changes: 1 addition & 1 deletion cmd/apps/postgres_app.go
Original file line number Diff line number Diff line change
@@ -146,4 +146,4 @@ To connect to your database from outside the cluster execute the following comma
const postgresqlInstallMsg = `=======================================================================
= PostgreSQL has been installed. =
=======================================================================` +
"\n\n" + PostgresqlInfoMsg + "\n\n" + pkg.ThanksForUsing
"\n\n" + PostgresqlInfoMsg + "\n\n" + pkg.ThanksForUsing
1 change: 0 additions & 1 deletion cmd/apps/registry_app.go
Original file line number Diff line number Diff line change
@@ -60,7 +60,6 @@ func MakeInstallRegistry() *cobra.Command {

os.Setenv("HELM_HOME", path.Join(userPath, ".helm"))


_, err = helm.TryDownloadHelm(userPath, clientArch, clientOS, helm3)
if err != nil {
return err
2 changes: 1 addition & 1 deletion cmd/apps/registry_ingress_app.go
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ type RegInputData struct {
CertmanagerEmail string
IngressClass string
Namespace string
NginxMaxBuffer string
NginxMaxBuffer string
}

func MakeInstallRegistryIngress() *cobra.Command {

0 comments on commit 2fd0c74

Please sign in to comment.