updates to openshift v4.3.5 to artifactory-ha v7.3.2

Openshift4/artifactory-ha-operator/deploy/catalogsourceconfig.yaml

@@ -0,0 +1,8 @@
+apiVersion: operators.coreos.com/v1
+kind: CatalogSourceConfig
+metadata:
+  name: artifactory-ha-operator-csc
+  namespace: openshift-marketplace
+spec:
+  targetNamespace: jfrog-artifactory
+  packages: artifactory-ha-operator

Openshift4/artifactory-ha-operator/deploy/hostpathscc.yaml

@@ -1,18 +0,0 @@
-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

Openshift4/artifactory-ha-operator/deploy/imagestream-nginx.yaml

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

Openshift4/artifactory-ha-operator/deploy/imagestream-operator.yaml

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

Openshift4/artifactory-ha-operator/deploy/imagestream-pro.yaml

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

Openshift4/artifactory-ha-operator/deploy/operator.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: artifactory-ha-operator
       containers:
         - name: artifactory-ha-operator
-          image: image-registry.openshift-image-registry.svc:5000/jfrog-artifactory/artifactory-ha
+          image: quay.io/jfrog/artifactory-ha-operator
           imagePullPolicy: IfNotPresent
           env:
             - name: WATCH_NAMESPACE
@@ -28,3 +28,17 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: "artifactory-ha-operator"
+            - name: RELATED_IMAGE_ARTIFACTORY_IMAGE_REPOSITORY
+              value: "quay.io/jfrog/artifactory-rh-pro"
+            - name: RELATED_IMAGE_NGINX_IMAGE_REPOSITORY
+              value: "quay.io/jfrog/nginx-artifactory-rh-pro"
+            - name: DATABASE_TYPE
+              value: "OVERRIDE"
+            - name: DATABASE_DRIVER
+              value: "OVERRIDE"
+            - name: DATABASE_URL
+              value: "OVERRIDE"
+            - name: DATABASE_USER
+              value: "OVERRIDE"
+            - name: DATABASE_PASSWORD
+              value: "OVERRIDE"

Openshift4/artifactory-ha-operator/deploy/operatorgroup.yaml

@@ -1,7 +1,7 @@
 apiVersion: operators.coreos.com/v1alpha2
 kind: OperatorGroup
 metadata:
-  name: jfrog-group
+  name: jfrog-operator-group
   namespace: jfrog-artifactory
 spec:
   targetNamespaces:

Openshift4/artifactory-ha-operator/deploy/project.yaml

@@ -10,7 +10,7 @@ objects:
     annotations:
       openshift.io/description: JFrog Artifactory
       openshift.io/display-name: jfrog-artifactory
-      openshift.io/requester: johnp@jfrog.com
+      openshift.io/requester: integrations@jfrog.com
     creationTimestamp: null
     name: jfrog-artifactory
   spec: {}

Openshift4/artifactory-ha-operator/deploy/role.yaml

@@ -4,6 +4,40 @@ metadata:
   creationTimestamp: null
   name: artifactory-ha-operator
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  - services
+  - services/finalizers
+  - endpoints
+  - persistentvolumeclaims
+  - events
+  - configmaps
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - apps
+  resources:
+  - deployments
+  - daemonsets
+  - replicasets
+  - statefulsets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
 - apiGroups:
   - ""
   resources:
@@ -23,41 +57,6 @@ rules:
   - events
   verbs:
   - create
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - networkpolicies
-  verbs:
-  - '*'
-- apiGroups:
-  - policy
-  resources:
-  - poddisruptionbudgets
-  verbs:
-  - '*'
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  - secrets
-  - serviceaccounts
-  - services
-  verbs:
-  - '*'
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
-  - rolebindings
-  - roles
-  verbs:
-  - '*'
-- apiGroups:
-  - apps
-  resources:
-  - deployments
-  - statefulsets
-  verbs:
-  - '*'
 - apiGroups:
   - monitoring.coreos.com
   resources:

Openshift4/artifactory-ha-operator/deploy/securitycontextconstraints.yaml

@@ -1,15 +0,0 @@
-kind: SecurityContextConstraints
-apiVersion: v1
-metadata:
-  name: scc-admin
-allowPrivilegedContainer: true
-runAsUser:
-  type: RunAsAny
-seLinuxContext:
-  type: RunAsAny
-fsGroup:
-  type: RunAsAny
-supplementalGroups:
-  type: RunAsAny
-users:
-- kubeadmin

Openshift4/artifactory-ha-operator/deploy/subscription.yaml

@@ -0,0 +1,10 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: artifactory-ha-operator
+  namespace: jfrog-artifactory
+spec:
+  channel: alpha
+  name: artifactory-ha-operator
+  source: artifactory-ha-operator-csc
+  sourceNamespace: openshift-operators