From 2ed53cfd7f2c6efb956ffca4b11eaf4b56fe63c1 Mon Sep 17 00:00:00 2001 From: John ODonnell Date: Tue, 29 Aug 2023 18:43:52 -0400 Subject: [PATCH 1/2] Upgrade default Postgres from 10.16 to 15.4 --- CHANGELOG.md | 4 ++++ conjur-oss/README.md | 6 +++--- conjur-oss/UPGRADING.md | 2 +- conjur-oss/values.yaml | 2 +- examples/openshift/0_export_env_vars.sh | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc39b19..c2e9e50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## Unreleased +### Changed +- The default Postgres server version is incremented to 15.4 from 10.16. + [cyberark/conjur-oss-helm-chart#185](https://github.com/cyberark/conjur-oss-helm-chart/pull/185) + ## [2.0.6] - 2023-03-09 ### Changed diff --git a/conjur-oss/README.md b/conjur-oss/README.md index c3e506a..f9152a3 100644 --- a/conjur-oss/README.md +++ b/conjur-oss/README.md @@ -127,7 +127,7 @@ $ helm install \ --set image.tag=latest \ --set nginx.image.repository=registry.connect.redhat.com/cyberark/conjur-nginx \ --set nginx.image.tag=latest \ - --set postgres.image.repository=registry.redhat.io/rhscl/postgresql-10-rhel7 \ + --set postgres.image.repository=registry.redhat.io/rhel8/postgresql-15 \ --set postgres.image.tag=latest \ --set openshift.enabled=true \ --set dataKey="$DATA_KEY" \ @@ -271,7 +271,7 @@ setting the equivalent field in a custom values.yaml file): ``` The format of a Postgres database connection string is documented -[here](https://www.postgresql.org/docs/10/libpq-connect.html#LIBPQ-CONNSTRING). +[here](https://www.postgresql.org/docs/15/libpq-connect.html#LIBPQ-CONNSTRING). If this chart value is not explicitly set, then an integrated Postgres database will be deployed along with Conjur. @@ -364,7 +364,7 @@ The following table lists the configurable parameters of the Conjur Open Source |`account.create`|If true, a Conjur account is created automatically after installation|`false`| |`authenticators`|List of authenticators that Conjur will whitelist and load.|`"authn"`| |`conjurLabels`|Extra Kubernetes labels to apply to Conjur resources|`{}`| -|`database.url`|PostgreSQL connection string. The format is documented [here](https://www.postgresql.org/docs/10/libpq-connect.html#LIBPQ-CONNSTRING). If left blank, an integrated PostgreSQL deployment is created.|`""`| +|`database.url`|PostgreSQL connection string. The format is documented [here](https://www.postgresql.org/docs/15/libpq-connect.html#LIBPQ-CONNSTRING). If left blank, an integrated PostgreSQL deployment is created.|`""`| |`database.password`|PostgreSQL database password string. Unused if an external Postgres database is configured. See [PostgreSQL Database Password Restrictions](#postgresql-database-password-restrictions) below.|`""`| |`database.ssl.Cert`|PostgreSQL TLS x509 certificate, base64 encoded.|`""`| |`database.ssl.key`|PostgreSQL TLS private key, base64 encoded.|`""`| diff --git a/conjur-oss/UPGRADING.md b/conjur-oss/UPGRADING.md index fd5f37e..301c0c2 100644 --- a/conjur-oss/UPGRADING.md +++ b/conjur-oss/UPGRADING.md @@ -77,7 +77,7 @@ to this repository's `CHANGELOG.md` file for the respective current vs. new helm chart version._ _**Note 2**: Details on how upgrades involving breaking changes to Conjur, NGINX, - or PostgreSQL) will be supported in future releases are TBD._ +or PostgreSQL will be supported in future releases are TBD._ ### Running Helm Upgrade diff --git a/conjur-oss/values.yaml b/conjur-oss/values.yaml index 27fdd85..bafae22 100644 --- a/conjur-oss/values.yaml +++ b/conjur-oss/values.yaml @@ -94,7 +94,7 @@ postgres: # repository: registry.redhat.io/rhscl/postgresql-10-rhel7 # tag: latest repository: postgres # https://hub.docker.com/_/postgres/ - tag: '10.16' + tag: '15.4' pullPolicy: Always persistentVolume: diff --git a/examples/openshift/0_export_env_vars.sh b/examples/openshift/0_export_env_vars.sh index bea4afd..9de8244 100755 --- a/examples/openshift/0_export_env_vars.sh +++ b/examples/openshift/0_export_env_vars.sh @@ -33,7 +33,7 @@ export IMAGE_REPOSITORY="${IMAGE_REPOSITORY:-registry.connect.redhat.com/cyberar export IMAGE_TAG="${IMAGE_TAG:-latest}" export NGINX_REPOSITORY="${NGINX_REPOSITORY:-registry.connect.redhat.com/cyberark/conjur-nginx}" export NGINX_TAG="${NGINX_TAG:-latest}" -export POSTGRES_REPOSITORY="${POSTGRES_REPOSITORY:-registry.redhat.io/rhscl/postgresql-10-rhel7}" +export POSTGRES_REPOSITORY="${POSTGRES_REPOSITORY:-registry.redhat.io/rhel8/postgresql-15}" export POSTGRES_TAG="${POSTGRES_TAG:-latest}" export POSTGRES_PV_CREATE="${POSTGRES_PV_CREATE:-false}" export OPENSHIFT_ENABLED="${OPENSHIFT_ENABLED:-true}" From 597347349a1710f0063955665e9094d9b5315ccb Mon Sep 17 00:00:00 2001 From: John ODonnell Date: Wed, 30 Aug 2023 09:15:59 -0400 Subject: [PATCH 2/2] Bump chart version to 2.0.7 --- CHANGELOG.md | 5 ++++- conjur-oss/Chart.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2e9e50..f054698 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.7] - 2023-08-30 + ### Changed - The default Postgres server version is incremented to 15.4 from 10.16. [cyberark/conjur-oss-helm-chart#185](https://github.com/cyberark/conjur-oss-helm-chart/pull/185) @@ -169,7 +171,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.6...HEAD +[Unreleased]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.7...HEAD +[2.0.7]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.6...v2.0.7 [2.0.6]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.5...v2.0.6 [2.0.5]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.4...v2.0.5 [2.0.4]: https://github.com/cyberark/conjur-oss-helm-chart/compare/v2.0.3...v2.0.4 diff --git a/conjur-oss/Chart.yaml b/conjur-oss/Chart.yaml index 7e5d574..814056f 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.6 +version: 2.0.7 description: A Helm chart for CyberArk Conjur icon: https://www.cyberark.com/wp-content/uploads/2015/12/cybr-aim.jpg keywords: