Merge pull request #357 from SumoLogic/revert-335-maisie-pre-upgrade-…

…revert Revert "[breaking change] Add pre-upgrade hook for setup"
SumoLogic · Jan 9, 2020 · c59edc4 · c59edc4
2 parents 9284a77 + 39b2ac7
commit c59edc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/deploy/helm/sumologic/values.yaml b/deploy/helm/sumologic/values.yaml
@@ -58,27 +58,27 @@ sumologic:
   setup:
     clusterRole:
       annotations:
-        helm.sh/hook: pre-install,pre-upgrade
+        helm.sh/hook: pre-install
         helm.sh/hook-weight: "1"
         helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     clusterRoleBinding:
       annotations:
-        helm.sh/hook: pre-install,pre-upgrade
+        helm.sh/hook: pre-install
         helm.sh/hook-weight: "2"
         helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     configMap:
       annotations:
-        helm.sh/hook: pre-install,pre-upgrade
+        helm.sh/hook: pre-install
         helm.sh/hook-weight: "2"
         helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     job:
       annotations:
-        helm.sh/hook: pre-install,pre-upgrade
+        helm.sh/hook: pre-install
         helm.sh/hook-weight: "3"
         helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     serviceAccount:
       annotations:
-        helm.sh/hook: pre-install,pre-upgrade
+        helm.sh/hook: pre-install
         helm.sh/hook-weight: "0"
         helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
 

diff --git a/deploy/kubernetes/setup-sumologic.yaml.tmpl b/deploy/kubernetes/setup-sumologic.yaml.tmpl
@@ -7,7 +7,7 @@ kind: ConfigMap
 metadata:
   name:  collection-sumologic-setup
   annotations:
-    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook: pre-install
     helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     helm.sh/hook-weight: "2"
 
@@ -175,7 +175,7 @@ kind: ServiceAccount
 metadata:
   name:  collection-sumologic-setup
   annotations:
-    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook: pre-install
     helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     helm.sh/hook-weight: "0"
 
@@ -191,7 +191,7 @@ kind: ClusterRole
 metadata:
   name:  collection-sumologic-setup
   annotations:
-    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook: pre-install
     helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     helm.sh/hook-weight: "1"
 
@@ -214,7 +214,7 @@ kind: ClusterRoleBinding
 metadata:
   name:  collection-sumologic-setup
   annotations:
-    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook: pre-install
     helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     helm.sh/hook-weight: "2"
 
@@ -239,7 +239,7 @@ metadata:
   name: collection-sumologic-setup
   namespace: $NAMESPACE
   annotations:
-    helm.sh/hook: pre-install,pre-upgrade
+    helm.sh/hook: pre-install
     helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
     helm.sh/hook-weight: "3"