Issue 54 elasticsearch

elastisearch-operator/base/elasticsearch-operatorgroup.yaml

@@ -0,0 +1,6 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: openshift-operators-redhat
+  namespace: openshift-operators-redhat
+spec: {}

elastisearch-operator/base/elastisearch-subscription.yaml

@@ -4,8 +4,8 @@ metadata:
   name: elasticsearch-operator
   namespace: openshift-operators-redhat
 spec:
-  channel: "4.5"
+  channel: "patch-me-in-overlay"
   installPlanApproval: Automatic
   name: elasticsearch-operator
   source: redhat-operators
-  sourceNamespace: openshift-marketplace
+  sourceNamespace: openshift-marketplace

elastisearch-operator/base/kustomization.yaml

@@ -4,4 +4,6 @@ kind: Kustomization
 namespace: openshift-operators-redhat
 
 resources:
-- elastisearch-subscription.yaml
+  - namespace.yaml
+  - elastisearch-subscription.yaml
+  - elasticsearch-operatorgroup.yaml

elastisearch-operator/base/namespace.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-operators-redhat

rhsso/rhsso-operator/base/kustomization.yaml

@@ -4,6 +4,6 @@ kind: Kustomization
 resources:
 - rhsso-operatorgroup.yaml
 - rhsso-subscription.yaml
-- approval-and-cert-job.yaml
+- rhsso-operator-config-job.yaml
 - serviceaccount.yaml
 - rbac.yaml

rhsso/rhsso-operator/base/rbac.yaml

@@ -1,17 +1,3 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: installplan-approver
-rules:
-  - apiGroups:
-      - operators.coreos.com
-    resources:
-      - installplans
-      - subscriptions
-    verbs:
-      - get
-      - list
-      - patch
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -29,19 +15,6 @@ rules:
       - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: installplan-approvers
-  namespace: sso
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: installplan-approver
-subjects:
-  - kind: ServiceAccount
-    name: rhsso-operator-job
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: rhsso-cert-secret-creators
@@ -52,5 +25,5 @@ roleRef:
   name: rhsso-cert-secret-creator
 subjects:
   - kind: ServiceAccount
-    name: rhsso-operator-job
-    namespace: sso
+    name: rhsso-operator-config-job
+    namespace: sso

rhsso/rhsso-operator/base/rhsso-operator-config-job.yaml

@@ -0,0 +1,29 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: rhsso-operator-config-job
+spec:
+  template:
+    spec:
+      containers:
+        - image: registry.redhat.io/openshift4/ose-cli:v4.8
+          command:
+            - /bin/bash
+            - -c
+            - |
+              export HOME=/tmp/approver
+
+              echo "GENERATE_OPENID_CERT set to 'true'.  Create a ConfigMap named openidcrt in the openshift-config project."
+
+              # Get name of certs secret.  It can be router-certs or router-certs-default.
+              CERT_SECRET=$(oc get secrets -n openshift-ingress | grep 'router-certs\|ingress-certs\|-ingress' | cut -d ' ' -f1)
+
+              tlscert=`oc get secrets/$CERT_SECRET -o jsonpath={.data.'tls\.crt'} -n openshift-ingress | base64 --decode`
+              oc create configmap openidcacrt --from-literal ca.crt="$tlscert" -n openshift-config
+          imagePullPolicy: Always
+          name: installplan-approver-and-cert-secret
+      dnsPolicy: ClusterFirst
+      restartPolicy: OnFailure
+      serviceAccount: rhsso-operator-config-job
+      serviceAccountName: rhsso-operator-config-job
+      terminationGracePeriodSeconds: 30

rhsso/rhsso-operator/base/rhsso-operatorgroup.yaml

@@ -1,11 +1,8 @@
 apiVersion: operators.coreos.com/v1
 kind: OperatorGroup
 metadata:
-  annotations:
-    olm.providedAPIs: Keycloak.v1alpha1.keycloak.org,KeycloakBackup.v1alpha1.keycloak.org,KeycloakClient.v1alpha1.keycloak.org,KeycloakRealm.v1alpha1.keycloak.org,KeycloakUser.v1alpha1.keycloak.org
   generateName: sso-
   name: sso
 spec:
-  targetNamespaces:
-  - sso
+  targetNamespaces: []
 

rhsso/rhsso-operator/base/rhsso-subscription.yaml

@@ -4,7 +4,7 @@ metadata:
   name: rhsso-operator
 spec:
   channel: alpha
-  installPlanApproval: Manual
+  installPlanApproval: Automatic
   name: rhsso-operator
   source: redhat-operators
-  sourceNamespace: openshift-marketplace
+  sourceNamespace: openshift-marketplace

rhsso/rhsso-operator/base/serviceaccount.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: rhsso-operator-job
+  name: rhsso-operator-config-job