From a833c0f0529ec14d22e26e72f42517ff5cbc9be3 Mon Sep 17 00:00:00 2001 From: jbtrystram Date: Thu, 5 Dec 2024 09:09:19 +0100 Subject: [PATCH] coreos/cincinnati guide update Since https://pagure.io/fedora-infra/ansible/c/3ba43f2bd4461b56419fdc89f2e082a7933c5636 the two different commits pins (build and deploy) are not necessary. Update the documentation to reflect that. --- .../pages/coreos-cincinnati.adoc | 23 ++++--------------- 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/modules/sysadmin_guide/pages/coreos-cincinnati.adoc b/modules/sysadmin_guide/pages/coreos-cincinnati.adoc index e7e562f..6f2b405 100644 --- a/modules/sysadmin_guide/pages/coreos-cincinnati.adoc +++ b/modules/sysadmin_guide/pages/coreos-cincinnati.adoc @@ -43,21 +43,21 @@ Policy-engine:: == Upgrades -=== Building a new version +=== Build and deploy a new version FCOS Cincinnati is built as container image directly from source, referencing a pinned git commit. -In order to build a new version, you will first have to find the +In order to build and deploy a new version, you will first have to find the relevant commit (i.e. the latest on the `main` branch) at https://github.com/coreos/fedora-coreos-cincinnati . Once you have identified the target commit, these are the steps to build a new container image: - * update the `fcos_cincinnati_build_git_sha` playbook variable in + * update the `fcos_cincinnati_git_sha` playbook variable in `roles/openshift-apps/coreos-cincinnati/vars/staging.yml` - * update the `fcos_cincinnati_build_git_sha` playbook variable in + * update the `fcos_cincinnati_git_sha` playbook variable in `roles/openshift-apps/coreos-cincinnati/vars/production.yml` * commit and push the update to the `fedora-infra/ansible` repository * SSH to `batcave01.iad2.fedoraproject.org` @@ -65,20 +65,7 @@ a new container image: your FAS password and your second-factor OTP * schedule a new build by running `sudo rbac-playbook -t build openshift-apps/coreos-cincinnati.yml` - -=== Deploying a new version - -Once the target commit has been built into a container image, these are -the steps to deploy the new image: - - * update the `fcos_cincinnati_deploy_git_sha` playbook variable in - `roles/openshift-apps/coreos-cincinnati/vars/staging.yml` - * update the `fcos_cincinnati_deploy_git_sha` playbook variable in - `roles/openshift-apps/coreos-cincinnati/vars/production.yml` - * commit and push the update to the `fedora-infra/ansible` repository - * SSH to `batcave01.iad2.fedoraproject.org` - * run `sudo rbac-playbook openshift-apps/coreos-cincinnati.yml` using - your FAS password and your second-factor OTP + * Wait for the coreos-cincinnati-img:latest tag to be updated == Things that could go wrong