Merge "Tune default telemetry parameters"
diff --git a/aptly/server/single.yml b/aptly/server/single.yml
index e8da341..9f2d401 100644
--- a/aptly/server/single.yml
+++ b/aptly/server/single.yml
@@ -8,47 +8,6 @@
aptly_server_secure: true
aptly_server_mirror_sources: false
aptly_server_mirror_ubuntu_sources: ${_param:aptly_server_mirror_sources}
- iptables:
- service:
- enabled: true
- chain:
- INPUT:
- rules:
- # Only local network can access WebDav and aptly API
- - destination_port: 8088
- protocol: tcp
- source_network: 10.0.107.0/24
- jump: ACCEPT
- - destination_port: 8088
- protocol: tcp
- source_network: 185.22.96.0/22
- jump: ACCEPT
- - destination_port: 8088
- protocol: tcp
- source_network: 10.0.174.0/23
- jump: ACCEPT
- - destination_port: 8088
- protocol: tcp
- source_network: 10.0.175.0/23
- jump: ACCEPT
- - destination_port: 8088
- protocol: tcp
- jump: DROP
- - destination_port: 8081
- protocol: tcp
- source_network: 10.0.107.0/24
- jump: ACCEPT
- - destination_port: 8081
- protocol: tcp
- source_network: 10.0.174.0/23
- jump: ACCEPT
- - destination_port: 8081
- protocol: tcp
- source_network: 10.0.175.0/23
- jump: ACCEPT
- - destination_port: 8081
- protocol: tcp
- jump: DROP
nginx:
server:
site:
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index 82107a3..f977997 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -108,6 +108,7 @@
metallb:
enabled: ${_param:kubernetes_metallb_enabled}
master:
+ enabled: false
kubelet:
fail_on_swap: ${_param:kubelet_fail_on_swap}
container: false
@@ -129,6 +130,7 @@
source: ${_param:kubernetes_sriov_source}
source_hash: ${_param:kubernetes_sriov_source_hash}
pool:
+ enabled: false
kubelet:
fail_on_swap: ${_param:kubelet_fail_on_swap}
container: false
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 199537f..5d0933c 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -7,6 +7,7 @@
parameters:
kubernetes:
master:
+ enabled: true
network:
calico:
prometheus:
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index 8d75ca2..1898549 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -1,3 +1,7 @@
classes:
- service.kubernetes.master.single
- system.kubernetes.common
+parameters:
+ kubernetes:
+ master:
+ enabled: true
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index fca14e7..61ebc3c 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -5,6 +5,7 @@
parameters:
kubernetes:
pool:
+ enabled: true
network:
calico:
prometheus:
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index 4e8c8ab..06178df 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -3,6 +3,9 @@
- service.docker.host
- system.kubernetes.common
parameters:
+ kubernetes:
+ pool:
+ enabled: true
docker:
host:
options: