Skip to content

Commit

Permalink
[jfrog-platform] 10.19.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
chukka committed Jul 30, 2024
1 parent 3ae9b63 commit 5c22dd3
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 13 deletions.
9 changes: 8 additions & 1 deletion stable/jfrog-platform/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# JFrog Platform Chart Changelog (GA releases only)
All changes to this chart will be documented in this file.

## [10.18.3] - July 15, 2024
## [10.19.0] - Jul 25, 2024
* **Important change:**
* Mission Control is also disabled by default now, if you are using this product from previous release, enable them using your custom-values.yaml file.
* Update dependency artifactory chart version to 107.90.5
* Update dependency xray chart version to 103.100.3
* Update global.versions.router version to `7.122.1`

## [10.18.3] - Jul 15, 2024
* Update dependency artifactory chart version to 107.84.17
* Update dependency xray chart version to 103.98.5

Expand Down
8 changes: 4 additions & 4 deletions stable/jfrog-platform/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ dependencies:
version: 11.9.3
- name: artifactory
repository: https://charts.jfrog.io/
version: 107.84.17
version: 107.90.5
- name: xray
repository: https://charts.jfrog.io/
version: 103.98.5
version: 103.100.3
- name: distribution
repository: https://charts.jfrog.io/
version: 102.25.1
Expand All @@ -20,5 +20,5 @@ dependencies:
- name: pipelines
repository: https://charts.jfrog.io/
version: 101.59.7
digest: sha256:a03647c0b1cf25012f2320e3fc6f953499eab18a8b2b7f461a8e0eeaf36582c6
generated: "2024-07-15T10:39:47.432479+05:30"
digest: sha256:724e270ffa0a4cd4b68c9a26d6d0ee114ecc6fe669f35d1acbba8234b07cbfe0
generated: "2024-07-25T13:47:18.91713+05:30"
8 changes: 4 additions & 4 deletions stable/jfrog-platform/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 7.84.17
appVersion: 7.90.5
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -12,11 +12,11 @@ dependencies:
- condition: artifactory.enabled
name: artifactory
repository: https://charts.jfrog.io/
version: 107.84.17
version: 107.90.5
- condition: xray.enabled
name: xray
repository: https://charts.jfrog.io/
version: 103.98.5
version: 103.100.3
- condition: distribution.enabled
name: distribution
repository: https://charts.jfrog.io/
Expand Down Expand Up @@ -50,4 +50,4 @@ name: jfrog-platform
sources:
- https://github.com/jfrog/charts
type: application
version: 10.18.3
version: 10.19.0
35 changes: 34 additions & 1 deletion stable/jfrog-platform/templates/upgrade-hook.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- if .Values.preUpgradeHook.enabled }}
{{- if not (and .Values.insight.enabled .Values.pipelines.enabled .Values.distribution.enabled) }}
{{- if not (and .Values.insight.enabled .Values.pipelines.enabled .Values.distribution.enabled .Values.artifactory.mc.enabled) }}
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down Expand Up @@ -36,6 +36,13 @@ rules:
- create
- get
- list
- apiGroups:
- ""
resources:
- secrets
verbs:
- get
- list
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
Expand Down Expand Up @@ -130,6 +137,32 @@ spec:
echo "Pipelines pod(s) don't exist. Allowing upgrade"
fi
{{- end }}
{{- if not .Values.artifactory.mc.enabled }}
systemYamlUnifiedSecret={{ .Release.Name }}-artifactory-unified-secret
systemYamlSecret={{ .Release.Name }}-artifactory-systemyaml
systemYamlEncoded=$(kubectl get secrets "$systemYamlUnifiedSecret" -o jsonpath="{.data.system\.yaml}")
if [ $? -ne 0 ]; then
systemYamlEncoded=$(kubectl get secrets "$systemYamlSecret" -o jsonpath="{.data.system\.yaml}")
if [ $? -ne 0 ]; then
systemYamlEncoded=$(kubectl get secrets "artifactory-unified-secret" -o jsonpath="{.data.system\.yaml}")
if [ $? -ne 0 ]; then
echo "Error: Secret '$systemYamlSecret' or '$systemYamlUnifiedSecret' or "artifactory-unified-secret" not found"
exit 1
fi
fi
fi
systemYaml=$(echo "$systemYamlEncoded" | base64 -d)
isMcEnabled=$(echo "$systemYaml" | awk 'BEGIN {flag=0} /^mc:/ {flag=1} flag && /^ enabled: / {print $2; exit} /^[^ ]/ && !/^mc:/ {if (flag) flag=0}')
if [ "$isMcEnabled" = "true" ]; then
echo "Failed to perform the upgrade. Refer to https://github.com/jfrog/charts/blob/master/stable/jfrog-platform/CHANGELOG.md#10180"
echo "From chart verison 10.19.x, Artifactory's Mission Control is disabled. If you are using this in the previous release(s)."
echo "Enable them using your custom-values.yaml file "
exit 1
else
echo "Artifactory's Mission Control is not enabled. Allowing upgrade"
fi
{{- end }}
restartPolicy: Never
terminationGracePeriodSeconds: 10
{{- end }}
Expand Down
7 changes: 4 additions & 3 deletions stable/jfrog-platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ global:
## For example : For artifactory, using global.versions.artifactory
## Note: Order of preference is 1) global.versions 2) .Values.artifactory.image.tag 3) Chart.AppVersion
versions:
router: 7.118.0
router: 7.122.1
# artifactory:
# xray:
# distribution:
Expand Down Expand Up @@ -232,7 +232,7 @@ rabbitmq:
artifactory:
enabled: true
unifiedUpgradeAllowed: true
installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.18.3-%s" .Chart.AppVersion }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.19.0-%s" .Chart.AppVersion }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
postgresql:
enabled: false
waitForDatabase: false
Expand All @@ -243,8 +243,9 @@ artifactory:
user: artifactory
password: artifactory
# Note: For artifactory Pro license, mission-control is not supported, Hence, set mc.enabled: false
# Note: mission-control is disabled by default, this is only available for E+ customers, and can be enabled by setting mc.enabled: true
mc:
enabled: true
enabled: false
artifactory:
unifiedSecretInstallation: true
## unifiedSecretPrependReleaseName Set this flag to false if unifiedSecret should not be created with <release-name> prepended.
Expand Down

0 comments on commit 5c22dd3

Please sign in to comment.