Merge pull request jfrog#709 from jfrog/inbound-from-forks

Moved installer info to values.yaml so it is fully customizable
scott-grimes · Mar 24, 2020 · c5b6bfd · c5b6bfd
2 parents 37a0c4c + 71b4fa4
commit c5b6bfd
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 30 deletions.
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [2.1.1] - Mar 23, 2020
+* Moved installer info to values.yaml so it is fully customizable
+
 ## [2.1.0] - Mar 23, 2020
 * Updated Artifactory version to 7.3.2
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory-ha
 home: https://www.jfrog.com/artifactory/
-version: 2.1.0
+version: 2.1.1
 appVersion: 7.3.2
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory-ha/templates/artifactory-installer-info.yaml b/stable/artifactory-ha/templates/artifactory-installer-info.yaml
@@ -9,17 +9,4 @@ metadata:
     release: {{ .Release.Name }}
 data:
   installer-info.json: |
-    {
-      "productId": "Helm_artifactory-ha/{{ .Chart.Version }}",
-      "features": [
-      {
-        "featureId": "ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}"
-      },
-      {
-        "featureId": "{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ default "derby" .Values.database.type }}{{ end }}/0.0.0"
-      },
-      {
-        "featureId": "Platform/{{ default "kubernetes" .Values.installer.platform }}"
-      }
-      ]
-    }
+    {{ tpl .Values.installerInfo . }}
diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -10,6 +10,8 @@ installer:
   type:
   platform:
 
+installerInfo: "{ 'productId': 'Helm_artifactory/{{ .Chart.Version }}', 'features': [ { 'featureId': 'ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}' }, { 'featureId': '{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ default \"derby\" .Values.database.type }}{{ end }}/0.0.0' }, { 'featureId': 'Platform/{{ default \"kubernetes\" .Values.installer.platform }}' } ] }"
+
 # For supporting pulling from private registries
 imagePullSecrets:
 

diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [9.1.1] - Mar 23, 2020
+* Moved installer info to values.yaml so it is fully customizable
+
 ## [9.1.0] - Mar 23, 2020
 * Updated Artifactory version to 7.3.2
 

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 9.1.0
+version: 9.1.1
 appVersion: 7.3.2
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory/templates/artifactory-installer-info.yaml b/stable/artifactory/templates/artifactory-installer-info.yaml
@@ -9,17 +9,4 @@ metadata:
     release: {{ .Release.Name }}
 data:
   installer-info.json: |
-    {
-      "productId": "Helm_artifactory/{{ .Chart.Version }}",
-      "features": [
-      {
-        "featureId": "ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}"
-      },
-      {
-        "featureId": "{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ default "derby" .Values.database.type }}{{ end }}/0.0.0"
-      },
-      {
-        "featureId": "Platform/{{ default "kubernetes" .Values.installer.platform }}"
-      }
-      ]
-    }
+    {{ tpl .Values.installerInfo . }}
diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -11,6 +11,8 @@ installer:
   type:
   platform:
 
+installerInfo: "{ 'productId': 'Helm_artifactory/{{ .Chart.Version }}', 'features': [ { 'featureId': 'ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}' }, { 'featureId': '{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ default \"derby\" .Values.database.type }}{{ end }}/0.0.0' }, { 'featureId': 'Platform/{{ default \"kubernetes\" .Values.installer.platform }}' } ] }"
+
 # For supporting pulling from private registries
 imagePullSecrets: