From e744f49b377f815d50066d4e3231c365fba314f7 Mon Sep 17 00:00:00 2001
From: Iryna Shustava <ishustava@users.noreply.github.com>
Date: Fri, 3 Apr 2020 18:01:43 -0700
Subject: [PATCH] Run enterprise-license job on upgrades (#407)

* Run enterprise-license job on upgrades
---
 CHANGELOG.md                          | 2 ++
 templates/enterprise-license-job.yaml | 2 +-
 values.yaml                           | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfab91a79f..4174971fcc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@ IMPROVEMENTS:
       enableAutoEncrypt: true
   ```
 
+* Run the enterprise license job on Helm upgrades, as well as installs [[GH-407](https://github.com/hashicorp/consul-helm/pull/407)].
+
 FEATURES:
 
 * Add `externalServers` configuration to support configuring the Helm chart with Consul servers
diff --git a/templates/enterprise-license-job.yaml b/templates/enterprise-license-job.yaml
index ddc6eff67d..1d118c8a0e 100644
--- a/templates/enterprise-license-job.yaml
+++ b/templates/enterprise-license-job.yaml
@@ -13,7 +13,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   annotations:
-    "helm.sh/hook": post-install
+    "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "100"
     "helm.sh/hook-delete-policy": hook-succeeded
 spec:
diff --git a/values.yaml b/values.yaml
index 1285307e5b..f846f24dfa 100644
--- a/values.yaml
+++ b/values.yaml
@@ -169,6 +169,7 @@ server:
   # has been elected. If you are not using an enterprise image
   # or if you plan to introduce the license key via another route, then set
   # these fields to null.
+  # Note: the job to apply license runs on both Helm installs and upgrades.
   enterpriseLicense:
     secretName: null
     secretKey: null