Update k8s-ha-* models
Related-PROD: PROD-25976
Change-Id: Id31e6604c71534086e90b63ae1c0cf3a319ec0b8
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index 62ae9a1..97181e9 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -1,5 +1,7 @@
parameters:
_param:
+ # General
+ linux_system_codename: xenial
salt_minion_ca_host: ${_param:infra_config_hostname}.${_param:cluster_domain}
salt_minion_ca_authority: salt_master_ca
@@ -18,7 +20,9 @@
etcd_initial_token: IN7KaRMSo3xkGxkjAAPtkRkAgqN4ZNRq
# component docker images
- kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.11.3-2
+ kubernetes_hyperkube_source: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/hyperkube-binaries/hyperkube_v1.12.3-2_1544133573591
+ kubernetes_hyperkube_source_hash: md5=fc23eaf3ba63d9ed9d141f465f584012
+ kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.12.3-2
kubernetes_virtlet_image: mirantis/virtlet:v1.4.1
kubernetes_criproxy_version: v0.12.0
kubernetes_criproxy_checksum: md5=371cacd3d8568eb88425498b48a649dd
@@ -26,19 +30,11 @@
# kube-controllers image is temporarily added here as it's not defined in TCP-QA by now
kubernetes_calico_kube_controllers_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/kube-controllers:v3.1.3
- # switches of addons
- kubernetes_addon_namespace: kube-system
- kubernetes_dns: false
- kubernetes_dashboard: true
- kubernetes_helm_enabled: false
- kubernetes_netchecker_enabled: true
- kubernetes_calico_policy_enabled: false
- kubernetes_virtlet_enabled: false
-
# addresses and hostnames
kubernetes_internal_api_address: 10.254.0.1
+ kubernetes_internal_dns_address: 10.254.0.10
kubernetes_control_hostname: ctl
- kubernetes_control_address: 192.168.10.253
+ kubernetes_control_address: 172.16.10.253
kubernetes_control_node01_hostname: ctl01
kubernetes_control_node02_hostname: ctl02
kubernetes_control_node03_hostname: ctl03
@@ -46,22 +42,19 @@
kubernetes_control_node01_address: 172.16.10.101
kubernetes_control_node02_address: 172.16.10.102
kubernetes_control_node03_address: 172.16.10.103
- kubernetes_control_node01_deploy_address: 192.168.10.101
- kubernetes_control_node02_deploy_address: 192.168.10.102
- kubernetes_control_node03_deploy_address: 192.168.10.103
cluster_vip_address: ${_param:kubernetes_control_address}
- cluster_local_address: ${_param:deploy_address}
+ cluster_local_address: ${_param:single_address}
# etcd stuff
cluster_node01_hostname: ${_param:kubernetes_control_node01_hostname}
- cluster_node01_address: ${_param:kubernetes_control_node01_deploy_address}
+ cluster_node01_address: ${_param:kubernetes_control_node01_address}
cluster_node01_port: 4001
cluster_node02_hostname: ${_param:kubernetes_control_node02_hostname}
- cluster_node02_address: ${_param:kubernetes_control_node02_deploy_address}
+ cluster_node02_address: ${_param:kubernetes_control_node02_address}
cluster_node02_port: 4001
cluster_node03_hostname: ${_param:kubernetes_control_node03_hostname}
- cluster_node03_address: ${_param:kubernetes_control_node03_deploy_address}
+ cluster_node03_address: ${_param:kubernetes_control_node03_address}
cluster_node03_port: 4001
# calico
@@ -75,14 +68,44 @@
kubernetes_metallb_addresses_pool: 172.16.10.60-172.16.10.80
# switches of addons
- kubernetes_coredns_enabled: true
- kubernetes_externaldns_enabled: false
- kubernetes_metallb_enabled: false
- kubernetes_ingressnginx_enabled: false
- kubernetes_metrics_server_enabled: false
+ kubernetes_kubedns_enabled: False
+ kubernetes_externaldns_enabled: False
+ kubernetes_coredns_enabled: True
+ kubernetes_dashboard: True
+ kubernetes_virtlet_enabled: False
+ kubernetes_flannel_enabled: False
+ kubernetes_genie_enabled: False
+ kubernetes_calico_enabled: True
+ kubernetes_opencontrail_enabled: False
+ kubernetes_contrail_network_controller_enabled: False
+ kubernetes_metallb_enabled: False
+ kubernetes_ingressnginx_enabled: False
+ kubernetes_rbd_enabled: False
+ kubernetes_helm_enabled: False
+ kubernetes_netchecker_enabled: True
+ kubernetes_calico_policy_enabled: False
+ kubernetes_metrics_server_enabled: False
+
+ kubernetes_ingressnginx_controller_replicas: 1
+ kubernetes_virtlet_use_apparmor: False
+
+ kubernetes_addon_namespace: kube-system
+
+
+ # Cloud providers parameters
+
+ kubernetes_cloudprovider_enabled: False
+ kubernetes_cloudprovider_type: 'openstack'
linux:
network:
+ resolv:
+ dns:
+ - ${_param:dns_server01}
+ - ${_param:dns_server02}
+ - ${_param:kubernetes_internal_dns_address}
+ search:
+ - ${_param:cluster_domain}
host:
ctl:
address: ${_param:kubernetes_control_address}