Pinning versions of k8s images.
Change-Id: Id8a99e8eb6722707949e11a73812442fbaa7b928
Related: PROD-19359
diff --git a/kubernetes/master/cluster.yml b/kubernetes/master/cluster.yml
index 78e91a0..864b031 100644
--- a/kubernetes/master/cluster.yml
+++ b/kubernetes/master/cluster.yml
@@ -5,8 +5,11 @@
- system.haproxy.proxy.listen.kubernetes.apiserver
parameters:
_param:
- kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
- kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.2.2
+ aptly_server_hostname: apt
+ kubernetes_netchecker_agent_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-server:v1.2.2
kubernetes:
master:
container: false
diff --git a/kubernetes/master/single.yml b/kubernetes/master/single.yml
index 684af64..2b67bd5 100644
--- a/kubernetes/master/single.yml
+++ b/kubernetes/master/single.yml
@@ -2,8 +2,11 @@
- service.kubernetes.master.single
parameters:
_param:
- kubernetes_netchecker_agent_image: quay.io/l23network/k8s-netchecker-agent:v1.0
- kubernetes_netchecker_server_image: quay.io/l23network/k8s-netchecker-server:v1.0
+ kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.2.2
+ aptly_server_hostname: apt
+ kubernetes_netchecker_agent_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-agent:v1.2.2
+ kubernetes_netchecker_server_image_local: ${_param:aptly_server_hostname}:5000/mirantis/k8s-netchecker-server:v1.2.2
kubernetes:
master:
container: false
diff --git a/kubernetes/pool/cluster.yml b/kubernetes/pool/cluster.yml
index d223d57..dfcfbcc 100644
--- a/kubernetes/pool/cluster.yml
+++ b/kubernetes/pool/cluster.yml
@@ -4,12 +4,20 @@
parameters:
_param:
# component docker images
- kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0
+ kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:v2.6.1
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.2.0
+ #Local versions of images
+ aptly_server_hostname: apt
+ kubernetes_calico_calicoctl_image_local: ${_param:aptly_server_hostname}:5000/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image_local: ${_param:aptly_server_hostname}:5000/node:v2.6.1
+ kubernetes_calico_cni_image_local: ${_param:aptly_server_hostname}:5000/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image_local: ${_param:aptly_server_hostname}:5000/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image_local: ${_param:aptly_server_hostname}:5000/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image_local: ${_param:aptly_server_hostname}:5000/contrail-network-controller:v1.2.0
kubernetes:
pool:
diff --git a/kubernetes/pool/single.yml b/kubernetes/pool/single.yml
index d6282c3..fd17078 100644
--- a/kubernetes/pool/single.yml
+++ b/kubernetes/pool/single.yml
@@ -4,12 +4,20 @@
parameters:
_param:
# component docker images
- kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:latest
- kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:latest
- kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:latest
- kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
- kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.0.0
- kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.0.0
+ kubernetes_calico_calicoctl_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/node:v2.6.1
+ kubernetes_calico_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/projectcalico/calico/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/contrail-integration/contrail-network-controller:v1.2.0
+ #Local versions of images
+ aptly_server_hostname: apt
+ kubernetes_calico_calicoctl_image_local: ${_param:aptly_server_hostname}:5000/ctl:v1.6.1-38-20171010022253
+ kubernetes_calico_image_local: ${_param:aptly_server_hostname}:5000/node:v2.6.1
+ kubernetes_calico_cni_image_local: ${_param:aptly_server_hostname}:5000/cni:v1.11.0-31-20171010012204
+ kubernetes_hyperkube_image_local: ${_param:aptly_server_hostname}:5000/hyperkube-amd64:v1.8.11
+ kubernetes_contrail_cni_image_local: ${_param:aptly_server_hostname}:5000/contrail-cni:v1.2.0
+ kubernetes_contrail_network_controller_image_local: ${_param:aptly_server_hostname}:5000/contrail-network-controller:v1.2.0
kubernetes:
pool: