From 9b1980cfff340dfbd817ff48eeb86f6a95dfb1ad Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Tue, 7 Apr 2020 17:07:42 +0200
Subject: [PATCH] Change docker.io repo to variable and upgrade alb image
(#5898)
---
roles/download/defaults/main.yml | 4 ++--
.../ingress_controller/alb_ingress_controller/README.md | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 3557bad95..59cb5d11e 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -513,8 +513,8 @@ local_path_provisioner_image_repo: "{{ docker_image_repo }}/rancher/local-path-p
local_path_provisioner_image_tag: "v0.0.2"
ingress_nginx_controller_image_repo: "{{ quay_image_repo }}/kubernetes-ingress-controller/nginx-ingress-controller"
ingress_nginx_controller_image_tag: "0.30.0"
-alb_ingress_image_repo: "docker.io/amazon/aws-alb-ingress-controller"
-alb_ingress_image_tag: "v1.1.4"
+alb_ingress_image_repo: "{{ docker_image_repo }}/amazon/aws-alb-ingress-controller"
+alb_ingress_image_tag: "v1.1.6"
cert_manager_version: "v0.11.0"
cert_manager_controller_image_repo: "{{ quay_image_repo }}/jetstack/cert-manager-controller"
cert_manager_controller_image_tag: "{{ cert_manager_version }}"
diff --git a/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/README.md b/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/README.md
index bcad19329..84f036b36 100644
--- a/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/README.md
+++ b/roles/kubernetes-apps/ingress_controller/alb_ingress_controller/README.md
@@ -1,6 +1,6 @@
# AWS ALB Ingress Controller
-**NOTE:** The current image version is `v1.1.4`. Please file any issues you find and note the version used.
+**NOTE:** The current image version is `v1.1.6`. Please file any issues you find and note the version used.
The AWS ALB Ingress Controller satisfies Kubernetes [ingress resources](https://kubernetes.io/docs/user-guide/ingress) by provisioning [Application Load Balancers](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/introduction.html).
--
GitLab