diff --git a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md index 4fe4ae2..0175b11 100755 --- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md +++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md @@ -1,6 +1,10 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [4.2.0] - Oct 6, 2020 +* Fixed upgrade path from 3.1.0 to 4.2.0 +* Updating to latest jfrog/artifactory-ha helm chart version 4.2.0 artifactory version 7.9.0 + ## [4.1.0] - Sept 30, 2020 * Updating to latest jfrog/artifactory-ha helm chart version 4.1.0 artifactory version 7.9.0 diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml index 8c0c988..a5b536a 100755 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml @@ -16,4 +16,4 @@ name: openshift-artifactory-ha sources: - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://github.com/jfrog/charts -version: 4.1.0 +version: 4.2.0 diff --git a/Openshift4/helm/openshift-artifactory-ha/README.md b/Openshift4/helm/openshift-artifactory-ha/README.md index 87da20a..c457694 100755 --- a/Openshift4/helm/openshift-artifactory-ha/README.md +++ b/Openshift4/helm/openshift-artifactory-ha/README.md @@ -16,6 +16,15 @@ artifactory-ha.artifactory.node.replicaCount ``` This is due to helm referencing them through the subchart artifactory-ha now. + +## Security Context Constraints + +To deploy this helm chart you will need to be a cluster admin w/ access to the anyuid scc. + +````bash +oc adm policy add-scc-to-user anyuid -z my_user_name +```` + ## Prerequisites Details * Kubernetes 1.12+ diff --git a/Openshift4/helm/openshift-artifactory-ha/requirements.lock b/Openshift4/helm/openshift-artifactory-ha/requirements.lock index 4030294..161561a 100644 --- a/Openshift4/helm/openshift-artifactory-ha/requirements.lock +++ b/Openshift4/helm/openshift-artifactory-ha/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: artifactory-ha repository: https://charts.jfrog.io/ - version: 4.1.0 -digest: sha256:8df1fd70eeabbb7687da0dd534d2161a413389ec40f331d5eb8e95ae50119222 -generated: "2020-09-30T12:30:08.142288-07:00" + version: 4.2.0 +digest: sha256:c5d4c457266ce8d7e0e8c6dcf326267c3ca4cbb8a03c81db68a8a0b45fde3d3e +generated: "2020-10-06T15:10:01.551465-07:00" diff --git a/Openshift4/helm/openshift-artifactory-ha/requirements.yaml b/Openshift4/helm/openshift-artifactory-ha/requirements.yaml index 1e23270..89466d5 100644 --- a/Openshift4/helm/openshift-artifactory-ha/requirements.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: artifactory-ha - version: 4.1.0 + version: 4.2.0 repository: https://charts.jfrog.io/ diff --git a/Openshift4/helm/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml index 3354dc0..a201a72 100755 --- a/Openshift4/helm/openshift-artifactory-ha/values.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/values.yaml @@ -3,9 +3,7 @@ # and applies various things like initContainers, nginx mainConf, etc # to enable the artifactory-ha helm chart to work in an openshift environment artifactory-ha: - ################################### - # EDIT TO YOUR DB CONFIGURATION - ################################### + databaseUpgradeReady: true database: type: "OVERRIDE" driver: "OVERRIDE" @@ -28,6 +26,20 @@ artifactory-ha: enabled: false masterKey: "OVERRIDE" joinKey: "OVERRIDE" + customInitContainersBegin: | + - name: "prepare-uid-persistent-volume" + image: "{{ .Values.initContainerImage }}" + imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}" + command: + - 'sh' + - '-c' + - > + chown -Rv {{ .Values.artifactory.uid }}:{{ .Values.artifactory.uid }} {{ .Values.artifactory.persistence.mountPath }} + securityContext: + runAsUser: 0 + volumeMounts: + - mountPath: "{{ .Values.artifactory.persistence.mountPath }}" + name: volume postgresql: enabled: false nginx: