Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Commit

Permalink
enable_aggregation: Set the default to true
Browse files Browse the repository at this point in the history
Aggregation layer is now a requirement when running conformance tests,
so it should be enabled by default.

Additionally, with usage of the latest cert-manager it is obligatory to enable api
aggregation on the apiserver.

This commit changes the behavior of the installer to enable aggregation
by default.

Signed-off-by: Suraj Deshmukh <suraj@kinvolk.io>
Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
  • Loading branch information
surajssd authored and invidian committed Jan 14, 2020
1 parent 0af508c commit 8066b76
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions aws/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ variable "enable_reporting" {
}

variable "enable_aggregation" {
description = "Enable the Kubernetes Aggregation Layer (defaults to false)"
description = "Enable the Kubernetes Aggregation Layer (defaults to true)"
type = bool
default = false
default = true
}

# Certificates
Expand Down
4 changes: 2 additions & 2 deletions azure/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ variable "enable_reporting" {
}

variable "enable_aggregation" {
description = "Enable the Kubernetes Aggregation Layer (defaults to false)"
description = "Enable the Kubernetes Aggregation Layer (defaults to true)"
type = bool
default = false
default = true
}

# Certificates
Expand Down
4 changes: 2 additions & 2 deletions bare-metal/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ variable "enable_reporting" {
}

variable "enable_aggregation" {
description = "Enable the Kubernetes Aggregation Layer (defaults to false)"
description = "Enable the Kubernetes Aggregation Layer (defaults to true)"
type = bool
default = false
default = true
}

# Certificates
Expand Down
2 changes: 1 addition & 1 deletion docs/flatcar-linux/kvm-libvirt.md
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ source.
|:-----|:------------|:--------|:--------|
| cluster_domain_suffix | Queries for domains with the suffix will be answered by coredns | "cluster.local" | "k8s.example.com" |
| controller_count | Number of controller VMs | 1 | 1 |
| enable_aggregation | Enable the Kubernetes Aggregation Layer | false | true |
| enable_aggregation | Enable the Kubernetes Aggregation Layer | true | false |
| enable_reporting | Enable usage or analytics reporting to upstreams (Calico) | false | true |
| network_mtu | CNI interface MTU (applies to calico only) | 1480 | 8981 |
| network_ip_autodetection_method | Method to autodetect the host IPv4 address (applies to calico only) | "first-found" or "can-reach=192.168.192.1" |
Expand Down
2 changes: 1 addition & 1 deletion docs/flatcar-linux/packet.md
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ Reference the DNS zone id with `"${aws_route53_zone.zone-for-clusters.zone_id}"`
| service_cidr | CIDR IPv4 range to assign to Kubernetes services | "10.3.0.0/16" | "10.3.0.0/24" |
| cluster_domain_suffix | FQDN suffix for Kubernetes services answered by coredns. | "cluster.local" | "k8s.example.com" |
| enable_reporting | Enable usage or analytics reporting to upstreams (Calico) | false | true |
| enable_aggregation | Enable the Kubernetes Aggreagation Layer | false | true |
| enable_aggregation | Enable the Kubernetes Aggreagation Layer | true | false |
| reservation_ids | Map Packet hardware reservation IDs to instances. | {} | { controller-0 = "55555f20-a1fb-55bd-1e11-11af11d11111" } |
| reservation_ids_default | Default hardware reservation ID for nodes not listed in the `reservation_ids` map. | "" | "next-available"|
| certs_validity_period_hours | Validity of all the certificates in hours | 8760 | 17520 |
Expand Down
4 changes: 2 additions & 2 deletions google-cloud/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ variable "enable_reporting" {
}

variable "enable_aggregation" {
description = "Enable the Kubernetes Aggregation Layer (defaults to false)"
description = "Enable the Kubernetes Aggregation Layer (defaults to true)"
type = bool
default = false
default = true
}

# Certificates
Expand Down
4 changes: 2 additions & 2 deletions kvm-libvirt/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ variable "enable_reporting" {
}

variable "enable_aggregation" {
description = "Enable the Kubernetes Aggregation Layer (defaults to false)"
description = "Enable the Kubernetes Aggregation Layer (defaults to true)"
type = bool
default = false
default = true
}

# Certificates
Expand Down
4 changes: 2 additions & 2 deletions packet/flatcar-linux/kubernetes/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,9 @@ variable "node_private_cidr" {
}

variable "enable_aggregation" {
description = "Enable the Kubernetes Aggregation Layer (defaults to false)"
description = "Enable the Kubernetes Aggregation Layer (defaults to true)"
type = bool
default = false
default = true
}

variable "reservation_ids" {
Expand Down

0 comments on commit 8066b76

Please sign in to comment.