From 8d1c1adf1c93d34fede0947b7cddcd36c02e1423 Mon Sep 17 00:00:00 2001 From: Jack Hodgkiss Date: Tue, 19 Dec 2023 16:30:43 +0000 Subject: [PATCH 1/2] feat!: update `github_default_registry` The URL, username and password have been changed to use repository variables and secrets by default. This is has been done to simplify deployment as the steps would be the same regardless of single environment or multiple environment. --- galaxy.yml | 2 +- roles/github/README.md | 2 +- roles/github/vars/main.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/galaxy.yml b/galaxy.yml index 20b6885..78f94a8 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -8,7 +8,7 @@ namespace: stackhpc name: kayobe_workflows # The version of the collection. Must be compatible with semantic versioning -version: 1.0.1 +version: 1.0.2 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/github/README.md b/roles/github/README.md index 90d9292..0e0e51d 100644 --- a/roles/github/README.md +++ b/roles/github/README.md @@ -46,7 +46,7 @@ The following variables can be used to make small adjustments to the composition `github_image_tag`: tag used to select kayobe image defaults to `latest` -`github_registry`: dictionary containing keys that correspond to `url`, `username`, `password` and `share` for the registry to be used by the workflows. Defaults to `ghcr.io` and uses the actors token to login. The key `share` is to indiciate if the registry is shared between environments. +`github_registry`: dictionary containing keys that correspond to `url`, `username`, `password` and `share` for the registry to be used by the workflows. By default it use repository varialbes and settings `REGISTRY_URL`, `REGISTRY_USERNAME`, `REGISTRY_PASSWORD`. The key `share` is to indiciate if the registry is shared between environments. `github_kayobe_base_image`: select the base image used when building the kayobe docker image. Default is `quay.io/centos/centos:stream8` supports OpenStack Wallaby, Xena and Yoga. Zed and higher would require `quay.io/rockylinux/rockylinux:9`. diff --git a/roles/github/vars/main.yml b/roles/github/vars/main.yml index f4be3ec..70f01ce 100644 --- a/roles/github/vars/main.yml +++ b/roles/github/vars/main.yml @@ -1,8 +1,8 @@ --- github_default_registry: - url: ghcr.io - username: !unsafe "${{ github.actor }}" - password: !unsafe "${{ secrets.GITHUB_TOKEN }}" + url: !unsafe "${{ vars.REGISTRY_URL }}" + username: !unsafe "${{ vars.REGISTRY_USERNAME }}" + password: !unsafe "${{ secrets.REGISTRY_PASSWORD }}" share: false github_default_kayobe_arguments: From cd468e90dcd9c77651f2437342a0ed60947b72ce Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 20 Dec 2023 09:09:25 +0000 Subject: [PATCH 2/2] Fix typo in github role README --- roles/github/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/github/README.md b/roles/github/README.md index 0e0e51d..f6decc8 100644 --- a/roles/github/README.md +++ b/roles/github/README.md @@ -46,7 +46,7 @@ The following variables can be used to make small adjustments to the composition `github_image_tag`: tag used to select kayobe image defaults to `latest` -`github_registry`: dictionary containing keys that correspond to `url`, `username`, `password` and `share` for the registry to be used by the workflows. By default it use repository varialbes and settings `REGISTRY_URL`, `REGISTRY_USERNAME`, `REGISTRY_PASSWORD`. The key `share` is to indiciate if the registry is shared between environments. +`github_registry`: dictionary containing keys that correspond to `url`, `username`, `password` and `share` for the registry to be used by the workflows. By default it uses repository variables and settings `REGISTRY_URL`, `REGISTRY_USERNAME`, `REGISTRY_PASSWORD`. The key `share` is to indiciate if the registry is shared between environments. `github_kayobe_base_image`: select the base image used when building the kayobe docker image. Default is `quay.io/centos/centos:stream8` supports OpenStack Wallaby, Xena and Yoga. Zed and higher would require `quay.io/rockylinux/rockylinux:9`.