Merge "Refactor port->secure_port"
diff --git a/kubernetes/files/kube-addons/dns/kubedns-rc.yaml b/kubernetes/files/kube-addons/dns/kubedns-rc.yaml
index 01eae39..c34a1a1 100644
--- a/kubernetes/files/kube-addons/dns/kubedns-rc.yaml
+++ b/kubernetes/files/kube-addons/dns/kubedns-rc.yaml
@@ -81,7 +81,7 @@
initialDelaySeconds: 3
timeoutSeconds: 5
args:
- - --domain={{ common.addons.dns.domain }}.
+ - --domain={{ common.addons.dns.domain|replace('_', '-') }}.
- --dns-port=10053
- --config-map=kube-dns
- -v=2
@@ -141,8 +141,8 @@
args:
- --v=2
- --logtostderr
- - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ common.addons.dns.domain }},5,A
- - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ common.addons.dns.domain }},5,A
+ - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ common.addons.dns.domain|replace('_', '-') }},5,A
+ - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ common.addons.dns.domain|replace('_', '-') }},5,A
ports:
- containerPort: 10054
name: metrics
diff --git a/kubernetes/files/kubelet/default.master b/kubernetes/files/kubelet/default.master
index 5367da1..1543200 100644
--- a/kubernetes/files/kubelet/default.master
+++ b/kubernetes/files/kubelet/default.master
@@ -6,7 +6,7 @@
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged={{ master.kubelet.allow_privileged }} \
--cluster_dns={{ common.addons.dns.server }} \
---cluster_domain={{ common.addons.dns.domain }} \
+--cluster_domain={{ common.addons.dns.domain|replace('_', '-') }} \
--cni-bin-dir={{ master.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
--v={{ master.get('verbosity', 2) }} \
--node-labels=node-role.kubernetes.io/master=true \
diff --git a/kubernetes/files/kubelet/default.pool b/kubernetes/files/kubelet/default.pool
index 987c7e4..1bbeb1a 100644
--- a/kubernetes/files/kubelet/default.pool
+++ b/kubernetes/files/kubelet/default.pool
@@ -8,7 +8,7 @@
--pod-manifest-path=/etc/kubernetes/manifests \
--allow-privileged={{ pool.kubelet.allow_privileged }} \
--cluster_dns={{ common.addons.dns.server }} \
---cluster_domain={{ common.addons.dns.domain }} \
+--cluster_domain={{ common.addons.dns.domain|replace('_', '-') }} \
--cni-bin-dir={{ pool.apiserver.get('cni_bin_dir', '/opt/cni/bin') }} \
--v={{ pool.get('verbosity', 2) }} \
--node-labels=node-role.kubernetes.io/node=true \
diff --git a/kubernetes/files/virtlet/kubelet.conf b/kubernetes/files/virtlet/kubelet.conf
index db0baa4..f8cf16d 100644
--- a/kubernetes/files/virtlet/kubelet.conf
+++ b/kubernetes/files/virtlet/kubelet.conf
@@ -32,7 +32,7 @@
"clusterDNS": [
"10.254.0.10"
],
- "clusterDomain": "{{ common.cluster_domain }}",
+ "clusterDomain": "{{ common.cluster_domain|replace('_', '-') }}",
"cniBinDir": "/opt/cni/bin",
"cniConfDir": "",
"containerRuntime": "docker",
diff --git a/kubernetes/meta/prometheus.yml b/kubernetes/meta/prometheus.yml
index a8f71cc..df0ee76 100644
--- a/kubernetes/meta/prometheus.yml
+++ b/kubernetes/meta/prometheus.yml
@@ -11,6 +11,11 @@
server:
{%- if network.get('engine', '') == 'calico' and network.get('prometheus', {}).get('enabled', False) %}
target:
+ kubernetes:
+ enabled: true
+ api_ip: ${_param:kubernetes_control_address}
+ cert_name: prometheus-server.crt
+ key_name: prometheus-server.key
static:
calico:
endpoint:
diff --git a/metadata/service/pool/single.yml b/metadata/service/pool/single.yml
index fe25eb2..0d4085b 100644
--- a/metadata/service/pool/single.yml
+++ b/metadata/service/pool/single.yml
@@ -22,7 +22,7 @@
address: 0.0.0.0
cluster_dns: 10.254.0.10
allow_privileged: True
- cluster_domain: ${param:kubernetes_cluster_domain}
+ cluster_domain: ${_param:kubernetes_cluster_domain}
kubelet:
config: /etc/kubernetes/manifests
allow_privileged: True