updates for new redhat ubi image and also temp fix for INST-550 bug

This commit is contained in:
John Peterson
2020-02-13 11:51:35 -08:00
parent 47efd4f31d
commit 4be8a96fb6
13 changed files with 108 additions and 31 deletions

View File

@@ -50,7 +50,7 @@ spec:
path: null
image:
pullPolicy: IfNotPresent
repository: earlyaccess.jfrog.io/artifactory-pro
repository: image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/artifactory-pro
internalArtifactoryPort: 8081
internalPort: 8082
javaOpts: {}
@@ -759,7 +759,7 @@ spec:
internalPort: 443
image:
pullPolicy: IfNotPresent
repository: earlyaccess.jfrog.io/nginx-artifactory-pro
repository: image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/nginx-artifactory-pro
labels: {}
livenessProbe:
enabled: true

View File

@@ -0,0 +1,18 @@
kind: SecurityContextConstraints
apiVersion: v1
metadata:
name: hostpath
allowPrivilegedContainer: false
runAsUser:
type: RunAsAny
seLinuxContext:
type: RunAsAny
fsGroup:
type: RunAsAny
supplementalGroups:
type: RunAsAny
users:
- artifactory
groups:
- artifactory
- jfrog-artifactory

View File

@@ -0,0 +1,6 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: nginx-artifactory-pro
namespace: jfrog-artifactory

View File

@@ -0,0 +1,6 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: artifactory-pro
namespace: jfrog-artifactory

View File

@@ -2,16 +2,3 @@ kind: Namespace
apiVersion: v1
metadata:
name: jfrog-artifactory
selfLink: /api/v1/namespaces/jfrog-artifactory
uid: 402ec7e9-3ca2-11ea-bd94-0ef0e3c74fbe
resourceVersion: '523038'
creationTimestamp: '2020-01-21T23:03:34Z'
annotations:
openshift.io/sa.scc.mcs: 's0:c23,c2'
openshift.io/sa.scc.supplemental-groups: 1000510000/10000
openshift.io/sa.scc.uid-range: 1000510000/10000
spec:
finalizers:
- kubernetes
status:
phase: Active

View File

@@ -50,7 +50,7 @@ metadata:
},
"image": {
"pullPolicy": "IfNotPresent",
"repository": "earlyaccess.jfrog.io/artifactory-pro"
"repository": "image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/artifactory-pro"
},
"internalArtifactoryPort": 8081,
"internalPort": 8082,
@@ -348,7 +348,7 @@ metadata:
},
"image": {
"pullPolicy": "IfNotPresent",
"repository": "earlyaccess.jfrog.io/nginx-artifactory-pro"
"repository": "image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/nginx-artifactory-pro"
},
"labels": {},
"livenessProbe": {

View File

@@ -16,7 +16,6 @@ spec:
containers:
- name: artifactory-ha-operator
image: image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/artifactory-ha
#image: ubuntu
imagePullPolicy: IfNotPresent
env:
- name: WATCH_NAMESPACE