Merge pull request #54 from jfrog/openshift4

Openshift pipelines v1.0.1 in marketplace and Xray v1.1.4 in marketplace

Openshift4/helm/openshift-pipelines/charts/pipelines/templates/pipelines-statefulset.yaml

@@ -348,6 +348,9 @@ spec:
           image: "{{ .Values.imageRegistry }}/{{ .Values.pipelines.nexec.image.repository }}:{{ default .Chart.AppVersion .Values.pipelines.version }}"
           imagePullPolicy: {{ .Values.pipelines.nexec.image.pullPolicy }}
           workingDir: /opt/jfrog/pipelines/app/micro/nexec
+          securityContext:
+            allowPrivilegeEscalation: false
+            runAsUser: 0
           env:
             - name: COMPONENT
               value: nexec

Openshift4/helm/openshift-pipelines/helminstall.sh

@@ -12,26 +12,24 @@ then
   JOIN_KEY=EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
 fi
 
-JOIN_KEY=93f1e5d2e8863b3ec14f5cdf136c7896
-
 helm upgrade --install pipelines . \
-     --set pipelines.pipelines.jfrogUrl=http://openshiftartifactoryha-nginx \
-     --set pipelines.pipelines.jfrogUrlUI=http://openshiftartifactoryha-nginx \
+     --set pipelines.pipelines.jfrogUrl=http://openshiftartifactoryha-artifactory-ha-primary:8082 \
+     --set pipelines.pipelines.jfrogUrlUI=https://johnp.jfrog.tech \
      --set pipelines.pipelines.masterKey=$MASTER_KEY \
      --set pipelines.pipelines.joinKey=$JOIN_KEY \
-     --set pipelines.pipelines.accessControlAllowOrigins_0=http://openshiftartifactoryha-nginx \
-     --set pipelines.pipelines.accessControlAllowOrigins_1=http://openshiftartifactoryha-nginx \
+     --set pipelines.pipelines.accessControlAllowOrigins_0=https://johnp.jfrog.tech \
+     --set pipelines.pipelines.accessControlAllowOrigins_1=https://johnp.jfrog.tech \
      --set pipelines.pipelines.msg.uiUser=monitor \
      --set pipelines.pipelines.msg.uiUserPassword=monitor \
      --set pipelines.postgresql.enabled=false \
      --set pipelines.global.postgresql.host=postgres-postgresql \
      --set pipelines.global.postgresql.port=5432 \
-     --set pipelines.global.postgresql.database=pipelinesdb \
+     --set pipelines.global.postgresql.database=pipelinedb \
      --set pipelines.global.postgresql.user=artifactory \
      --set pipelines.global.postgresql.password=password \
      --set pipelines.global.postgresql.ssl=false \
      --set pipelines.rabbitmq.rabbitmq.username=user \
      --set pipelines.rabbitmq.rabbitmq.password=bitnami \
-     --set pipelines.rabbitmq.externalUrl=amqps://pipelines-rabbit.jfrog.tech \
-     --set pipelines.pipelines.api.externalUrl=http://pipelines-api.jfrog.tech \
-     --set pipelines.pipelines.www.externalUrl=http://pipelines-www.jfrog.tech
+     --set pipelines.rabbitmq.externalUrl=amqp://pipelines-rabbit.jfrog.tech \
+     --set pipelines.pipelines.api.externalUrl=http://pipelines-api.jfrog.tech:30000 \
+     --set pipelines.pipelines.www.externalUrl=http://pipelines-www.jfrog.tech:30001

Openshift4/helm/openshift-pipelines/values.yaml

@@ -122,7 +122,7 @@ pipelines:
 
       service:
         ## Supported service types: ClusterIP, NodePort and LoadBalancer
-        type: ClusterIP
+        type: LoadBalancer
         port: 30000
 
         annotations:
@@ -205,7 +205,7 @@ pipelines:
 
       service:
         ## Supported service types: ClusterIP, NodePort and LoadBalancer
-        type: ClusterIP
+        type: LoadBalancer
         port: 30001
 
         annotations:
@@ -957,7 +957,7 @@ pipelines:
       extraPlugins: ""
 
     service:
-      type: ClusterIP
+      type: LoadBalancer
       annotations: {}
 
     persistence: