Skip to content

Commit

Permalink
fix(openfaas): regression in openfaas provider init
Browse files Browse the repository at this point in the history
  • Loading branch information
thsig committed Jun 27, 2019
1 parent 329b488 commit bca7a62
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
7 changes: 4 additions & 3 deletions garden-service/src/plugins/openfaas/openfaas.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ import { GetServiceLogsParams } from "../../types/plugin/service/getServiceLogs"
import { DeleteServiceParams } from "../../types/plugin/service/deleteService"
import { HelmModuleConfig } from "../kubernetes/helm/config"
import { keyBy, union } from "lodash"
import { DEFAULT_API_VERSION } from "../../constants"
import { DEFAULT_API_VERSION, STATIC_DIR } from "../../constants"
import { ExecModuleConfig } from "../exec"
import { ConfigureProviderParams, ConfigureProviderResult } from "../../types/plugin/provider/configureProvider"
import { KubernetesDeployment } from "../kubernetes/types"

const systemDir = join(STATIC_DIR, "openfaas", "system")
export const stackFilename = "stack.yml"

export interface OpenFaasModuleSpec extends ExecModuleSpec {
Expand Down Expand Up @@ -148,7 +149,7 @@ const templateModuleConfig: ExecModuleConfig = {
},
description: "OpenFaaS templates for building functions",
name: "templates",
path: __dirname,
path: join(systemDir, "openfaas-templates"),
repositoryUrl: "https://github.com/openfaas/templates.git#master",
outputs: {},
serviceConfigs: [],
Expand Down Expand Up @@ -203,7 +204,7 @@ async function configureProvider(
description: "OpenFaaS runtime",
name: "system",
outputs: {},
path: __dirname,
path: join(systemDir, "openfaas-system"),
serviceConfigs: [],
taskConfigs: [],
testConfigs: [],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Module
name: system
description: "OpenFaaS runtime"
type: helm
chart: openfaas
repo: "https://openfaas.github.io/faas-netes/"
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: Module
name: templates
description: "OpenFaaS templates"
type: exec

0 comments on commit bca7a62

Please sign in to comment.