Skip to content

Commit

Permalink
Merge branch 'master' into rt-7.5.5-dep
Browse files Browse the repository at this point in the history
  • Loading branch information
chukka authored Jun 1, 2020
2 parents c4b17a9 + ec53b6e commit 24c68fd
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 8 deletions.
5 changes: 5 additions & 0 deletions stable/artifactory-ha/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# JFrog Artifactory-ha Chart Changelog
All changes to this chart will be documented in this file.

## [2.5.0] - Jun 1, 2020
* Updated Artifactory version to 7.5.5 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.5
* Fixes bootstrap configMap permission issue
* Update postgresql tag version to `9.6.18-debian-10-r7`

## [2.4.10] - May 27, 2020
* Added Tomcat maxThreads & acceptCount

Expand Down
4 changes: 2 additions & 2 deletions stable/artifactory-ha/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: artifactory-ha
home: https://www.jfrog.com/artifactory/
version: 2.4.10
appVersion: 7.4.3
version: 2.5.0
appVersion: 7.5.5
description: Universal Repository Manager supporting all major packaging formats,
build tools and CI servers.
keywords:
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory-ha/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1244,7 +1244,7 @@ The following table lists the configurable parameters of the artifactory chart a
| `postgresql.enabled` | Use enclosed PostgreSQL as database | `true` |
| `postgresql.image.registry` | PostgreSQL image registry | `docker.bintray.io` |
| `postgresql.image.repository` | PostgreSQL image repository | `bitnami/postgresql` |
| `postgresql.image.tag` | PostgreSQL image tag | `9.6.17-debian-10-r72` |
| `postgresql.image.tag` | PostgreSQL image tag | `9.6.18-debian-10-r7` |
| `postgresql.postgresqlDatabase` | PostgreSQL database name | `artifactory` |
| `postgresql.postgresqlUsername` | PostgreSQL database user | `artifactory` |
| `postgresql.postgresqlPassword` | PostgreSQL database password | |
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory-ha/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ postgresql:
image:
registry: docker.bintray.io
repository: bitnami/postgresql
tag: 9.6.17-debian-10-r72
tag: 9.6.18-debian-10-r7
postgresqlUsername: artifactory
postgresqlPassword: ""
postgresqlDatabase: artifactory
Expand Down
5 changes: 5 additions & 0 deletions stable/artifactory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# JFrog Artifactory Chart Changelog
All changes to this chart will be documented in this file.

## [9.5.0] - Jun 1, 2020
* Updated Artifactory version to 7.5.5 - https://www.jfrog.com/confluence/display/JFROG/Artifactory+Release+Notes#ArtifactoryReleaseNotes-Artifactory7.5
* Fixes bootstrap configMap permission issue
* Update postgresql tag version to `9.6.18-debian-10-r7`

## [9.4.9] - May 27, 2020
* Added Tomcat maxThreads & acceptCount

Expand Down
4 changes: 2 additions & 2 deletions stable/artifactory/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
name: artifactory
home: https://www.jfrog.com/artifactory/
version: 9.4.9
appVersion: 7.4.3
version: 9.5.0
appVersion: 7.5.5
description: Universal Repository Manager supporting all major packaging formats,
build tools and CI servers.
keywords:
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -1079,7 +1079,7 @@ The following table lists the configurable parameters of the artifactory chart a
| `postgresql.enabled` | Use enclosed PostgreSQL as database | `true` |
| `postgresql.image.registry` | PostgreSQL image registry | `docker.bintray.io` |
| `postgresql.image.repository` | PostgreSQL image repository | `bitnami/postgresql` |
| `postgresql.image.tag` | PostgreSQL image tag | `9.6.17-debian-10-r72` |
| `postgresql.image.tag` | PostgreSQL image tag | `9.6.18-debian-10-r7` |
| `postgresql.postgresqlDatabase` | PostgreSQL database name | `artifactory` |
| `postgresql.postgresqlUsername` | PostgreSQL database user | `artifactory` |
| `postgresql.postgresqlPassword` | PostgreSQL database password | |
Expand Down
2 changes: 1 addition & 1 deletion stable/artifactory/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ postgresql:
image:
registry: docker.bintray.io
repository: bitnami/postgresql
tag: 9.6.17-debian-10-r72
tag: 9.6.18-debian-10-r7
postgresqlUsername: artifactory
postgresqlPassword: ""
postgresqlDatabase: artifactory
Expand Down

0 comments on commit 24c68fd

Please sign in to comment.