Updates to operator to version 2.2.9 of helm ha chart

This commit is contained in:
John Peterson
2020-04-10 12:47:40 -07:00
parent 5da9306e51
commit c8aaea9d69
2 changed files with 10 additions and 16 deletions

View File

@@ -13,10 +13,11 @@ metadata:
"spec": {
"artifactory-ha": {
"artifactory": {
"customInitContainersBegin": "- name: \"redhat-custom-setup\"\n image: {{ index .Values \"initContainerImage\" }}\n imagePullPolicy: \"{{ .Values.artifactory.image.pullPolicy }}\"\n command:\n - 'sh'\n - '-c'\n - 'chown -R 1030:1030 {{ .Values.artifactory.persistence.mountPath }}'\n securityContext:\n runAsUser: 0\n volumeMounts:\n - mountPath: \"{{ .Values.artifactory.persistence.mountPath }}\"\n name: volume\n",
"customInitContainersBegin": "- name: \"redhat-custom-setup\"\n #image: \"{{ .Values.initContainerImage }}\"\n image: {{ index .Values \"initContainerImage\" }}\n imagePullPolicy: \"{{ .Values.artifactory.image.pullPolicy }}\"\n command:\n - 'sh'\n - '-c'\n - 'chown -R 1030:1030 {{ .Values.artifactory.persistence.mountPath }}'\n securityContext:\n runAsUser: 0\n volumeMounts:\n - mountPath: \"{{ .Values.artifactory.persistence.mountPath }}\"\n name: volume\n",
"image": {
"repository": "registry.connect.redhat.com/jfrog/artifactory-pro:7.3.2"
},
"masterKey": "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF",
"node": {
"waitForPrimaryStartup": {
"enabled": false
@@ -31,7 +32,7 @@ metadata:
"user": "OVERRIDE"
},
"initContainerImage": "registry.redhat.io/ubi8-minimal",
"installerInfo": "{ \"productId\": \"Openshift_artifactory-ha/{{ .Chart.Version }}\", \"features\": [ { \"featureId\": \"ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}\" }, { \"featureId\": \"{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0\" }, { \"featureId\": \"Platform/openshift\" }, { \"featureId\": \"Partner/ACC-006983\" }, { \"featureId\": \"Channel/Openshift\" } ] }",
"installerInfo": "{ \"productId\": \"Openshift_artifactory-ha/{{ .Chart.Version }}\", \"features\": [ { \"featureId\": \"ArtifactoryVersion/{{ default .Chart.AppVersion .Values.artifactory.image.version }}\" }, { \"featureId\": \"{{ if .Values.postgresql.enabled }}postgresql{{ else }}{{ .Values.database.type }}{{ end }}/0.0.0\" }, { \"featureId\": \"Platform/Openshift\" }, { \"featureId\": \"Partner/ACC-006983\" }, { \"featureId\": \"Channel/Openshift\" } ] }",
"nginx": {
"http": {
"externalPort": 80,
@@ -56,8 +57,8 @@ metadata:
]
capabilities: Basic Install
categories: "Developer Tools,Integration & Delivery"
description: "Artifactory HA deploys Artifactory in a high availability environment across multiple pods"
containerImage: quay.io/jfrog/artifactory-ha-operator
description: "JFrog Artifactory Enterprise deploys Artifactory in a high availability environment across multiple pods"
containerImage: registry.connect.redhat.com/jfrog/artifactory-operator:7.3.2
createdAt: 2020-03-25T00:00:00Z
support: JFrog
certified: "true"

View File

@@ -5,19 +5,12 @@ artifactory-ha:
###################################
# EDIT TO YOUR DB CONFIGURATION
###################################
#database:
# type: "OVERRIDE"
# driver: "OVERRIDE"
# url: "OVERRIDE"
# user: "postgres"
# password: "OVERRIDE"
database:
type: "postgresql"
driver: "org.postgresql.Driver"
url: "jdbc:postgresql://postgres-postgresql:5432/artifactory"
user: "artifactory"
password: "password"
type: "OVERRIDE"
driver: "OVERRIDE"
url: "OVERRIDE"
user: "postgres"
password: "OVERRIDE"
###################################
# DO NOT EDIT FURTHER