From a1cefa67f9cd21205748298ddcbe15407b41d7fc Mon Sep 17 00:00:00 2001 From: Eldad Assis Date: Mon, 15 Apr 2019 15:22:14 +0300 Subject: [PATCH] Add support for customVolumeMounts (#309) --- stable/artifactory-ha/CHANGELOG.md | 3 +++ stable/artifactory-ha/Chart.yaml | 2 +- stable/artifactory-ha/README.md | 1 + .../templates/artifactory-primary-statefulset.yaml | 3 +++ stable/artifactory-ha/values.yaml | 6 ++++++ stable/artifactory/CHANGELOG.md | 3 +++ stable/artifactory/Chart.yaml | 2 +- stable/artifactory/README.md | 1 + stable/artifactory/templates/artifactory-statefulset.yaml | 3 +++ stable/artifactory/values.yaml | 6 +++++- 10 files changed, 27 insertions(+), 3 deletions(-) diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md index ddf1e97e0..a222662db 100644 --- 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. +## [0.12.16] - Apr 12, 2019 +* Added support for `customVolumeMounts` + ## [0.12.15] - Aprl 12, 2019 * Added support for `bucketExists` flag for googleStorage diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml index bde15209b..d973315f4 100644 --- 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: 0.12.15 +version: 0.12.16 appVersion: 6.9.1 description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers. diff --git a/stable/artifactory-ha/README.md b/stable/artifactory-ha/README.md index 056ab4efc..3c38b2afc 100644 --- a/stable/artifactory-ha/README.md +++ b/stable/artifactory-ha/README.md @@ -561,6 +561,7 @@ The following table lists the configurable parameters of the artifactory chart a | `artifactory.customInitContainers`| Custom init containers | | | `artifactory.customSidecarContainers`| Custom sidecar containers | | | `artifactory.customVolumes` | Custom volumes | | +| `artifactory.customVolumeMounts` | Custom Artifactory volumeMounts | | | `artifactory.userPluginSecrets` | Array of secret names for Artifactory user plugins | | | `artifactory.masterKey` | Artifactory Master Key. Can be generated with `openssl rand -hex 32` |`FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF`| | `artifactory.masterKeySecretName` | Artifactory Master Key secret name | | diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml index 22ae6eb4f..0b8e55bb5 100644 --- a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml +++ b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml @@ -304,6 +304,9 @@ spec: - name: installer-info mountPath: "/artifactory_extra_conf/info/installer-info.json" subPath: installer-info.json + {{- if .Values.artifactory.customVolumeMounts }} +{{ tpl .Values.artifactory.customVolumeMounts . | indent 8 }} + {{- end }} resources: {{ toYaml .Values.artifactory.primary.resources | indent 10 }} {{- if .Values.artifactory.readinessProbe.enabled }} diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml index a9a9f93da..9b3265450 100644 --- a/stable/artifactory-ha/values.yaml +++ b/stable/artifactory-ha/values.yaml @@ -220,6 +220,12 @@ artifactory: # configMap: # name: custom-script + ## Add custom volumesMounts + customVolumeMounts: | + # - name: custom-script + # mountPath: "/scripts/script.sh" + # subPath: script.sh + ## Artifactory requires a unique master key ## You can generate one with the command: ## 'openssl rand -hex 32' diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md index 25ae7dd11..edf556d4f 100644 --- 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. +## [7.13.14] - Apr 15, 2019 +* Added support for `customVolumeMounts` + ## [7.13.13] - Aprl 12, 2019 * Added support for `bucketExists` flag for googleStorage diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml index b9a26f7ad..ad1107b7e 100644 --- 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: 7.13.13 +version: 7.13.14 appVersion: 6.9.1 description: Universal Repository Manager supporting all major packaging formats, build tools and CI servers. diff --git a/stable/artifactory/README.md b/stable/artifactory/README.md index 2787e7029..7b49a181c 100644 --- a/stable/artifactory/README.md +++ b/stable/artifactory/README.md @@ -456,6 +456,7 @@ The following table lists the configurable parameters of the artifactory chart a | `artifactory.customInitContainers`| Custom init containers | | | `artifactory.customSidecarContainers`| Custom sidecar containers | | | `artifactory.customVolumes` | Custom volumes | | +| `artifactory.customVolumeMounts` | Custom Artifactory volumeMounts | | | `artifactory.userPluginSecrets` | Array of secret names for Artifactory user plugins | | | `artifactory.license.licenseKey` | Artifactory license key. Providing the license key as a parameter will cause a secret containing the license key to be created as part of the release. Use either this setting or the license.secret and license.dataKey. If you use both, the latter will be used. | | | `artifactory.license.secret` | Artifactory license secret name | | diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml index 732f83a7b..de92ac16a 100644 --- a/stable/artifactory/templates/artifactory-statefulset.yaml +++ b/stable/artifactory/templates/artifactory-statefulset.yaml @@ -259,6 +259,9 @@ spec: - name: installer-info mountPath: "/artifactory_extra_conf/info/installer-info.json" subPath: installer-info.json + {{- if .Values.artifactory.customVolumeMounts }} +{{ tpl .Values.artifactory.customVolumeMounts . | indent 8 }} + {{- end }} resources: {{ toYaml .Values.artifactory.resources | indent 10 }} {{- if .Values.artifactory.readinessProbe.enabled }} diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml index 1d1b74ba2..cd003744a 100644 --- a/stable/artifactory/values.yaml +++ b/stable/artifactory/values.yaml @@ -173,6 +173,11 @@ artifactory: # configMap: # name: custom-script + ## Add custom volumesMounts + customVolumeMounts: | + # - name: custom-script + # mountPath: "/scripts/script.sh" + # subPath: script.sh ## Artifactory license. license: @@ -271,7 +276,6 @@ artifactory: size: 20Gi maxCacheSize: 50000000000 - ## Set the persistence storage type. This will apply the matching binarystore.xml to Artifactory config ## Supported types are: ## file-system (default)