Merge pull request jfrog#1795 from jfrog/jp-10.14.2

[jfrog-platform] 10.14.2 release
Raghed22 · Jul 20, 2023 · b8a04c8 · b8a04c8
2 parents 638ba14 + 98fdc79
commit b8a04c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.14.2] - Jul 20, 2023
+* Fixed - Added a conditional check if rabbitmq is enabled [GH-1794](https://github.com/jfrog/charts/issues/1794)
+
 ## [10.14.1] - Jul 18, 2023
 * Update dependency xray chart version to 103.78.10
 * Update global.versions.router version to `7.73.0`

diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
@@ -59,4 +59,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.14.1
+version: 10.14.2
diff --git a/stable/jfrog-platform/templates/migration-hook.yaml b/stable/jfrog-platform/templates/migration-hook.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.rabbitmq.enabled }}
 {{- if and (not .Values.rabbitmq.migration.enabled) (not .Values.rabbitmq.rabbitmqUpgradeReady)  }}
     {{- fail "Rabbitmq migration flag is disabled. Please enable the rabbitmq.rabbitmqUpgradeReady flag after manually enabling the feature flags in rabbitmq" }}
 {{- end }}
@@ -18,6 +19,7 @@ metadata:
 automountServiceAccountToken: {{ .Values.rabbitmq.migration.serviceAccount.automountServiceAccountToken }}
 {{- end }}
 {{- end }}
+{{- end }}
 ---
 {{- if .Values.rabbitmq.migration.enabled }}
 {{- if .Values.rabbitmq.migration.serviceAccount.rbac.create }}
@@ -38,6 +40,7 @@ rules:
 {{- end }}
 {{- end }}
 ---
+{{- if .Values.rabbitmq.enabled }}
 {{- if .Values.rabbitmq.migration.enabled }}
 {{- if .Values.rabbitmq.migration.serviceAccount.rbac.create }}
 apiVersion: rbac.authorization.k8s.io/v1
@@ -61,7 +64,9 @@ roleRef:
     name: {{ template "jfrog-platform.rabbitmq.migration.fullname" . }}
 {{- end }}
 {{- end }}
+{{- end }}
 ---
+{{- if .Values.rabbitmq.enabled }}
 {{- if .Values.rabbitmq.migration.enabled }}
 apiVersion: v1
 kind: Pod
@@ -87,4 +92,5 @@ spec:
       command: ['sh', '-c', 'kubectl exec -it {{ .Release.Name }}-{{ template "rabbitmq.name" . }}-0 -- rabbitmqctl enable_feature_flag all ; if [ "$?" -ne 0 ]; then echo "Failed to perform the migration. Please make sure to enable the feature flag in rabbitmq manually [rabbitmqctl enable_feature_flag all] "; exit 1; fi' ]
   restartPolicy: Never
   terminationGracePeriodSeconds: 0
+{{- end }}
 {{- end }}