From 5d1c54ee28f2cf30fc8d39e7bbf8d6618948df04 Mon Sep 17 00:00:00 2001 From: oumkale Date: Wed, 24 Apr 2024 18:12:12 +0530 Subject: [PATCH] Updating Artifactory chart version to 7.77.10 Signed-off-by: oumkale --- .../openshift-artifactory-ha/CHANGELOG.md | 3 ++ .../helm/openshift-artifactory-ha/Chart.lock | 6 ++-- .../helm/openshift-artifactory-ha/Chart.yaml | 6 ++-- .../helm/openshift-artifactory-ha/values.yaml | 34 ++++++++----------- .../artifactory-ha-operator/CHANGELOG.md | 4 +++ .../openshift-artifactory-ha/CHANGELOG.md | 3 ++ .../openshift-artifactory-ha/Chart.lock | 6 ++-- .../openshift-artifactory-ha/Chart.yaml | 6 ++-- .../openshift-artifactory-ha/values.yaml | 30 ++++++---------- 9 files changed, 48 insertions(+), 50 deletions(-) diff --git a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md index 606e5aea..5ce76a65 100755 --- a/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md +++ b/Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [107.77.10] - April 24, 2024 +* Updating to latest jfrog/artifactory-ha helm chart version 107.77.10 artifactory version 7.77.10 + ## [107.71.5] - Mar 22, 2024 * Updating to latest jfrog/artifactory-ha helm chart version 107.77.7 artifactory version 7.77.7 diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.lock b/Openshift4/helm/openshift-artifactory-ha/Chart.lock index ee012d3b..83d5beba 100644 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.lock +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: artifactory-ha repository: https://charts.jfrog.io/ - version: 107.77.7 -digest: sha256:4bd55f5c331c175276c928d9b4187bff9e91a35f5ec787d5e69e8926986bfbf7 -generated: "2024-03-22T16:32:17.294503+05:30" + version: 107.77.10 +digest: sha256:3d867d58882b69a9f140fc02302f11c3743fa4de0e2eb855e920c61223f560e8 +generated: "2024-04-24T18:09:15.711263+05:30" diff --git a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml index 23dcc9e4..98ffbb60 100755 --- a/Openshift4/helm/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 7.77.7 +appVersion: 7.77.10 dependencies: - name: artifactory-ha - version: 107.77.7 + version: 107.77.10 repository: https://charts.jfrog.io/ description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment home: https://www.jfrog.com/artifactory/ @@ -20,4 +20,4 @@ name: openshift-artifactory-ha sources: - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://github.com/jfrog/charts -version: 107.77.7 +version: 107.77.10 diff --git a/Openshift4/helm/openshift-artifactory-ha/values.yaml b/Openshift4/helm/openshift-artifactory-ha/values.yaml index 3ae0237f..164f38d1 100755 --- a/Openshift4/helm/openshift-artifactory-ha/values.yaml +++ b/Openshift4/helm/openshift-artifactory-ha/values.yaml @@ -3,6 +3,8 @@ # and applies various things like initContainers, nginx mainConf, etc # to enable the artifactory-ha helm chart to work in an openshift environment artifactory-ha: + containerSecurityContext: + enabled: false databaseUpgradeReady: true database: type: "OVERRIDE" @@ -10,41 +12,34 @@ artifactory-ha: url: "OVERRIDE" user: "OVERRIDE" password: "OVERRIDE" - initContainerImage: registry.connect.redhat.com/jfrog/init:7.77.7 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.77.10 waitForDatabase: true 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" } ] }' artifactory: - uid: "1000721030" + setSecurityContext: false ## Change to use RH UBI images image: registry: registry.connect.redhat.com repository: jfrog/artifactory-pro - tag: 7.77.7 + tag: 7.77.10 node: replicaCount: 2 waitForPrimaryStartup: 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 + customInitContainersBegin: {} postgresql: enabled: false + securityContext: + enabled: false + containerSecurityContext: + enabled: false nginx: - uid: "1000720104" - gid: "1000720107" + containerSecurityContext: + enabled: false + podSecurityContext: + enabled: false image: registry: registry.redhat.io repository: rhel8/nginx-116 @@ -59,6 +54,7 @@ artifactory-ha: https: externalPort: 443 internalPort: 8443 + customCommand: [ 'nginx', '-g', 'daemon off;' ] mainConf: | # Main Nginx configuration file worker_processes 4; diff --git a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md index f50a4c26..f4806419 100755 --- a/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md +++ b/Openshift4/operator/artifactory-ha-operator/CHANGELOG.md @@ -2,6 +2,10 @@ All changes to this chart will be documented in this file. +## [1.2.9] - April 24, 2024 + +- Updating Operator to latest jfrog/artifactory-ha helm chart version 107.77.10 artifactory version 7.77.10 + ## [1.2.6] - Mar 25, 2024 - Updating Operator to latest jfrog/artifactory-ha helm chart version 107.77.7 artifactory version 7.77.7 diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md index d679d126..be5dcd65 100755 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Openshift Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. +## [107.77.10] - April 24, 2024 +* Updating to latest jfrog/artifactory-ha helm chart version 107.77.10 artifactory version 7.77.10 + ## [107.71.5] - Mar 22, 2024 * Updating to latest jfrog/artifactory-ha helm chart version 107.77.7 artifactory version 7.77.7 diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock index ee012d3b..d57c3311 100644 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: artifactory-ha repository: https://charts.jfrog.io/ - version: 107.77.7 -digest: sha256:4bd55f5c331c175276c928d9b4187bff9e91a35f5ec787d5e69e8926986bfbf7 -generated: "2024-03-22T16:32:17.294503+05:30" + version: 107.77.10 +digest: sha256:3d867d58882b69a9f140fc02302f11c3743fa4de0e2eb855e920c61223f560e8 +generated: "2024-04-24T18:09:48.650193+05:30" diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml index 23dcc9e4..98ffbb60 100755 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 7.77.7 +appVersion: 7.77.10 dependencies: - name: artifactory-ha - version: 107.77.7 + version: 107.77.10 repository: https://charts.jfrog.io/ description: Openshift JFrog Artifactory HA subcharting Artifactory HA to work in Openshift environment home: https://www.jfrog.com/artifactory/ @@ -20,4 +20,4 @@ name: openshift-artifactory-ha sources: - https://bintray.com/jfrog/product/JFrog-Artifactory-Pro/view - https://github.com/jfrog/charts -version: 107.77.7 +version: 107.77.10 diff --git a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml index 3ae0237f..5973fdc8 100755 --- a/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml +++ b/Openshift4/operator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/values.yaml @@ -3,6 +3,8 @@ # and applies various things like initContainers, nginx mainConf, etc # to enable the artifactory-ha helm chart to work in an openshift environment artifactory-ha: + containerSecurityContext: + enabled: false databaseUpgradeReady: true database: type: "OVERRIDE" @@ -10,41 +12,30 @@ artifactory-ha: url: "OVERRIDE" user: "OVERRIDE" password: "OVERRIDE" - initContainerImage: registry.connect.redhat.com/jfrog/init:7.77.7 + initContainerImage: registry.connect.redhat.com/jfrog/init:7.77.10 waitForDatabase: true 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" } ] }' artifactory: - uid: "1000721030" + setSecurityContext: false ## Change to use RH UBI images image: registry: registry.connect.redhat.com repository: jfrog/artifactory-pro - tag: 7.77.7 + tag: 7.77.10 node: replicaCount: 2 waitForPrimaryStartup: 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 + customInitContainersBegin: {} postgresql: enabled: false nginx: - uid: "1000720104" - gid: "1000720107" + containerSecurityContext: + enabled: false + podSecurityContext: + enabled: false image: registry: registry.redhat.io repository: rhel8/nginx-116 @@ -59,6 +50,7 @@ artifactory-ha: https: externalPort: 443 internalPort: 8443 + customCommand: [ 'nginx', '-g', 'daemon off;' ] mainConf: | # Main Nginx configuration file worker_processes 4;