Skip to content

Commit

Permalink
Merge pull request #185 from cyberark/security-context
Browse files Browse the repository at this point in the history
Upgrade Postgres from v10 to v15
  • Loading branch information
john-odonnell authored Aug 30, 2023
2 parents 9bcaff4 + 5973473 commit b1d3c38
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 8 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ 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)

## [2.0.6] - 2023-03-09

### Changed
Expand Down Expand Up @@ -165,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
Expand Down
2 changes: 1 addition & 1 deletion conjur-oss/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 3 additions & 3 deletions conjur-oss/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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" \
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.|`""`|
Expand Down
2 changes: 1 addition & 1 deletion conjur-oss/UPGRADING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion conjur-oss/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion examples/openshift/0_export_env_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit b1d3c38

Please sign in to comment.