Remove image paths for Calico artifacts
Related ticket: PROD-20770
Change-Id: I2c6d917ef55e5e5c3306f29a90b087d0f0692a61
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
index 0fcc165..2f971f0 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/control.yml
@@ -38,11 +38,8 @@
enabled: ${_param:kubernetes_helm_enabled}
calico_policy:
enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
dns:
enabled: ${_param:kubernetes_dns}
diff --git a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
index 02e61af..79bf6cc 100644
--- a/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico-flannel-virtlet/kubernetes/init.yml
@@ -21,11 +21,6 @@
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
# 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_calico_policy_image: calico/kube-policy-controller:v0.5.4
-
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
@@ -36,8 +31,6 @@
kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_genie_image: mirantis/cnigenie:latest
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/control.yml b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
index 4dd4bc3..c5dcc3d 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/control.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/control.yml
@@ -37,11 +37,8 @@
enabled: ${_param:kubernetes_helm_enabled}
calico_policy:
enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
dns:
enabled: ${_param:kubernetes_dns}
diff --git a/classes/cluster/k8s-ha-calico/kubernetes/init.yml b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
index fbbcb8d..f24a54c 100644
--- a/classes/cluster/k8s-ha-calico/kubernetes/init.yml
+++ b/classes/cluster/k8s-ha-calico/kubernetes/init.yml
@@ -21,11 +21,6 @@
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
# 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_calico_policy_image: calico/kube-policy-controller:v0.5.4
-
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
@@ -36,8 +31,6 @@
kubernetes_dnsmasq_image: gcr.io/google_containers/k8s-dns-dnsmasq-amd64:1.14.5
kubernetes_sidecar_image: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5
kubernetes_dns_autoscaler_image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:stable
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:stable
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
# switches of addons
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
index 501769f..74b1eb1 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/control.yml
@@ -40,11 +40,8 @@
enabled: ${_param:kubernetes_helm_enabled}
calico_policy:
enabled: ${_param:kubernetes_calico_policy_enabled}
- image: ${_param:kubernetes_calico_policy_image}
netchecker:
enabled: ${_param:kubernetes_netchecker_enabled}
- agent_image: ${_param:kubernetes_netchecker_agent_image}
- server_image: ${_param:kubernetes_netchecker_server_image}
agent_probeurls: ${_param:kubernetes_netchecker_agent_probeurls}
dns:
enabled: ${_param:kubernetes_dns}
diff --git a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
index eb22748..2f965dd 100644
--- a/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-calico/kubernetes/init.yml
@@ -21,14 +21,8 @@
kubernetes_docker_package: docker-engine=1.13.1-0~ubuntu-xenial
# 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_calico_policy_image: calico/kube-policy-controller:v0.5.4
kubernetes_hyperkube_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.10.4-4
kubernetes_pause_image: docker-prod-virtual.docker.mirantis.net/mirantis/kubernetes/pause-amd64:v1.10.4-4
- kubernetes_netchecker_agent_image: mirantis/k8s-netchecker-agent:v1.1.2
- kubernetes_netchecker_server_image: mirantis/k8s-netchecker-server:v1.1.2
kubernetes_netchecker_agent_probeurls: "http://ipinfo.io"
kubernetes_virtlet_image: mirantis/virtlet:v1.1.2
kubernetes_criproxy_version: v0.11.0