Fixing installation issues and disabling security context

jfrog · Apr 22, 2024 · 107ad04 · 107ad04
1 parent 7eeaf27
commit 107ad04
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 34 deletions.
diff --git 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.7] -  April 22, 2024
+* Fixing installation issues and disabling security context
+
 ## [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/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"
@@ -14,7 +16,7 @@ artifactory-ha:
   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
@@ -26,25 +28,18 @@ 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
+    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/...rator/artifactory-ha-operator/helm-charts/openshift-artifactory-ha/CHANGELOG.md b/...rator/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.7] -  April 22, 2024
+* Fixing installation issues and disabling security context
+
 ## [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/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"
@@ -14,7 +16,7 @@ artifactory-ha:
   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
@@ -26,25 +28,14 @@ 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
+    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;