Skip to content

Commit

Permalink
Release v3.0.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin P. Jung committed Jul 3, 2019
1 parent b9d2013 commit 0f60cd2
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 14 deletions.
1 change: 1 addition & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
## Contributors

- Noah Fontes <[email protected]>
- Steven Miller <[email protected]>
22 changes: 22 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [3.0.0] - 2019-07-03

Thanks to [Steven Miller](https://github.com/sjmiller609) for the pull request
that initiated this release!

### Updated

- The minimum required version of Terraform is now v0.12.

### Changed

- The service account token is now automatically mounted which reduces the
complexity of the module's configuration slightly by using a new feature
that has been introduced with version 1.8 of the kubernetes provider plugin.

### Added

- A node selector can now be specified to control where the tiller pod
should be deployed.
- The parameter `sessionAffinity` can now be specified when configuring
the Tiller service.

## [2.0.0] - 2019-06-26

Thanks to [Noah Fontes](https://github.com/impl) for the pull request
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
3.0.0
20 changes: 8 additions & 12 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ resource "kubernetes_service_account" "this" {
"field.cattle.io/description" = "Helm Package Manager: required server-side component"
}
}
automount_service_account_token = true
}

resource "kubernetes_cluster_role_binding" "this" {
Expand Down Expand Up @@ -74,19 +75,19 @@ resource "kubernetes_deployment" "this" {
labels = {
"app.kubernetes.io/name" = "helm"
"app.kubernetes.io/component" = "tiller"
"a.kubernetes.io/version" = var.tiller_version

# helm uses these pod labels to find tiller, so they must be set:
app = "helm"
name = "tiller"

version = var.tiller_version
}
}

spec {
volume {
name = kubernetes_service_account.this.default_secret_name
secret {
secret_name = kubernetes_service_account.this.default_secret_name
}
}

automount_service_account_token = true

#priority_class_name = "system-cluster-critical"
service_account_name = kubernetes_service_account.this.metadata[0].name
Expand Down Expand Up @@ -137,15 +138,10 @@ resource "kubernetes_deployment" "this" {
timeout_seconds = 1
}

volume_mount {
mount_path = "/var/run/secrets/kubernetes.io/serviceaccount"
name = kubernetes_service_account.this.default_secret_name
read_only = true
}

resources {
}
}
node_selector = var.tiller_pod_node_selector
}
}
}
Expand Down
11 changes: 11 additions & 0 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,20 @@ variable "tiller_service_type" {
description = "Type of Tiller's Kubernetes service object."
}

variable "tiller_service_session_affinity" {
type = string
default = "None"
description = "Session affinity of the Tiller service."
}

variable "tiller_image_pull_policy" {
type = string
default = "IfNotPresent"
description = "Default pull policy to be used for the Tiller container image."
}

variable "tiller_pod_node_selector" {
type = map(string)
default = {}
description = "Node selector to be applied to the tiller pod."
}
1 change: 0 additions & 1 deletion versions.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

terraform {
required_version = ">= 0.12"
}

0 comments on commit 0f60cd2

Please sign in to comment.