Removed HA Diagram, replaced GCP with Nooba in ReadMe, fixed minimal …

…typos (#7)
quay · May 12, 2021 · 5ab33d2 · 5ab33d2
1 parent c0224ec
commit 5ab33d2
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -29,9 +29,7 @@ These playbooks can be used to setup Quay 3.3.4 and Clair 3.3.4 in an HA configu
 * Version increments are n-1. This means subsequent updates have to be done in order to get to the latest version.
 * For this you can either alter these playbook's config mode part or do a container-by-container update strategy as described [here](https://access.redhat.com/documentation/en-us/red_hat_quay/3.5/html/upgrade_red_hat_quay/standalone_upgrade#upgrade_to_v3_5_0_from_v3_4).
 
-## Diagrams 
-### *Exemplary Quay Cluster*
-![](images/quay-ha-conception.jpg)
+## Screenshots 
 
 ### *Clair High Availability Mode*
 ![](images/clair-ha.png)
@@ -90,14 +88,14 @@ Quay's resulting `config.yaml` file is where everything gets merged into and val
 FEATURE_STORAGE_REPLICATION: true
 DISTRIBUTED_STORAGE_CONFIG:
   default:
-  - AzureStorage
-  - azure_account_key: "{{ secrets.secret_key }}"
-    azure_account_name: quaystorageaccount
-    azure_container: quayblobstorage
-    sas_token: "{{ secrets.secret_key }}"
+  - RHOCSStorage
+  - access_key: "{{ secrets.access_key }}"
+    secret_key: "{{ secrets.secret_key }}"
+    bucket_name: quay-datastore-9b2108a3-29f5-43f2-a9d5-2872174f9a56
+    hostname: s3.openshift-storage.svc.cluster.local
     storage_path: /datastorage/registry
-DISTRIBUTED_STORAGE_DEFAULT_LOCATIONS:
-- westeurope
+    is_secure: true
+    port: 443
 ...
 ```
 
@@ -339,7 +337,7 @@ Then next, you could run `p_smoke_test.yml` playbook to verify the success of yo
 1. **Create Organisation**, e.g. `ubi8` in your deployed Quay User Interface
 
 
-2. **Create aprivate Repository**, e.g. `ubi-minimal`
+2. **Create a private Repository**, e.g. `ubi-minimal`
 
 
 3. **Create the Robot "test_robot"** in the Quay UI by clicking on the hog wheel icon on the left hand side and then the drop down arrow and after creation make sure full robot+name is linked with full admin permissions to the repository you just created

diff --git a/images/quay-ha-conception.jpg b/images/quay-ha-conception.jpg
diff --git a/inventories/dev/group_vars/all.yml b/inventories/dev/group_vars/all.yml
@@ -65,7 +65,7 @@ test_image_api: "ubi8/ubi-minimal"
 test_skip_login_pull: true
 
 quay_test_robot_name: ubi8+test_robot
-quay_test_robot_password: Z9YZFCX4Z8M9PX86SQLJVQLR3MAEPOOSR6FWKUFBMP5HH3BO9EVTP2ZYSTD9DYYY
+quay_test_robot_password: 2M8ILGF6GZST6RFSINNGCMZBZUHGKPDY6Y50MIB11E7KY783XKS6AMYKQSFOW2JS
 quay_system_test_manifest: sha256:90e7a8c15504099bd3a6656ad5f75b26c25822fba6d09d3b067f24c4c6faf4ba
 quay_system_test_bearer: zXhBoyJLD4ErnP4Slh0fQWTVETK0yqF1eRW6XyAD
 

diff --git a/inventories/dev/group_vars/quay.yml b/inventories/dev/group_vars/quay.yml
@@ -28,28 +28,50 @@ quay_config:
   #  DISTRIBUTED_STORAGE_CONFIG:
   #    default:
   #      - AzureStorage
-  #      - { azure_account_key: "{{ secrets.azure_account_key }}",
+  #      - {
+  #          azure_account_key: "{{ secrets.azure_account_key }}",
   #          sas_token: "{{ secrets.azure_sas_token }}",
   #          azure_account_name: quaystorageaccount,
   #          azure_container: quayblobstorage,
-  #          storage_path: /datastorage/registry }
+  #          storage_path: /datastorage/registry
+  #        }
   #  DISTRIBUTED_STORAGE_DEFAULT_LOCATIONS: [westeurope]
   #  DISTRIBUTED_STORAGE_PREFERENCE: [default]
   #  DEFAULT_TAG_EXPIRATION: 4w
 
   # AWS
   #
-  #    DISTRIBUTED_STORAGE_CONFIG:
-  #      default:
-  #        - S3Storage
-  #        - { host: s3-eu-central-1.amazonaws.com,
-  #            s3_access_key: <redacted>,
-  #            s3_bucket: quay-frankfurt-sutnuf,
-  #            s3_secret_key: <redacted>,
-  #            storage_path: /datastorage }
-  #    DISTRIBUTED_STORAGE_DEFAULT_LOCATIONS: [westeurope]
-  #    DISTRIBUTED_STORAGE_PREFERENCE: [default]
-  #    DEFAULT_TAG_EXPIRATION: 4w
+  #  DISTRIBUTED_STORAGE_CONFIG:
+  #    default:
+  #      - S3Storage
+  #      - {
+  #          host: s3-eu-central-1.amazonaws.com,
+  #          s3_access_key: s3_access_key,
+  #          s3_bucket: quay-frankfurt-sutnuf,
+  #          s3_secret_key: s3_secret_key,
+  #          storage_path: /datastorage/registry
+  #         }
+  #  DISTRIBUTED_STORAGE_DEFAULT_LOCATIONS: [westeurope]
+  #  DISTRIBUTED_STORAGE_PREFERENCE: [default]
+  #  DEFAULT_TAG_EXPIRATION: 4w
+
+  # NOOBA
+  #
+  #  DISTRIBUTED_STORAGE_CONFIG:
+  #    default:
+  #      - RHOCSStorage
+  #      - {
+  #         access_key: <access_key
+  #         bucket_name: <bucket_name
+  #         hostname: hostname
+  #         is_secure: true
+  #         port: 443
+  #         secret_key: <secret_key>
+  #         storage_path: /datastorage/registry
+  #        }
+  #  DISTRIBUTED_STORAGE_DEFAULT_LOCATIONS: [local_us]
+  #  DISTRIBUTED_STORAGE_PREFERENCE: [default]
+  #  DEFAULT_TAG_EXPIRATION: 4w
 
   AUTHENTICATION_TYPE: Database # or LDAP
   LDAP_ADMIN_DN: uid=admin,cn=users,cn=accounts,dc=shared,dc=example,dc=opentlc,dc=com

diff --git a/roles/r_quay/tasks/container-clair.yml b/roles/r_quay/tasks/container-clair.yml
@@ -58,7 +58,7 @@
           -p 6060:6060 -p 6061:6061
           -e NO_PROXY=.dev,localhost,127.0.0.1,{{ quay_hostname }}
           -v {{ clair_data_dir }}/config:/clair/config:z
-          -v {{ clair_data_dir }}/anchors/ca.crt:/etc/pki/ca-trust/source/anchors/ca.crt:z
+          -v {{ clair_data_dir }}/anchors/ca.crt:/etc/pki/ca-trust/source/anchors/ca.crt:Z
           {{ clair_image }}
         register: podman_pid
 
@@ -88,7 +88,7 @@
           -e HTTPS_PROXY=http://{{ clair_proxy_name }}:{{ clair_proxy_port }}
           -e NO_PROXY=.dev,localhost,127.0.0.1,{{ quay_hostname }}
           -v {{ clair_data_dir }}/config:/clair/config:z
-          -v {{ clair_data_dir }}/anchors/ca.crt:/etc/pki/ca-trust/source/anchors/ca.crt:z
+          -v {{ clair_data_dir }}/anchors/ca.crt:/etc/pki/ca-trust/source/anchors/ca.crt:Z
           {{ clair_image }}
         register: podman_pid