Skip to content

Commit

Permalink
fix(k8s): don't require manual init for local-kubernetes provider
Browse files Browse the repository at this point in the history
  • Loading branch information
edvald committed Jun 5, 2019
1 parent d98ed6f commit 83d9efb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions garden-service/src/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ export class ActionHelper implements TypeGuard {
if (!allowUserInput && needManualInit.length > 0) {
const names = needManualInit.map(s => s.name).join(", ")
const msgPrefix = needManualInit.length === 1
? `Plugin ${names} has been updated or hasn't been configured, and requires user input.`
: `Plugins ${names} have been updated or haven't been configured, and require user input.`
? `Provider ${names} has been updated or hasn't been configured, and requires manual initialization.`
: `Providers ${names} have been updated or haven't been configured, and require manual initialization.`

entry.setError()

Expand Down
2 changes: 1 addition & 1 deletion garden-service/src/plugins/kubernetes/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export async function getEnvironmentStatus({ ctx, log }: GetEnvironmentStatusPar

// We always require manual init if we're installing any system services to remote clusters, to avoid conflicts
// between users or unnecessary work.
needManualInit = true
needManualInit = ctx.provider.name !== "local-kubernetes"
}

const detail = { systemReady, projectReady }
Expand Down

0 comments on commit 83d9efb

Please sign in to comment.