From b4989b5a2af23695f4dbc61f1c82668a39a4d8bd Mon Sep 17 00:00:00 2001
From: Mikael Berthe <mikael@lilotux.net>
Date: Sun, 30 Sep 2018 05:44:01 +0200
Subject: [PATCH] Fix netcheck agent/server image variable names (#3417)
According to the documentation, container images are described
by vars like `foo_image_repo` and `foo_image_tag`.
The variables netcheck_{agent,server}_{img_repo,tag} do not
follow that convention.
---
roles/download/defaults/main.yml | 16 ++++++++--------
roles/kubernetes-apps/ansible/defaults/main.yml | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 2ca07c103..bddb8cb69 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -128,10 +128,10 @@ pod_infra_image_tag: "{{ pod_infra_version }}"
install_socat_image_repo: "xueshanf/install-socat"
install_socat_image_tag: "latest"
netcheck_version: "v1.2.2"
-netcheck_agent_img_repo: "mirantis/k8s-netchecker-agent"
-netcheck_agent_tag: "{{ netcheck_version }}"
-netcheck_server_img_repo: "mirantis/k8s-netchecker-server"
-netcheck_server_tag: "{{ netcheck_version }}"
+netcheck_agent_image_repo: "mirantis/k8s-netchecker-agent"
+netcheck_agent_image_tag: "{{ netcheck_version }}"
+netcheck_server_image_repo: "mirantis/k8s-netchecker-server"
+netcheck_server_image_tag: "{{ netcheck_version }}"
weave_kube_image_repo: "docker.io/weaveworks/weave-kube"
weave_kube_image_tag: "{{ weave_version }}"
weave_npc_image_repo: "docker.io/weaveworks/weave-npc"
@@ -201,8 +201,8 @@ downloads:
netcheck_server:
enabled: "{{ deploy_netchecker }}"
container: true
- repo: "{{ netcheck_server_img_repo }}"
- tag: "{{ netcheck_server_tag }}"
+ repo: "{{ netcheck_server_image_repo }}"
+ tag: "{{ netcheck_server_image_tag }}"
sha256: "{{ netcheck_server_digest_checksum|default(None) }}"
groups:
- k8s-cluster
@@ -210,8 +210,8 @@ downloads:
netcheck_agent:
enabled: "{{ deploy_netchecker }}"
container: true
- repo: "{{ netcheck_agent_img_repo }}"
- tag: "{{ netcheck_agent_tag }}"
+ repo: "{{ netcheck_agent_image_repo }}"
+ tag: "{{ netcheck_agent_image_tag }}"
sha256: "{{ netcheck_agent_digest_checksum|default(None) }}"
groups:
- k8s-cluster
diff --git a/roles/kubernetes-apps/ansible/defaults/main.yml b/roles/kubernetes-apps/ansible/defaults/main.yml
index 9ee12ea07..0d6a50a17 100644
--- a/roles/kubernetes-apps/ansible/defaults/main.yml
+++ b/roles/kubernetes-apps/ansible/defaults/main.yml
@@ -30,8 +30,8 @@ deploy_netchecker: false
netchecker_port: 31081
agent_report_interval: 15
netcheck_namespace: default
-agent_img: "{{ netcheck_agent_img_repo }}:{{ netcheck_agent_tag }}"
-server_img: "{{ netcheck_server_img_repo }}:{{ netcheck_server_tag }}"
+agent_img: "{{ netcheck_agent_image_repo }}:{{ netcheck_agent_image_tag }}"
+server_img: "{{ netcheck_server_image_repo }}:{{ netcheck_server_image_tag }}"
# Limits for netchecker apps
netchecker_agent_cpu_limit: 30m
--
GitLab