diff --git a/CITATION.cff b/CITATION.cff index c902e0473..89c8f8b2f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -5,6 +5,6 @@ authors: title: Cloud API Adaptor abstract: Ability to create Kata pods using cloud provider APIs aka the peer-pods approach license: Apache-2.0 -version: 0.10.0 -date-released: 2024-10-04 -commit: c095957ee417fa1d545d2bfe685cd3a80aff7a0d +version: 0.11.0 +date-released: 2024-11-29 +commit: 7a5ec0e278a20ba0e7d349e6f08c8dc179568333 diff --git a/docs/Release-Process.md b/docs/Release-Process.md index 4e795bbea..ad41ee22b 100644 --- a/docs/Release-Process.md +++ b/docs/Release-Process.md @@ -64,7 +64,7 @@ the correct order. > If you mess up, you need to restart the tagging with the next patch version. The process should go something like: -- Get the pre-release version: `v-alpha.1` (e.g. `v0.8.0-alpha.1` for the confidential containers `0.8.0` release release candidate). +- Determine the pre-release version: `v-alpha.1` (e.g. `v0.8.0-alpha.1` for the confidential containers `0.8.0` release candidate). - Update the [peerpod-ctrl go module](../src/peerpod-ctrl/go.mod) to use the release candidate version version of `cloud-providers` - Update the [cloud-api-adaptor go module](../src/cloud-api-adaptor/go.mod) to use the release candidate version version of `cloud-providers` and `peerpod-ctrl` - Update the [csi-wrapper go module](../src/csi-wrapper/go.mod) to use the the release candidate version version of `cloud-api-adaptor` @@ -149,10 +149,10 @@ RELEASE_TAG="6d7d2a3fe8243809b3c3a710792c8498292e2fc3" Include those changes within a commit and add the following changes as a second commit: -We then can repeat the steps done during the release candidate phase, but this time use the -release tags of the project dependencies e.g. `v0.8.0` and creating the tags without the `-alpha.x` suffix. +We then repeat the steps performed during the release candidate phase, but this time use the +release tags of the project dependencies e.g. `v0.8.0` without an `-alpha.x` suffix. -- Get the release version: `v0.8.0` +- Determine the release version: `v0.8.0` - Update the [peerpod-ctrl go module](../src/peerpod-ctrl/go.mod) to use the release version version of `cloud-providers` - Update the [cloud-api-adaptor go module](../src/cloud-api-adaptor/go.mod) to use the release version version of `cloud-providers` and `peerpod-ctrl` - Update the [csi-wrapper go module](../src/csi-wrapper/go.mod) to use the the release version version of `cloud-api-adaptor` @@ -160,7 +160,10 @@ release tags of the project dependencies e.g. `v0.8.0` and creating the tags wit - Merge the 2 commits PR with this update to update the `main` branch > **Note:** as the `main` branch is locked, this might require an admin to unlock, or bypass the merge restriction. -- Create git tags for the release, for all go modules e.g. To create the tags for the upstream branch with the `v0.8.0` release, run: +- Make sure to update the local `main` branch after the PR is merged. + +- From the main branch, create git tags for the release, for all go modules e.g. To push the tags on the `upstream` remote (this remote should point to the `confidential-containers/cloud-api-adaptor` repo) for the `v0.8.0` release, run: + ```bash ./hack/release-helper.sh go-tag v0.8.0 upstream The intput release tag: v0.8.0 @@ -200,7 +203,8 @@ To github.com:confidential-containers/cloud-api-adaptor.git * [new tag] src/webhook/v0.8.0 -> src/webhook/v0.8.0 ``` -We can run the latest release of the cloud-api-adaptor including the auto generated release notes. +We then create a cloud-api-adaptor [release](https://github.com/confidential-containers/cloud-api-adaptor/releases/new) +named `v`. Choose the "Create new tag" option when drafting a release. This will trigger the podvm builds to happen again and we should re-test the release code before updating the confidential-containers release team to let them know it has completed successfully @@ -213,4 +217,4 @@ The CoCo operator reference commit in the [versions.yaml](../src/cloud-api-adapt The commit that pinned the overlay kustomization files should be reverted to start using the latest cloud-api-adaptor images again. -The `CITATION.cff` needs to be updated with the dates from the release. +Update strings in documentation (e.g. `0.7.0` => `0.8.0`) and the `CITATION.cff` file with the release date, git sha and version. diff --git a/src/cloud-api-adaptor/install/README.md b/src/cloud-api-adaptor/install/README.md index dbd8d7183..97acb2739 100644 --- a/src/cloud-api-adaptor/install/README.md +++ b/src/cloud-api-adaptor/install/README.md @@ -46,10 +46,10 @@ Take a look at the [tags](https://github.com/confidential-containers/operator/tags) for available releases and use the specific tag for deployment. -For example if you want to install `v0.10.0` then run the following commands: +For example if you want to install `v0.11.0` then run the following commands: ```sh - export RELEASE_VERSION=v0.10.0 + export RELEASE_VERSION=v0.11.0 kubectl apply -k github.com/confidential-containers/operator/config/default?ref=${RELEASE_VERSION} kubectl apply -k github.com/confidential-containers/operator/config/samples/ccruntime/peer-pods?ref=${RELEASE_VERSION} ``` diff --git a/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml index d64e2f7ea..e8bc50b70 100644 --- a/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/aws/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml index e1ac25857..4e59551d4 100644 --- a/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/azure/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml index 29e32cdd2..3056e8d76 100644 --- a/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/docker/kustomization.yaml @@ -7,7 +7,7 @@ bases: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml index 3cc72ec45..16d1b14e8 100644 --- a/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/gcp/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: 192.168.122.1:5000/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml index ccfd28de6..09b552cf7 100644 --- a/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/ibmcloud-powervs/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml index af5384bfa..8f1bbcb50 100644 --- a/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/ibmcloud/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml index 0ea9d86a1..3b7280332 100644 --- a/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/libvirt/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: dev-711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml b/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml index 32db1b5e5..da20be4f2 100644 --- a/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml +++ b/src/cloud-api-adaptor/install/overlays/vsphere/kustomization.yaml @@ -7,7 +7,7 @@ resources: images: - name: cloud-api-adaptor newName: quay.io/confidential-containers/cloud-api-adaptor # change image if needed - newTag: 711a54235193da7092daa5e540f7822b76cb5b24 + newTag: latest generatorOptions: disableNameSuffixHash: true diff --git a/src/cloud-api-adaptor/versions.yaml b/src/cloud-api-adaptor/versions.yaml index 62b9c710a..6422d1a10 100644 --- a/src/cloud-api-adaptor/versions.yaml +++ b/src/cloud-api-adaptor/versions.yaml @@ -30,7 +30,7 @@ tools: git: coco-operator: url: https://github.com/confidential-containers/operator - reference: v0.11.0 + reference: main umoci: url: https://github.com/opencontainers/umoci reference: v0.4.7