diff --git a/garden-service/src/plugins/kubernetes/helm/tiller.ts b/garden-service/src/plugins/kubernetes/helm/tiller.ts index df6e56b0e1..680d9d6c3d 100644 --- a/garden-service/src/plugins/kubernetes/helm/tiller.ts +++ b/garden-service/src/plugins/kubernetes/helm/tiller.ts @@ -36,15 +36,15 @@ export async function checkTillerStatus(ctx: PluginContext, provider: Kubernetes } export async function installTiller(ctx: PluginContext, provider: KubernetesProvider, log: LogEntry) { + const namespace = await getAppNamespace(ctx, provider) + const context = provider.config.context + const entry = log.info({ section: "tiller", - msg: "Installing...", + msg: `Installing to ${namespace}...`, status: "active", }) - const namespace = await getAppNamespace(ctx, provider) - const context = provider.config.context - // Need to install the RBAC stuff ahead of Tiller const roleResources = getRoleResources(namespace) await applyMany(context, roleResources, { namespace }) diff --git a/garden-service/src/plugins/openfaas/openfaas.ts b/garden-service/src/plugins/openfaas/openfaas.ts index 43833272eb..df94093429 100644 --- a/garden-service/src/plugins/openfaas/openfaas.ts +++ b/garden-service/src/plugins/openfaas/openfaas.ts @@ -488,6 +488,9 @@ export async function getOpenFaasGarden(ctx: PluginContext): Promise<Garden> { variables: { "function-namespace": functionNamespace, "gateway-hostname": hostname, + // Need to scope the release name, because the OpenFaaS Helm chart installs some cluster-wide resources + // that could conflict across projects/users. + "release-name": `${functionNamespace}--openfaas`, }, }, ], diff --git a/garden-service/static/openfaas/system/openfaas-system/garden.yml b/garden-service/static/openfaas/system/openfaas-system/garden.yml index a560b81791..b4979fd47a 100644 --- a/garden-service/static/openfaas/system/openfaas-system/garden.yml +++ b/garden-service/static/openfaas/system/openfaas-system/garden.yml @@ -4,7 +4,8 @@ module: type: helm repo: https://openfaas.github.io/faas-netes/ chart: openfaas - version: 1.2.3 + version: 1.7.0 + releaseName: ${variables.release-name} values: exposeServices: false functionNamespace: ${variables.function-namespace}