Skip to content

Commit

Permalink
Merge branch 'issue_43' of github.com:ogreface/terraform-google-kuber…
Browse files Browse the repository at this point in the history
…netes-engine into issue_43
  • Loading branch information
Rishi Malik committed Jan 4, 2019
2 parents 57e8334 + e4345be commit 911a75e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Changed
* Set `horizontal_pod_autoscaling` to `true` by default. #42

## [v0.4.0] - 2018-12-19
### Added
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Then perform the following commands on the root folder:
| Name | Description | Type | Default | Required |
|------|-------------|:----:|:-----:|:-----:|
| description | The description of the cluster | string | `` | no |
| horizontal_pod_autoscaling | Enable horizontal pod autoscaling addon | string | `false` | no |
| horizontal_pod_autoscaling | Enable horizontal pod autoscaling addon | string | `true` | no |
| http_load_balancing | Enable httpload balancer addon | string | `true` | no |
| ip_masq_link_local | Whether to masquerade traffic to the link-local prefix (169.254.0.0/16). | string | `false` | no |
| ip_masq_resync_interval | The interval at which the agent attempts to sync its ConfigMap file from the disk. | string | `60s` | no |
Expand Down
2 changes: 1 addition & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ variable "master_authorized_networks_config" {

variable "horizontal_pod_autoscaling" {
description = "Enable horizontal pod autoscaling addon"
default = false
default = true
}

variable "http_load_balancing" {
Expand Down

0 comments on commit 911a75e

Please sign in to comment.