Skip to content

Commit

Permalink
fix(k8s): don't install NFS provisioner when sync storage class is set
Browse files Browse the repository at this point in the history
  • Loading branch information
edvald committed Oct 10, 2019
1 parent 2f2eef8 commit f026337
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
15 changes: 14 additions & 1 deletion garden-service/src/plugins/kubernetes/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -201,14 +201,27 @@ export async function prepareSystem(

await installTiller({ ctx: sysCtx, provider: sysCtx.provider, log, force })

// We need to install the NFS provisioner separately, so that we can optionally install it
// FIXME: when we've added an `enabled` field, we should get rid of this special case
if (systemServiceNames.includes("nfs-provisioner")) {
await prepareSystemServices({
log,
sysGarden,
namespace: systemNamespace,
force,
ctx: k8sCtx,
serviceNames: ["nfs-provisioner"],
})
}

// Install system services
await prepareSystemServices({
log,
sysGarden,
namespace: systemNamespace,
force,
ctx: k8sCtx,
serviceNames: systemServiceNames,
serviceNames: systemServiceNames.filter(name => name !== "nfs-provisioner"),
})

sysGarden.log.setSuccess()
Expand Down
6 changes: 4 additions & 2 deletions garden-service/static/kubernetes/system/build-sync/garden.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ type: helm
name: build-sync
description: Sync service for receiving build context ahead of in-cluster builds
releaseName: garden-build-sync
dependencies:
- nfs-provisioner
# Note: We special-case this dependency in the cluster-init procedure,
# to be fixed when the `enabled` field is implemented
# dependencies:
# - nfs-provisioner
values:
resources:
limits:
Expand Down

0 comments on commit f026337

Please sign in to comment.