Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[openshift/artifactory] Fixing installation issues and disabling security context #382

Merged
merged 1 commit into from
Apr 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Openshift4/helm/openshift-artifactory-ha/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions Openshift4/helm/openshift-artifactory-ha/Chart.lock
Original file line number Diff line number Diff line change
@@ -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"
6 changes: 3 additions & 3 deletions Openshift4/helm/openshift-artifactory-ha/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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
34 changes: 15 additions & 19 deletions Openshift4/helm/openshift-artifactory-ha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,43 @@
# 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"
driver: "OVERRIDE"
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
Expand All @@ -59,6 +54,7 @@ artifactory-ha:
https:
externalPort: 443
internalPort: 8443
customCommand: [ 'nginx', '-g', 'daemon off;' ]
mainConf: |
# Main Nginx configuration file
worker_processes 4;
Expand Down
4 changes: 4 additions & 0 deletions Openshift4/operator/artifactory-ha-operator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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"
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -3,48 +3,39 @@
# 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"
driver: "OVERRIDE"
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
Expand All @@ -59,6 +50,7 @@ artifactory-ha:
https:
externalPort: 443
internalPort: 8443
customCommand: [ 'nginx', '-g', 'daemon off;' ]
mainConf: |
# Main Nginx configuration file
worker_processes 4;
Expand Down
Loading