From 8a3c3297f0b9bdef1be6fced29a370ad1f1e6c60 Mon Sep 17 00:00:00 2001 From: Geri Jennings Date: Mon, 12 Apr 2021 10:04:12 -0400 Subject: [PATCH] Bump version 2.0.4 Update default Conjur version to 1.11.5 Update release instructions to recommend getting the package from the gh action Fix broken links in CHANGELOG --- CHANGELOG.md | 13 ++++++++----- CONTRIBUTING.md | 6 +++--- conjur-oss/Chart.yaml | 2 +- conjur-oss/README.md | 2 +- conjur-oss/values.yaml | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8582520..cfefeea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +## [2.0.4] - 2021-04-12 + ### Added - Support for deploying Conjur OSS to OpenShift 4.6. With the automated tests added in [conjurdemos/kubernetes-conjur-demo#110](https://github.com/conjurdemos/kubernetes-conjur-demo/issues/110), @@ -15,7 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Changed - The default Postgres server version is incremented to 10.16 from 10.15. [Postgres 10.16](https://www.postgresql.org/docs/10/release-10-16.html) -## [v2.0.3] - 2020-12-30 +## [2.0.3] - 2020-12-30 ### Added - The Conjur OSS helm chart has Community support for deploying Conjur OSS to @@ -37,7 +39,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. DOCKER_REGISTRY_PATH environment variable error. [cyberark/conjur-oss-helm-chart#138](https://github.com/cyberark/conjur-oss-helm-chart/issues/138) -## [v2.0.2] - 2020-12-02 +## [2.0.2] - 2020-12-02 ### Changed - Default Conjur version is upgraded from 1.5 to 1.11. Default Postgres @@ -49,7 +51,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. (e.g. "latest" is allowable). [cyberark/conjur-oss-helm-chart#106](https://github.com/cyberark/conjur-oss-helm-chart/issues/106) -## [v2.0.1] - 2020-10-30 +## [2.0.1] - 2020-10-30 ### Added - `CONJUR_LOG_LEVEL` for the Conjur container can now be configured by setting the @@ -67,7 +69,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. to be supported, we recommend users migrate to using `RoleBindings` at application deploy time rather than relying on overprivileged `ClusterRoleBindings`. -## [v2.0.0] - 2020-06-18 +## [2.0.0] - 2020-06-18 ### Added - Adds password authentication for the backend Postgres database connection. @@ -149,7 +151,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - First version of chart available. -[Unreleased]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.3...HEAD +[Unreleased]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.4...HEAD +[2.0.4]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.3...v2.0.4 [2.0.3]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.2...v2.0.3 [2.0.2]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.1...v2.0.2 [2.0.1]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.0...v2.0.1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1a90969..16534f8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,9 +31,9 @@ To release a new version of this chart: [Conjur community guidelines](https://github.com/cyberark/community/blob/master/Conjur/CONTRIBUTING.md#tagging) - Tag the git history with `v##.##.##` version - Create the release on GitHub for that tag -- Build the helm chart package with `helm package conjur-oss` -- Upload that package to GitHub -- Add that chart to our [Helm charts repo](https://github.com/cyberark/helm-charts) +- Get the helm chart package from the [package action](https://github.com/cyberark/conjur-oss-helm-chart/actions/workflows/package.yml) +- Upload the package to the GitHub release +- Add the chart to our [Helm charts repo](https://github.com/cyberark/helm-charts) ## Contributing diff --git a/conjur-oss/Chart.yaml b/conjur-oss/Chart.yaml index c64eafa..67aa399 100644 --- a/conjur-oss/Chart.yaml +++ b/conjur-oss/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: conjur-oss home: https://www.conjur.org -version: 2.0.3 +version: 2.0.4 description: A Helm chart for CyberArk Conjur icon: https://www.cyberark.com/wp-content/uploads/2015/12/cybr-aim.jpg keywords: diff --git a/conjur-oss/README.md b/conjur-oss/README.md index 5e71eb2..25dd9c5 100644 --- a/conjur-oss/README.md +++ b/conjur-oss/README.md @@ -371,7 +371,7 @@ The following table lists the configurable parameters of the Conjur OSS chart an |`dataKey`|Conjur data key, 32 byte base-64 encoded string for data encryption.|`""`| |`deployment.annotations`|Annotations for Conjur deployment|`{}`| |`image.repository`|Conjur Docker image repository|`"cyberark/conjur"`| -|`image.tag`|Conjur Docker image tag|`"1.11.1"`| +|`image.tag`|Conjur Docker image tag|`"1.11.5"`| |`image.pullPolicy`|Pull policy for Conjur Docker image|`"Always"`| |`logLevel`|Conjur log level. Set to 'debug' to enable detailed debug logs in the Conjur container |`"info"`| |`nginx.image.repository`|NGINX Docker image repository|`"nginx"`| diff --git a/conjur-oss/values.yaml b/conjur-oss/values.yaml index 6cd4fce..945d55d 100644 --- a/conjur-oss/values.yaml +++ b/conjur-oss/values.yaml @@ -68,7 +68,7 @@ image: # repository: registry.connect.redhat.com/cyberark/conjur # tag: latest repository: cyberark/conjur # https://hub.docker.com/r/cyberark/conjur/ - tag: '1.11.1' + tag: '1.11.5' pullPolicy: Always nginx: