diff --git a/CHANGELOG.md b/CHANGELOG.md index 51275af2..e7c920cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ listed in the changelog. ## [Unreleased] +## [0.7.0] - 2022-10-11 + ### Changed - Stream Buildah and Aqua log output ([#596](https://github.com/opendevstack/ods-pipeline/issues/596)) diff --git a/README.md b/README.md index 6ac30905..6e6ee4b9 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,9 @@ For OpenShift Pipelines releases and its relationship to Tekton and OpenShift ve | ods-pipeline | OpenShift Pipelines | ODS Core/Quickstarters | |---|---|---| -| [0.6](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.6.0) | 1.6 | 4.0.0 | -| [0.5](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.5.0) | 1.5 | 4.0.0 | -| [0.4](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.4.0) | 1.5 | 4.0.0 | +| [0.7](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.7.0) | 1.6 | 4.x | +| [0.6](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.6.0) | 1.6 | 4.x | +| [0.5](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.5.0) | 1.5 | 4.x | ## Contributing diff --git a/deploy/ods-pipeline/Chart.yaml b/deploy/ods-pipeline/Chart.yaml index 4a935661..cf6d0e83 100644 --- a/deploy/ods-pipeline/Chart.yaml +++ b/deploy/ods-pipeline/Chart.yaml @@ -15,21 +15,21 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.6.0" +appVersion: "0.7.0" dependencies: - name: images - version: 0.6.0 + version: 0.7.0 condition: images.enabled - name: setup - version: 0.6.0 + version: 0.7.0 condition: setup.enabled - name: tasks - version: 0.6.0 + version: 0.7.0 condition: tasks.enabled diff --git a/deploy/ods-pipeline/charts/images/Chart.yaml b/deploy/ods-pipeline/charts/images/Chart.yaml index 8a659404..2e556a70 100644 --- a/deploy/ods-pipeline/charts/images/Chart.yaml +++ b/deploy/ods-pipeline/charts/images/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "0.6.0" +appVersion: "0.7.0" diff --git a/deploy/ods-pipeline/charts/setup/Chart.yaml b/deploy/ods-pipeline/charts/setup/Chart.yaml index 15addcb4..dfe22882 100644 --- a/deploy/ods-pipeline/charts/setup/Chart.yaml +++ b/deploy/ods-pipeline/charts/setup/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "0.6.0" +appVersion: "0.7.0" diff --git a/deploy/ods-pipeline/charts/tasks/Chart.yaml b/deploy/ods-pipeline/charts/tasks/Chart.yaml index ed639dc6..35c68566 100644 --- a/deploy/ods-pipeline/charts/tasks/Chart.yaml +++ b/deploy/ods-pipeline/charts/tasks/Chart.yaml @@ -15,9 +15,9 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.7.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: "0.6.0" +appVersion: "0.7.0" diff --git a/docs/add-to-repository.adoc b/docs/add-to-repository.adoc index 4ba32515..e37b067b 100644 --- a/docs/add-to-repository.adoc +++ b/docs/add-to-repository.adoc @@ -31,14 +31,14 @@ pipeline: - name: backend-build-go taskRef: kind: Task - name: ods-build-go-v0-6-0 + name: ods-build-go-v0-7-0 workspaces: - name: source workspace: shared-workspace - name: backend-package-image taskRef: kind: Task - name: ods-package-image-v0-6-0 + name: ods-package-image-v0-7-0 runAfter: - backend-build-go workspaces: @@ -47,7 +47,7 @@ pipeline: - name: backend-deploy taskRef: kind: Task - name: ods-deploy-helm-v0-6-0 + name: ods-deploy-helm-v0-7-0 runAfter: - backend-package-image workspaces: @@ -55,9 +55,9 @@ pipeline: workspace: shared-workspace ---- -The only Go specific task is `ods-build-go-v0-6-0`, if you use another technology, exchange the task for another one such as `ods-build-gradle-v0-5-1`. +The only Go specific task is `ods-build-go-v0-7-0`, if you use another technology, exchange the task for another one such as `ods-build-gradle-v0-7-0`. -The `ods-package-image-v0-6-0` task assumes the Docker context in the `docker` directory, and the `Dockerfile` located inside that folder. Therefore, create a directory `docker` and create a `Dockerfile` inside like this one: +The `ods-package-image-v0-7-0` task assumes the Docker context in the `docker` directory, and the `Dockerfile` located inside that folder. Therefore, create a directory `docker` and create a `Dockerfile` inside like this one: .Dockerfile [source] @@ -71,11 +71,11 @@ EXPOSE 8080 CMD ["./app"] ---- -NOTE: `ods-build-go-v0-6-0` produces a binary called `app` and places it at `docker/app` so that it can be referenced in the `Dockerfile` and copied into the image by the `ods-package-image-v0-5-1` task. +NOTE: `ods-build-go-v0-7-0` produces a binary called `app` and places it at `docker/app` so that it can be referenced in the `Dockerfile` and copied into the image by the `ods-package-image-v0-5-1` task. == Create Helm Chart -The `ods-deploy-helm-v0-6-0` requires a Helm chart to be present to deploy the Kubernetes resources for the application. It is recommended to start with the link:https://github.com/opendevstack/ods-pipeline/tree/sample-helm-chart[sample chart provided in this repository]. +The `ods-deploy-helm-v0-7-0` requires a Helm chart to be present to deploy the Kubernetes resources for the application. It is recommended to start with the link:https://github.com/opendevstack/ods-pipeline/tree/sample-helm-chart[sample chart provided in this repository]. == Configure Webhook diff --git a/docs/convert-quickstarter-component.adoc b/docs/convert-quickstarter-component.adoc index ff5ed3d4..c90eeb30 100644 --- a/docs/convert-quickstarter-component.adoc +++ b/docs/convert-quickstarter-component.adoc @@ -101,14 +101,14 @@ pipeline: - name: backend-build-go taskRef: kind: Task - name: ods-build-go-v0-6-0 + name: ods-build-go-v0-7-0 workspaces: - name: source workspace: shared-workspace - name: backend-package-image taskRef: kind: Task - name: ods-package-image-v0-6-0 + name: ods-package-image-v0-7-0 runAfter: - backend-build-go workspaces: @@ -117,7 +117,7 @@ pipeline: - name: backend-deploy taskRef: kind: Task - name: ods-deploy-helm-v0-6-0 + name: ods-deploy-helm-v0-7-0 runAfter: - backend-package-image workspaces: @@ -125,13 +125,13 @@ pipeline: workspace: shared-workspace ---- -What has been done in Jenkins in `stageCheckFormat`, `stageLint`, `stageUnitTest`, `stageBuild` and `odsComponentStageScanWithSonar` is now done by the `ods-build-go-v0-6-0` task. If you have modified how the application is tested and built, or added further steps, you will need to create your own Tekton tasks reflecting those changes. See the link:authoring-tasks.adoc[authoring tasks] guide. +What has been done in Jenkins in `stageCheckFormat`, `stageLint`, `stageUnitTest`, `stageBuild` and `odsComponentStageScanWithSonar` is now done by the `ods-build-go-v0-7-0` task. If you have modified how the application is tested and built, or added further steps, you will need to create your own Tekton tasks reflecting those changes. See the link:authoring-tasks.adoc[authoring tasks] guide. -Building the container image is now done in `ods-package-image-v0-6-0` instead of in `odsComponentStageBuildOpenShiftImage`. The task continues to use the existing `docker/Dockerfile` file, which does not need to change much if at all. Consult the task reference in question for more information. In the case of Go, the link:tasks/ods-build-go.adoc[`ods-build-go` task reference] states that the resulting Go binary is named `app` and placed into the `docker` directory. Make sure that your `docker/Dockerfile` copies `app`, not e.g. `app_linux_amd64` (as is the default for an ODS 4.x based Go quickstarter). +Building the container image is now done in `ods-package-image-v0-7-0` instead of in `odsComponentStageBuildOpenShiftImage`. The task continues to use the existing `docker/Dockerfile` file, which does not need to change much if at all. Consult the task reference in question for more information. In the case of Go, the link:tasks/ods-build-go.adoc[`ods-build-go` task reference] states that the resulting Go binary is named `app` and placed into the `docker` directory. Make sure that your `docker/Dockerfile` copies `app`, not e.g. `app_linux_amd64` (as is the default for an ODS 4.x based Go quickstarter). == Create Helm Chart -Finally, the application is deployed in `ods-deploy-helm-v0-6-0` as opposed to `odsComponentStageRolloutOpenShiftDeployment`. +Finally, the application is deployed in `ods-deploy-helm-v0-7-0` as opposed to `odsComponentStageRolloutOpenShiftDeployment`. Let's look at this deployment piece in detail. The new Tekton task makes use of Helm to define and deploy the Kubernetes resources to use. Your existing repository might not define Kubernetes resources at all (this is the default), or they might be expressed as OpenShift templates (in a folder named `openshift`) and applied with link:https://github.com/opendevstack/tailor[Tailor]. ODS pipeline only supports Helm at the moment, and requires the Kubernetes resources (the Helm "chart") to be under version control. It is recommended to start with the link:https://github.com/opendevstack/ods-pipeline/tree/sample-helm-chart[sample chart provided in this repository]. If the existing component controlled resources via Tailor, please see the link:https://github.com/opendevstack/tailor/wiki/Migrating-from-Tailor-to-Helm#ods-quickstarter-migration[ODS Quickstarter Migration Guide] of Tailor as well. == Configure Webhook diff --git a/docs/example-project.adoc b/docs/example-project.adoc index 10008811..86625094 100644 --- a/docs/example-project.adoc +++ b/docs/example-project.adoc @@ -33,14 +33,14 @@ pipeline: - name: build taskRef: kind: Task - name: ods-build-go-v0-6-0 + name: ods-build-go-v0-7-0 workspaces: - name: source workspace: shared-workspace - name: package taskRef: kind: Task - name: ods-package-image-v0-6-0 + name: ods-package-image-v0-7-0 runAfter: - build workspaces: @@ -49,7 +49,7 @@ pipeline: - name: deploy taskRef: kind: Task - name: ods-deploy-helm-v0-6-0 + name: ods-deploy-helm-v0-7-0 runAfter: - package workspaces: @@ -74,14 +74,14 @@ pipeline: - name: build taskRef: kind: Task - name: ods-build-npm-v0-6-0 + name: ods-build-npm-v0-7-0 workspaces: - name: source workspace: shared-workspace - name: package taskRef: kind: Task - name: ods-package-image-v0-6-0 + name: ods-package-image-v0-7-0 runAfter: - build workspaces: @@ -90,7 +90,7 @@ pipeline: - name: deploy taskRef: kind: Task - name: ods-deploy-helm-v0-6-0 + name: ods-deploy-helm-v0-7-0 runAfter: - package workspaces: @@ -134,7 +134,7 @@ pipeline: - name: deploy taskRef: kind: ClusterTask - name: ods-deploy-helm-v0-6-0 + name: ods-deploy-helm-v0-7-0 workspaces: - name: source workspace: shared-workspace diff --git a/docs/installation.adoc b/docs/installation.adoc index 7c2435d2..8fd910be 100644 --- a/docs/installation.adoc +++ b/docs/installation.adoc @@ -35,7 +35,7 @@ Then, use `git subtree` to get the required sources. The following commands may [source] ---- -pipelineGitRef=v0.6.0 # Pick the version you want to install +pipelineGitRef=v0.7.0 # Pick the version you want to install git fetch --depth=1 https://github.com/opendevstack/ods-pipeline.git $pipelineGitRef:ods-pipeline-$pipelineGitRef && \ git checkout ods-pipeline-$pipelineGitRef && \ @@ -156,7 +156,7 @@ You may fetch updates (e.g. new versions) of `ods-pipeline` like this: [source] ---- -pipelineGitRef=v0.6.0 # Pick the version you want to install +pipelineGitRef=v0.7.0 # Pick the version you want to install git fetch --depth=1 https://github.com/opendevstack/ods-pipeline.git $pipelineGitRef:ods-pipeline-$pipelineGitRef && \ git checkout ods-pipeline-$pipelineGitRef && \ @@ -199,4 +199,4 @@ This will install all prerequisites automatically and update your ODS Pipeline i After successful installation in OpenShift, builds for the container images used in the pipeline manager and Tekton tasks will be triggered automatically. It is recommended to check that all builds succeed before proceeding. -Once the resources in your namespace are updated, you can update the `ods.yaml` files in your repository and point to the new tasks, e.g. changing `ods-build-go-v0-5-1` to `ods-build-go-v0-6-0`. +Once the resources in your namespace are updated, you can update the `ods.yaml` files in your repository and point to the new tasks, e.g. changing `ods-build-go-v0-6-0` to `ods-build-go-v0-7-0`. diff --git a/docs/introduction.adoc b/docs/introduction.adoc index 97068d64..24b36f0f 100644 --- a/docs/introduction.adoc +++ b/docs/introduction.adoc @@ -72,14 +72,14 @@ pipeline: - name: build-go taskRef: kind: Task - name: ods-build-go-v0-6-0 + name: ods-build-go-v0-7-0 workspaces: - name: source workspace: shared-workspace - name: package-image taskRef: kind: Task - name: ods-package-image-v0-6-0 + name: ods-package-image-v0-7-0 runAfter: - build-go workspaces: @@ -88,7 +88,7 @@ pipeline: - name: deploy-helm taskRef: kind: Task - name: ods-deploy-helm-v0-6-0 + name: ods-deploy-helm-v0-7-0 runAfter: - package-image workspaces: diff --git a/docs/ods-configuration.adoc b/docs/ods-configuration.adoc index b082a472..8721bc17 100644 --- a/docs/ods-configuration.adoc +++ b/docs/ods-configuration.adoc @@ -27,14 +27,14 @@ pipeline: - name: build taskRef: kind: Task - name: ods-build-go-v0-6-0 + name: ods-build-go-v0-7-0 workspaces: - name: source workspace: shared-workspace - name: package taskRef: kind: Task - name: ods-package-image-v0-6-0 + name: ods-package-image-v0-7-0 runAfter: - build workspaces: