Skip to content

Commit

Permalink
Create 0.11.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelsauter committed Mar 31, 2023
1 parent 96626e4 commit 2463936
Show file tree
Hide file tree
Showing 19 changed files with 65 additions and 63 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ listed in the changelog.

## [Unreleased]

## [0.11.1] - 2023-03-31

### Fixed

- Configure Git to use bearer token auth mechanism ([#683](https://github.com/opendevstack/ods-pipeline/issues/683))
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ For OpenShift Pipelines releases and its relationship to Tekton and OpenShift ve

| ods-pipeline | OpenShift Pipelines | ODS Core/Quickstarters |
|---|---|---|
| [0.11](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.11.0) | 1.9 | 4.x |
| [0.11](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.11.1) | 1.9 | 4.x |
| [0.10](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.10.1) | 1.9 | 4.x |
| [0.9](https://github.com/opendevstack/ods-pipeline/releases/tag/v0.9.0) | 1.6 | 4.x |

Expand Down
8 changes: 4 additions & 4 deletions deploy/ods-pipeline/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ 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.11.0
version: 0.11.1

# 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.11.0"
appVersion: "0.11.1"

dependencies:
- name: setup
version: 0.11.0
version: 0.11.1
condition: setup.enabled
- name: tasks
version: 0.11.0
version: 0.11.1
condition: tasks.enabled
4 changes: 2 additions & 2 deletions deploy/ods-pipeline/charts/setup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0
version: 0.11.1

# 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.11.0"
appVersion: "0.11.1"
4 changes: 2 additions & 2 deletions deploy/ods-pipeline/charts/tasks/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.0
version: 0.11.1

# 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.11.0"
appVersion: "0.11.1"
20 changes: 10 additions & 10 deletions docs/add-to-repository.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ pipeline:
- name: build
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
----

`ods-build-go-v0-11-0` runs tests and produces a Go binary. If you use another technology, e.g. a Java project using Gradle, exchange the task with `ods-build-gradle-v0-11-0`. See the link:tasks/[tasks reference] for available tasks.
`ods-build-go-v0-11-1` runs tests and produces a Go binary. If you use another technology, e.g. a Java project using Gradle, exchange the task with `ods-build-gradle-v0-11-1`. See the link:tasks/[tasks reference] for available tasks.

=== (Optionally) Create `Dockerfile`

If you want to create a container image with the produced Go binary, you can add the `ods-package-image-v0-11-0` task to the `tasks` list, like this:
If you want to create a container image with the produced Go binary, you can add the `ods-package-image-v0-11-1` task to the `tasks` list, like this:

.ods.yaml
[source,yaml]
Expand All @@ -43,14 +43,14 @@ pipeline:
- name: build
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: package
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- build
workspaces:
Expand All @@ -72,13 +72,13 @@ EXPOSE 8080
CMD ["./app"]
----

NOTE: `ods-build-go-v0-11-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-11-0` task.
NOTE: `ods-build-go-v0-11-1` 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-11-1` task.

NOTE: Pay attention to the `runAfter` configuration in the task list: it ensures that the tasks run sequentially and can use the outputs from the previous task(s).

=== (Optionally) Create Helm Chart

If you want to deploy the created image, you can add the `ods-deploy-helm-v0-11-0` task to the `tasks` list and configure which branches should be deployed to which Kubernetes namespaces, like this:
If you want to deploy the created image, you can add the `ods-deploy-helm-v0-11-1` task to the `tasks` list and configure which branches should be deployed to which Kubernetes namespaces, like this:

.ods.yaml
[source,yaml]
Expand All @@ -97,14 +97,14 @@ pipeline:
- name: build
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: package
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- build
workspaces:
Expand All @@ -113,7 +113,7 @@ pipeline:
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm-v0-11-0
name: ods-deploy-helm-v0-11-1
runAfter:
- package
workspaces:
Expand Down
12 changes: 6 additions & 6 deletions docs/convert-quickstarter-component.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,14 @@ pipeline:
- name: backend-build-go
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: backend-package-image
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- backend-build-go
workspaces:
Expand All @@ -117,21 +117,21 @@ pipeline:
- name: backend-deploy
taskRef:
kind: Task
name: ods-deploy-helm-v0-11-0
name: ods-deploy-helm-v0-11-1
runAfter:
- backend-package-image
workspaces:
- name: source
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-11-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-11-1` 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-11-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-11-1` 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-11-0` as opposed to `odsComponentStageRolloutOpenShiftDeployment`.
Finally, the application is deployed in `ods-deploy-helm-v0-11-1` 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
Expand Down
14 changes: 7 additions & 7 deletions docs/example-project.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ pipeline:
- name: build
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: package
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- build
workspaces:
Expand All @@ -49,7 +49,7 @@ pipeline:
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm-v0-11-0
name: ods-deploy-helm-v0-11-1
runAfter:
- package
workspaces:
Expand All @@ -74,14 +74,14 @@ pipeline:
- name: build
taskRef:
kind: Task
name: ods-build-npm-v0-11-0
name: ods-build-npm-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: package
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- build
workspaces:
Expand All @@ -90,7 +90,7 @@ pipeline:
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm-v0-11-0
name: ods-deploy-helm-v0-11-1
runAfter:
- package
workspaces:
Expand Down Expand Up @@ -134,7 +134,7 @@ pipeline:
- name: deploy
taskRef:
kind: Task
name: ods-deploy-helm-v0-11-0
name: ods-deploy-helm-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
Expand Down
6 changes: 3 additions & 3 deletions docs/installation.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Now use `git subtree` to get the required source files. The following commands m

[source]
----
pipelineGitRef=v0.11.0 # Pick the version you want to install
pipelineGitRef=v0.11.1 # 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 && \
Expand Down Expand Up @@ -101,7 +101,7 @@ You may fetch updates (e.g. new versions) of `ods-pipeline` like this:

[source]
----
pipelineGitRef=v0.11.0 # Pick the version you want to update to
pipelineGitRef=v0.11.1 # Pick the version you want to update to
git branch -D ods-pipeline-$pipelineGitRef subtree-split-branch-$pipelineGitRef || true && \
git fetch --depth=1 https://github.com/opendevstack/ods-pipeline.git $pipelineGitRef:ods-pipeline-$pipelineGitRef && \
Expand Down Expand Up @@ -145,4 +145,4 @@ TIP: The credentials stored in the K8s secrets will not be updated. If you need

==== Finishing the update

Once the resources in your namespace are updated, you likely have to update the `ods.yaml` files in your repository to point to the new tasks, e.g. changing `ods-build-go-v0-10-1` to `ods-build-go-v0-11-0`. Whether or not you have to update the `ods.yaml` file depends whether the task suffix (controlled by the value `taskSuffix`) has changed due to the update.
Once the resources in your namespace are updated, you likely have to update the `ods.yaml` files in your repository to point to the new tasks, e.g. changing `ods-build-go-v0-10-1` to `ods-build-go-v0-11-1`. Whether or not you have to update the `ods.yaml` file depends whether the task suffix (controlled by the value `taskSuffix`) has changed due to the update.
6 changes: 3 additions & 3 deletions docs/introduction.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ pipeline:
- name: build-go
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: package-image
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- build-go
workspaces:
Expand All @@ -88,7 +88,7 @@ pipeline:
- name: deploy-helm
taskRef:
kind: Task
name: ods-deploy-helm-v0-11-0
name: ods-deploy-helm-v0-11-1
runAfter:
- package-image
workspaces:
Expand Down
8 changes: 4 additions & 4 deletions docs/ods-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ pipeline:
- name: build
taskRef:
kind: Task
name: ods-build-go-v0-11-0
name: ods-build-go-v0-11-1
workspaces:
- name: source
workspace: shared-workspace
- name: package
taskRef:
kind: Task
name: ods-package-image-v0-11-0
name: ods-package-image-v0-11-1
runAfter:
- build
workspaces:
Expand Down Expand Up @@ -93,7 +93,7 @@ pipeline:
- name: url
value: https://github.com/opendevstack/ods-pipeline.git
- name: revision
value: v0.11.0
value: v0.11.1
- name: pathInRepo
value: tasks/ods-build-go.yaml
workspaces:
Expand Down Expand Up @@ -151,7 +151,7 @@ pipeline:
- name: url
value: https://github.com/opendevstack/ods-pipeline.git
- name: revision
value: v0.11.0
value: v0.11.1
- name: pathInRepo
value: tasks/ods-build-go.yaml
workspaces:
Expand Down
6 changes: 3 additions & 3 deletions tasks/ods-build-go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
description: |
Builds Go (module) applications.
See https://github.com/opendevstack/ods-pipeline/blob/v0.11.0/docs/tasks/ods-build-go.adoc
See https://github.com/opendevstack/ods-pipeline/blob/v0.11.1/docs/tasks/ods-build-go.adoc
params:
- name: working-dir
description: |
Expand Down Expand Up @@ -70,7 +70,7 @@ spec:
steps:
- name: build-go-binary
# Image is built from build/package/Dockerfile.go-toolset.
image: 'ghcr.io/opendevstack/ods-pipeline/ods-go-toolset:0.11.0'
image: 'ghcr.io/opendevstack/ods-pipeline/ods-go-toolset:0.11.1'
env:
- name: HOME
value: '/tekton/home'
Expand Down Expand Up @@ -128,7 +128,7 @@ spec:
workingDir: $(workspaces.source.path)
- name: scan-with-sonar
# Image is built from build/package/Dockerfile.sonar.
image: 'ghcr.io/opendevstack/ods-pipeline/ods-sonar:0.11.0'
image: 'ghcr.io/opendevstack/ods-pipeline/ods-sonar:0.11.1'
env:
- name: HOME
value: '/tekton/home'
Expand Down
6 changes: 3 additions & 3 deletions tasks/ods-build-gradle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
description: |
Builds Gradle applications.
See https://github.com/opendevstack/ods-pipeline/blob/v0.11.0/docs/tasks/ods-build-gradle.adoc
See https://github.com/opendevstack/ods-pipeline/blob/v0.11.1/docs/tasks/ods-build-gradle.adoc
params:
- name: working-dir
description: |
Expand Down Expand Up @@ -74,7 +74,7 @@ spec:
steps:
- name: build-gradle-binary
# Image is built from build/package/Dockerfile.gradle-toolset.
image: 'ghcr.io/opendevstack/ods-pipeline/ods-gradle-toolset:0.11.0'
image: 'ghcr.io/opendevstack/ods-pipeline/ods-gradle-toolset:0.11.1'
env:
- name: DEBUG
valueFrom:
Expand Down Expand Up @@ -146,7 +146,7 @@ spec:
workingDir: $(workspaces.source.path)
- name: scan-with-sonar
# Image is built from build/package/Dockerfile.sonar.
image: 'ghcr.io/opendevstack/ods-pipeline/ods-sonar:0.11.0'
image: 'ghcr.io/opendevstack/ods-pipeline/ods-sonar:0.11.1'
env:
- name: HOME
value: '/tekton/home'
Expand Down
Loading

0 comments on commit 2463936

Please sign in to comment.