Skip to content

Commit

Permalink
Make storage backend configurable
Browse files Browse the repository at this point in the history
Closes #3
  • Loading branch information
Benjamin P. Jung committed Sep 17, 2019
1 parent 828169a commit 1ce1c11
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 2 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,19 @@ 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.2.0] - 2019-09-17

Thanks again to [Steven Miller](https://github.com/sjmiller609) who provided input
for the configurable storage backend configuration.

### Added

- The storage backend has been made configurable.

### Updated

- Default tiller version has been updated to v2.14.3

## [3.1.0] - 2019-07-28

### Added
Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.2.0
5 changes: 5 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ resource "kubernetes_deployment" "this" {
value = var.tiller_history_max
}

env {
name = "TILLER_STORAGE"
value = var.tiller_storage
}

env {
name = "TILLER_TLS_ENABLE"
value = var.tiller_tls.enabled ? "1" : ""
Expand Down
21 changes: 20 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
variable "tiller_version" {
type = string
default = "2.14.2"
default = "2.14.3"
description = "Version of Tiller to be deployed."
}

Expand Down Expand Up @@ -34,6 +34,18 @@ variable "tiller_service_session_affinity" {
description = "Session affinity of the Tiller service."
}

variable "tiller_sql_connection_string" {
type = string
default = ""
description = "SQL connection string to use (only used if 'tiller_storage' is set to 'sql')."
}

variable "tiller_sql_dialect" {
type = string
default = "postgres"
description = "SQL dialect to use."
}

variable "tiller_image_pull_policy" {
type = string
default = "IfNotPresent"
Expand All @@ -46,6 +58,13 @@ variable "tiller_pod_node_selector" {
description = "Node selector to be applied to the tiller pod."
}

variable "tiller_storage" {
type = string
default = "configmap"
description = "Storage driver to use. One of 'configmap', 'memory', 'sql' or 'secret'."
}


variable "tiller_tls" {
type = object({
enabled = bool
Expand Down

0 comments on commit 1ce1c11

Please sign in to comment.