From 8fe008c98cebab2154a53cc6501af8ea77baa94e Mon Sep 17 00:00:00 2001 From: Ryan Miller Date: Wed, 13 Nov 2019 11:03:03 -0800 Subject: [PATCH 1/2] Revert pre-upgrade hook for now for further testing --- deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml | 2 +- .../sumologic/templates/setup/setup-clusterrolebinding.yaml | 2 +- deploy/helm/sumologic/templates/setup/setup-configmap.yaml | 2 +- deploy/helm/sumologic/templates/setup/setup-job.yaml | 2 +- deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml index d6c770fced..a72f8fad20 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrole.yaml @@ -4,7 +4,7 @@ kind: ClusterRole metadata: name: {{ template "sumologic.fullname" . }}-setup 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 labels: diff --git a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml index e1a60b7ab0..58b093a865 100644 --- a/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-clusterrolebinding.yaml @@ -4,7 +4,7 @@ kind: ClusterRoleBinding metadata: name: {{ template "sumologic.fullname" . }}-setup 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 labels: diff --git a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml index 527c9fe24d..c6b76e1a4e 100644 --- a/deploy/helm/sumologic/templates/setup/setup-configmap.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-configmap.yaml @@ -4,7 +4,7 @@ kind: ConfigMap metadata: name: {{ template "sumologic.fullname" . }}-setup 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 labels: diff --git a/deploy/helm/sumologic/templates/setup/setup-job.yaml b/deploy/helm/sumologic/templates/setup/setup-job.yaml index cb28418a2d..60bc41d8ad 100644 --- a/deploy/helm/sumologic/templates/setup/setup-job.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-job.yaml @@ -5,7 +5,7 @@ metadata: name: {{ template "sumologic.fullname" . }}-setup namespace: {{ .Release.Namespace }} 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 labels: diff --git a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml index 063d836aee..20d71ec4d0 100644 --- a/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml +++ b/deploy/helm/sumologic/templates/setup/setup-serviceaccount.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount metadata: name: {{ template "sumologic.fullname" . }}-setup 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 labels: From 902d80a1eb9552db14425e16cd0a7d69b8ffb2f2 Mon Sep 17 00:00:00 2001 From: Travis CI Date: Wed, 13 Nov 2019 19:09:48 +0000 Subject: [PATCH 2/2] Generate new 'setup-sumologic.yaml.tmpl' --- deploy/kubernetes/setup-sumologic.yaml.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/kubernetes/setup-sumologic.yaml.tmpl b/deploy/kubernetes/setup-sumologic.yaml.tmpl index b394690f5d..3968e00e16 100644 --- 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-weight": "2" "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded labels: @@ -173,7 +173,7 @@ kind: ServiceAccount metadata: name: collection-sumologic-setup 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 labels: @@ -187,7 +187,7 @@ kind: ClusterRole metadata: name: collection-sumologic-setup 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 labels: @@ -208,7 +208,7 @@ kind: ClusterRoleBinding metadata: name: collection-sumologic-setup 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 labels: @@ -231,7 +231,7 @@ metadata: name: collection-sumologic-setup namespace: $NAMESPACE 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 labels: