From de422c822dac535e21a1571c019bd5425c485361 Mon Sep 17 00:00:00 2001
From: Di Xu <dixudx@users.noreply.github.com>
Date: Wed, 29 Nov 2017 18:39:52 +0800
Subject: [PATCH] update nginx tag to use multi-arch docker image (#2009)

---
 roles/download/defaults/main.yml        | 2 +-
 roles/kubernetes/node/defaults/main.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index ddb3a9041..42d3b0e51 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -91,7 +91,7 @@ weave_npc_image_repo: "weaveworks/weave-npc"
 weave_npc_image_tag: "{{ weave_version }}"
 
 nginx_image_repo: nginx
-nginx_image_tag: 1.11.4-alpine
+nginx_image_tag: 1.13
 dnsmasq_version: 2.78
 dnsmasq_image_repo: "andyshinn/dnsmasq"
 dnsmasq_image_tag: "{{ dnsmasq_version }}"
diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml
index 0434c26f2..2d7242cda 100644
--- a/roles/kubernetes/node/defaults/main.yml
+++ b/roles/kubernetes/node/defaults/main.yml
@@ -58,7 +58,7 @@ nginx_cpu_requests: 25m
 #   - extensions/v1beta1/deployments=true
 
 nginx_image_repo: nginx
-nginx_image_tag: 1.11.4-alpine
+nginx_image_tag: 1.13
 
 etcd_config_dir: /etc/ssl/etcd
 
-- 
GitLab