Merge "Add new user degorenko to members list"
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
index 94ccce2..2937b9a 100644
--- a/jenkins/client/job/deploy/lab/component/stacklight.yml
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -4,18 +4,24 @@
_param:
jenkins_deploy_jobs:
- stack_name: stacklight_k8s_calico
+ heat_stack_zone_job_param: "mcp-stacklight"
+ openstack_api_projects_job_param: "mcp-stacklight"
stack_env: devcloud
stack_type: heat
stack_install: core,k8s,calico,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_contrail
+ heat_stack_zone_job_param: "mcp-stacklight"
+ openstack_api_projects_job_param: "mcp-stacklight"
stack_env: devcloud
stack_type: heat
stack_install: core,openstack,contrail,stacklight
stack_test: ""
job_timer: "H H(0-6) * * *"
- stack_name: stacklight_os_ovs
+ heat_stack_zone_job_param: "mcp-stacklight"
+ openstack_api_projects_job_param: "mcp-stacklight"
stack_env: devcloud
stack_type: heat
stack_install: core,openstack,ovs,stacklight
diff --git a/jenkins/client/job/k8s-test/init.yml b/jenkins/client/job/k8s-test/init.yml
index cfce810..c26bfce 100644
--- a/jenkins/client/job/k8s-test/init.yml
+++ b/jenkins/client/job/k8s-test/init.yml
@@ -3,4 +3,6 @@
- system.jenkins.client.job.k8s-test.mcp-k8s-merge-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-dashboard-test-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-dashboard-merge-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-metallb-test-pipeline
+- system.jenkins.client.job.k8s-test.mcp-k8s-metallb-merge-pipeline
- system.jenkins.client.job.k8s-test.mcp-k8s-formula-test-pipeline
diff --git a/kubernetes/common.yml b/kubernetes/common.yml
index 4a4dc5e..9151987 100644
--- a/kubernetes/common.yml
+++ b/kubernetes/common.yml
@@ -19,6 +19,7 @@
kubernetes_sriov_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/sriov-cni
kubernetes_cniplugins_repo: https://docker-prod-local.artifactory.mirantis.com/artifactory/binary-prod-local/mirantis/kubernetes/containernetworking-plugins
kubernetes_dashboard_repo: k8s.gcr.io
+ kubernetes_coredns_repo: coredns
# component docker images
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
@@ -43,8 +44,8 @@
kubernetes_genie_source: ${_param:kubernetes_genie_repo}/genie_v1.0-138-gbf5dbaa
kubernetes_genie_source_hash: md5=b024052ed4ecb1d5354e0cc8f51afaca
kubernetes_flannel_image: ${_param:kubernetes_flannel_repo}/flannel:v0.10.0-amd64
- kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.6.2
- kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.6.2
+ kubernetes_metallb_controller_image: ${_param:kubernetes_metallb_repo}/controller:v0.7.3
+ kubernetes_metallb_speaker_image: ${_param:kubernetes_metallb_repo}/speaker:v0.7.3
kubernetes_sriov_source: ${_param:kubernetes_sriov_repo}/sriov_v0.3-8-g8b7ed98
kubernetes_sriov_source_hash: md5=c0cc33202afd02e4cc44b977a8faf6e7
kubernetes_cniplugins_source: ${_param:kubernetes_cniplugins_repo}/cni-plugins_v0.7.1-48-g696b1f9.tar.gz
@@ -53,12 +54,13 @@
kubernetes_fluentd_aggregator_image: fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
kubernetes_fluentd_logger_image: fluent/fluentd-kubernetes-daemonset:v1.2-debian-stackdriver
kubernetes_telegraf_image: docker.io/telegraf:1.5.3
+ kubernetes_coredns_image: ${_param:kubernetes_coredns_repo}/coredns:1.2.0
kubelet_fail_on_swap: true
kubernetes_dashboard_enabled: true
- kubernetes_kubedns_enabled: true
+ kubernetes_kubedns_enabled: false
kubernetes_externaldns_enabled: false
- kubernetes_coredns_enabled: false
+ kubernetes_coredns_enabled: true
kubernetes_externaldns_provider: coredns
kubernetes_virtlet_enabled: false
kubernetes_flannel_enabled: false
@@ -163,6 +165,7 @@
provider: ${_param:kubernetes_externaldns_provider}
coredns:
enabled: ${_param:kubernetes_coredns_enabled}
+ image: ${_param:kubernetes_coredns_image}
contrail_network_controller:
enabled: ${_param:kubernetes_contrail_network_controller_enabled}
image: ${_param:kubernetes_contrail_network_controller_image}