Fix k8s cluster configs to allow scraping from Prometheus
Change-Id: I2b23f69c0160ad4f16734b4b4d0553a69581be86
diff --git a/comac-in-a-box/Makefile b/comac-in-a-box/Makefile
index bfdaa3e..aa5faf6 100644
--- a/comac-in-a-box/Makefile
+++ b/comac-in-a-box/Makefile
@@ -90,6 +90,7 @@
-e "{'kube_version' : $(K8S_VERSION)}" \
-e "{'kube_network_plugin_multus' : True, 'multus_version' : stable}" \
-e "{'kube_proxy_mode': iptables}" \
+ -e "{'kube_proxy_metrics_bind_address' : 0.0.0.0:10249}" \
-e "{'kube_pods_subnet' : 192.168.0.0/17, 'kube_service_addresses' : 192.168.128.0/17}" \
-e "{'kube_apiserver_node_port_range' : 2000-36767}" \
-e "{'kubeadm_enabled': True}" \
diff --git a/comac/cluster-api/gcp/kustomizecomac.yaml b/comac/cluster-api/gcp/kustomizecomac.yaml
index 05b3ac9..c1dcf6f 100644
--- a/comac/cluster-api/gcp/kustomizecomac.yaml
+++ b/comac/cluster-api/gcp/kustomizecomac.yaml
@@ -21,10 +21,16 @@
clusterConfiguration:
apiServer:
extraArgs:
+ bind-address: 0.0.0.0
feature-gates: SCTPSupport=True
service-node-port-range: 2000-36767
+ controllerManager:
+ extraArgs:
+ bind-address: 0.0.0.0
+ feature-gates: SCTPSupport=True
scheduler:
extraArgs:
+ bind-address: 0.0.0.0
feature-gates: SCTPSupport=True
---
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2
@@ -35,10 +41,16 @@
clusterConfiguration:
apiServer:
extraArgs:
+ bind-address: 0.0.0.0
feature-gates: SCTPSupport=True
service-node-port-range: 2000-36767
+ controllerManager:
+ extraArgs:
+ bind-address: 0.0.0.0
+ feature-gates: SCTPSupport=True
scheduler:
extraArgs:
+ bind-address: 0.0.0.0
feature-gates: SCTPSupport=True
---
apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2
@@ -49,8 +61,14 @@
clusterConfiguration:
apiServer:
extraArgs:
+ bind-address: 0.0.0.0
feature-gates: SCTPSupport=True
service-node-port-range: 2000-36767
+ controllerManager:
+ extraArgs:
+ bind-address: 0.0.0.0
+ feature-gates: SCTPSupport=True
scheduler:
extraArgs:
+ bind-address: 0.0.0.0
feature-gates: SCTPSupport=True
diff --git a/comac/kubespray/extra-vars.yaml b/comac/kubespray/extra-vars.yaml
index b67911b..034ca39 100644
--- a/comac/kubespray/extra-vars.yaml
+++ b/comac/kubespray/extra-vars.yaml
@@ -33,6 +33,7 @@
kubelet_deployment_type: host
kubectl_localhost: true
kubeconfig_localhost: true
+kube_proxy_metrics_bind_address: 0.0.0.0:10249
kube_feature_gates: [SCTPSupport=True]
kube_pods_subnet: 172.18.0.0/17