Merge pull request #825 from jfrog/issue-805-gcpServiceAccount

[ artifactory-ha ] - Fix broken support for gcpServiceAccount for googleStorage
jfrog · Apr 16, 2020 · cdb7fcf · cdb7fcf
2 parents cfbf8fc + 7c49c34
commit cdb7fcf
Show file tree

Hide file tree

Showing 5 changed files with 22 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.1] - Apr 16, 2020
+* Fix broken support for gcpServiceAccount for googleStorage
+
 ## [2.4.0] - Apr 14, 2020
 * Updated Artifactory version to 7.4.1
 

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.0
+version: 2.4.1
 appVersion: 7.4.1
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.

diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -34,7 +34,7 @@ spec:
         checksum/binarystore: {{ include (print $.Template.BasePath "/artifactory-binarystore-secret.yaml") . | sha256sum }}
         checksum/systemyaml: {{ include (print $.Template.BasePath "/artifactory-system-yaml.yaml") . | sha256sum }}
       {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
-        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials.yaml") . | sha256sum }}
+        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials-secret.yaml") . | sha256sum }}
       {{- end }}
       {{- range $key, $value := .Values.artifactory.annotations }}
         {{ $key }}: {{ $value | quote }}

diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -35,7 +35,7 @@ spec:
         checksum/binarystore: {{ include (print $.Template.BasePath "/artifactory-binarystore-secret.yaml") . | sha256sum }}
         checksum/systemyaml: {{ include (print $.Template.BasePath "/artifactory-system-yaml.yaml") . | sha256sum }}
       {{- if .Values.artifactory.persistence.googleStorage.gcpServiceAccount.enabled }}
-        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials.yaml") . | sha256sum }}
+        checksum/gcpcredentials: {{ include (print $.Template.BasePath "/artifactory-gcp-credentials-secret.yaml") . | sha256sum }}
       {{- end }}
       {{- if not (and .Values.artifactory.admin.secret .Values.artifactory.admin.dataKey) }}
         checksum/admin-creds: {{ include (print $.Template.BasePath "/admin-bootstrap-creds.yaml") . | sha256sum }}

diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -924,9 +924,22 @@ artifactory:
       ## When using GCP buckets as your binary store (Available with enterprise license only)
       gcpServiceAccount:
         enabled: false
-        ## Use either an existing secret prepared in advance or put the config in the values
-        customSecretName:
-        config:
+        ## Use either an existing secret prepared in advance or put the config (replace the content) in the values
+        ## ref: https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/README.md#google-storage
+        # customSecretName:
+        # config: |
+        #   {
+        #      "type": "service_account",
+        #      "project_id": "<project_id>",
+        #      "private_key_id": "?????",
+        #      "private_key": "-----BEGIN PRIVATE KEY-----\n????????==\n-----END PRIVATE KEY-----\n",
+        #      "client_email": "???@j<project_id>.iam.gserviceaccount.com",
+        #      "client_id": "???????",
+        #      "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+        #      "token_uri": "https://oauth2.googleapis.com/token",
+        #      "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+        #      "client_x509_cert_url": "https://www.googleapis.com/robot/v1....."
+        #   }
       endpoint: storage.googleapis.com
       httpsOnly: false
       # Set a unique bucket name