From 64a6e87c1be5b3d39db91b0f953508c3fb3408a5 Mon Sep 17 00:00:00 2001
From: Matthew Tuusberg <tuusberg@gmail.com>
Date: Mon, 7 Dec 2020 21:24:29 +0300
Subject: [PATCH] fix: move maxmindLicenseKey to controller.maxmindLicenseKey

* See https://github.com/kubernetes/ingress-nginx/blob/9b683e40555fdfaba453d826306bc9c03880dc16/charts/ingress-nginx/templates/controller-daemonset.yaml#L101
* See https://github.com/kubernetes/ingress-nginx/blob/ddba993e2dfc0c2afa5fa5d7ac266c9221d70f06/charts/ingress-nginx/templates/controller-deployment.yaml#L105
---
 charts/ingress-nginx/CHANGELOG.md | 4 ++++
 charts/ingress-nginx/Chart.yaml   | 4 ++--
 charts/ingress-nginx/values.yaml  | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/charts/ingress-nginx/CHANGELOG.md b/charts/ingress-nginx/CHANGELOG.md
index 18c7aece7..402059f9f 100644
--- a/charts/ingress-nginx/CHANGELOG.md
+++ b/charts/ingress-nginx/CHANGELOG.md
@@ -4,6 +4,10 @@ This file documents all notable changes to [ingress-nginx](https://github.com/ku
 
 ### Unreleased
 
+### 3.15.0
+
+- [X] [#6586](https://github.com/kubernetes/ingress-nginx/pull/6586) Fix 'maxmindLicenseKey' location in values.yaml
+
 ### 3.14.0
 
 - [X] [#6469](https://github.com/kubernetes/ingress-nginx/pull/6469) Allow custom service names for controller and backend
diff --git a/charts/ingress-nginx/Chart.yaml b/charts/ingress-nginx/Chart.yaml
index 2356abe2b..aaef28c42 100644
--- a/charts/ingress-nginx/Chart.yaml
+++ b/charts/ingress-nginx/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: ingress-nginx
 # When the version is modified, make sure the artifacthub.io/changes list is updated
 # Also update CHANGELOG.md
-version: 3.13.0
+version: 3.15.0
 appVersion: 0.41.2
 home: https://github.com/kubernetes/ingress-nginx
 description: Ingress controller for Kubernetes using NGINX as a reverse proxy and load balancer
@@ -21,4 +21,4 @@ annotations:
   # List of changes for the release in artifacthub.io
   # https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx?modal=changelog
   artifacthub.io/changes: |
-    - Allow custom service names for controller and backend
+    - Fix 'maxmindLicenseKey' location in values.yaml
diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
index f8f4c688b..80ade3fea 100644
--- a/charts/ingress-nginx/values.yaml
+++ b/charts/ingress-nginx/values.yaml
@@ -120,6 +120,10 @@ controller:
     ## Annotations to be added to the udp config configmap
     annotations: {}
 
+  # Maxmind license key to download GeoLite2 Databases
+  # https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases
+  maxmindLicenseKey: ""
+
   ## Additional command line arguments to pass to nginx-ingress-controller
   ## E.g. to specify the default SSL certificate you can use
   ## extraArgs:
@@ -581,10 +585,6 @@ controller:
 ##
 revisionHistoryLimit: 10
 
-# Maxmind license key to download GeoLite2 Databases
-# https://blog.maxmind.com/2019/12/18/significant-changes-to-accessing-and-using-geolite2-databases
-maxmindLicenseKey: ""
-
 ## Default 404 backend
 ##
 defaultBackend: