Merge branch 'master' into postgresql_mc_fixes

maayanamrani · May 26, 2020 · 2c67206 · 2c67206
2 parents 2a81472 + 579121d
commit 2c67206
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 6 deletions.
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [2.4.9] - May 25, 2020
+* Fixed postgresql README `image` Parameters
+
 ## [2.4.8] - May 24, 2020
 * Fixed typo in README regarding migration timeout
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory-ha
 home: https://www.jfrog.com/artifactory/
-version: 2.4.8
+version: 2.4.9
 appVersion: 7.4.3
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory-ha/README.md b/stable/artifactory-ha/README.md
@@ -1238,7 +1238,9 @@ The following table lists the configurable parameters of the artifactory chart a
 | `nginx.persistence.size` | Nginx persistence volume size | `5Gi`                                                         |
 | `waitForDatabase`                 | Wait for database (using wait-for-db init container)  | `true`                       |
 | `postgresql.enabled`              | Use enclosed PostgreSQL as database        | `true`                                  |
-| `postgresql.imageTag`             | PostgreSQL version                         | `9.6.11`                                |
+| `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.postgresqlDatabase`   | PostgreSQL database name                   | `artifactory`                           |
 | `postgresql.postgresqlUsername`   | PostgreSQL database user                   | `artifactory`                           |
 | `postgresql.postgresqlPassword`   | PostgreSQL database password               |                                         |

diff --git a/stable/artifactory-ha/ci/test-values.yaml b/stable/artifactory-ha/ci/test-values.yaml
@@ -4,6 +4,8 @@ artifactory:
     enabled: true
 
 postgresql:
+  image:
+    tag: 9.6.15-debian-9-r91
   postgresqlPassword: "password"
   postgresqlExtendedConf:
     maxConnections: "102"

diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -4,7 +4,7 @@
 # Access the values with {{ .Values.key.subkey }}
 
 # Common
-initContainerImage: "alpine:3.10"
+initContainerImage: "alpine:3.11"
 
 installer:
   type:

diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [9.4.8] - May 25, 2020
+* Fixed postgresql README `image` Parameters
+
 ## [9.4.7] - May 24, 2020
 * Fixed typo in README regarding migration timeout
 

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: artifactory
 home: https://www.jfrog.com/artifactory/
-version: 9.4.7
+version: 9.4.8
 appVersion: 7.4.3
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory/README.md b/stable/artifactory/README.md
@@ -1073,7 +1073,9 @@ The following table lists the configurable parameters of the artifactory chart a
 | `nginx.resources.limits.cpu`      | Nginx cpu limit               |                                                      |
 | `waitForDatabase`                 | Wait for database (using wait-for-db init container)  | `true`                       |
 | `postgresql.enabled`              | Use enclosed PostgreSQL as database        | `true`                                  |
-| `postgresql.imageTag`             | PostgreSQL version                         | `9.6.11`                                |
+| `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.postgresqlDatabase`   | PostgreSQL database name                   | `artifactory`                           |
 | `postgresql.postgresqlUsername`   | PostgreSQL database user                   | `artifactory`                           |
 | `postgresql.postgresqlPassword`   | PostgreSQL database password               |                                         |

diff --git a/stable/artifactory/ci/test-values.yaml b/stable/artifactory/ci/test-values.yaml
@@ -3,6 +3,8 @@ artifactory:
     enabled: true
 
 postgresql:
+  image:
+    tag: 9.6.15-debian-9-r91
   postgresqlPassword: "password"
   postgresqlExtendedConf:
     maxConnections: "102"

diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -5,7 +5,7 @@
 # Access the values with {{ .Values.key.subkey }}
 
 # Common
-initContainerImage: "alpine:3.10"
+initContainerImage: "alpine:3.11"
 
 installer:
   type: