Skip to content

Commit

Permalink
feat(k8s): add helm module type
Browse files Browse the repository at this point in the history
Note: This initial implementation doesn't use helm for installing
charts, just for fetching and rendering the manifests. We'll change
that in following steps, eventually removing the specs module.
  • Loading branch information
edvald committed Jun 14, 2018
1 parent 8ccd9a1 commit 122e6dd
Show file tree
Hide file tree
Showing 13 changed files with 473 additions and 275 deletions.
2 changes: 1 addition & 1 deletion bin/bootstrap-osx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

# install/update homebrew dependencies
BREW_DEPS="cmake git kubectl stern rsync watchman icu4c pkg-config yarn"
BREW_DEPS="cmake git kubectl kubernetes-helm stern rsync watchman icu4c pkg-config yarn"

brew update
brew install ${BREW_DEPS}
Expand Down
1 change: 1 addition & 0 deletions docs/introduction/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ You need the following dependencies on your local machine to use Garden:
* Git
* rsync
* [Watchman](https://facebook.github.io/watchman/docs/install.html)
* [Helm](https://github.com/kubernetes/helm)
* Local installation of Kubernetes

### OSX
Expand Down
77 changes: 25 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"cli-highlight": "^2.0.0",
"cryo": "0.0.6",
"dedent": "^0.7.0",
"deep-diff": "^1.0.1",
"deep-map": "^1.5.0",
"dockerode": "^2.5.5",
"elegant-spinner": "^1.0.1",
Expand Down Expand Up @@ -68,6 +69,7 @@
"@types/bluebird": "^3.5.20",
"@types/chai": "^4.1.3",
"@types/dedent": "^0.7.0",
"@types/deep-diff": "0.0.31",
"@types/dockerode": "^2.5.4",
"@types/execa": "^0.9.0",
"@types/fs-extra": "^5.0.3",
Expand Down
1 change: 1 addition & 0 deletions src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export const DEFAULT_NAMESPACE = "default"
export const DEFAULT_PORT_PROTOCOL = "TCP"

export const GARDEN_ANNOTATION_PREFIX = "garden.io/"
export const GARDEN_ANNOTATION_KEYS_SERVICE = GARDEN_ANNOTATION_PREFIX + "service"
export const GARDEN_ANNOTATION_KEYS_VERSION = GARDEN_ANNOTATION_PREFIX + "version"

export const DEFAULT_TEST_TIMEOUT = 60 * 1000
2 changes: 2 additions & 0 deletions src/plugins/kubernetes/deployment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ export async function createDeployment(service: ContainerService, runtimeContext
labels: [],
},
spec: {
// TODO: set this for non-system pods
// automountServiceAccountToken: false, // this prevents the pod from accessing the kubernetes API
containers: [],
// TODO: make restartPolicy configurable
restartPolicy: "Always",
Expand Down
Loading

0 comments on commit 122e6dd

Please sign in to comment.