fusor / catasb

Ansible scripts to setup an 'oc cluster up' environment for testing the Service Catalog and Ansible Service Broker on EC2 or Local
47 stars 33 forks source link

Add ability to deploy OLM + Admin Console for 3.11+ #257

Closed djwhatle closed 6 years ago

djwhatle commented 6 years ago

Changes:

To test this PR:

Excerpt from config/my_vars.yml.example:

# Make sure these config variables match what's shown here.
deploy_olm: true                 # set to true to deploy OLM                                     
deploy_admin_console: true       # set to true to deploy the OpenShift "Admin Console" in addition to the regular console      

origin_image_tag: v3.11          # needed to isolate from instability in latest
openshift_client_version: latest # can't use 3.11 tag here yet since official 3.11 client isn't released yet

# OTHER new variables added, no need to adjust these
# olm_version: "0.6.0"                                                             
# admin_console_image: "quay.io/openshift/origin-console:latest"

Sample catasb output when admin console is enabled:

TASK [debug] **********************************************************************************************************
ok: [localhost] => {
    "msg": [
        "Hostname:                  <my_ip>", 
        "OpenShift Web Console: https://<my_ip>:8443", 
        "CLI: oc login --insecure-skip-tls-verify <my_ip>:8443 -u admin -p admin", 
        ""
    ]
}

TASK [debug] **********************************************************************************************************
ok: [localhost] => {
    "msg": "OpenShift Admin Console: http://origin-console-admin-console.<my_ip>.nip.io"
}

New "admin console" with OLM UI:

image

djwhatle commented 6 years ago

Just found out that OLM is intended to ship with several CatalogSources pre-enabled.

image

While these CatalogSources are already created by the manifests in this PR, they are created in the wrong namespace (kube-system instead of operator-lifecycle-manager).

Evan from the OLM team mentioned he will be creating deploy manifests targeting OpenShift in the future. For now, if we want the "Starter Operators" to show up in the catalog, I'll need to create the ocs configmap and catalogsource in the operator-lifecycle-manager namespace.

djwhatle commented 6 years ago

Now deploys with default OCS CatalogSource visible by default.

djwhatle commented 6 years ago

OLM maintainers created an OKD release target (was previously changing values in the "Upstream" release target to make this run on OKD 3.11)

This new target was made available in the 0.7.0 release, which I have added to this PR. I don't suspect that anything has changed other than different namespaces in the OLM manifest provided.

Running a test now. Will post here if 0.7.0 works the same as 0.6.0.

djwhatle commented 6 years ago

Works fine with 0.7.0 manifest. Changes were made to master that required some merge conflict resolution, so testing once more, then will be ready to merge.

djwhatle commented 6 years ago

Tested working after resolving conflicts with master. New CatalogSource shows by default with 0.7.0 update.

screen shot 2018-09-17 at 2 09 35 pm