Add GOOGLE_REGISTRY_HOST and GOOGLE_JSON_KEY to report-image-info (#507)

* Add GOOGLE_REGISTRY_HOST and GOOGLE_JSON_KEY to report-image-info

* Add GOOGLE_REGISTRY_HOST and GOOGLE_JSON_KEY to report-image-info

* Add GOOGLE_REGISTRY_HOST and GOOGLE_JSON_KEY to report-image-info

Author: vadim-kharin-codefresh

workflows/codefresh-csdp/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog 
+
+## v1.1.8 (22.03.2023)
+* Add GOOGLE_REGISTRY_HOST and GOOGLE_JSON_KEY to report-image-info
 
 ## v1.1.8 (28.02.2023)
 * Using @codefresh-io/cf-report-image-toolbox library

workflows/codefresh-csdp/versions/1.1.8/docs/report-image-info.md

@@ -20,6 +20,9 @@ Report image info to argo platform.
 * GCR_KEY_FILE_PATH (required) - JSON key for authenticating to a Google GCR
 * GCR_KEY_SECRET (required) - The Kubernetes secret containing the GCR key information. Default is 'gcr-key-file'
 * GCR_KEY_SECRET_KEY (optional) - The key in the Kubernetes secret containing the GCR key information. Default is '.keyjson'
+* GOOGLE_REGISTRY_HOST (optional)  - The host to Google GCR or Google ACR. Default is 'gcr.io'
+* GOOGLE_JSON_KEY (required) - The Kubernetes secret with the JSON key for authenticating to a Google GCR or Google ACR
+* GOOGLE_KEY_SECRET_KEY (optional) The key in the Kubernetes secret with Google JSON key. Default is 'keyjson'
 * AWS_ACCESS_KEY (required) - The Kubernetes secret with the Amazon access key
 * AWS_ACCESS_KEY_SECRET_KEY (optional) - The key in the Kubernetes secret with the Amazon access key. Default is 'aws-access-key'
 * AWS_SECRET_KEY (required) - The Kubernetes secret with the Amazon secret key

workflows/codefresh-csdp/versions/1.1.8/images/report-image-info/package.json

@@ -10,7 +10,7 @@
     "node": "18.12.1"
   },
   "dependencies": {
-    "@codefresh-io/cf-report-image-toolbox": "^1.0.0",
+    "@codefresh-io/cf-report-image-toolbox": "^1.0.4",
     "joi": "^17.6.0"
   }
 }

workflows/codefresh-csdp/versions/1.1.8/images/report-image-info/src/configuration/index.js

@@ -37,6 +37,8 @@ const inputs = {
         }
     },
     gcr: {
+        host: process.env.GOOGLE_REGISTRY_HOST?.trim(),
+        json: process.env.GOOGLE_JSON_KEY?.trim(),
         keyFilePath: process.env.GCR_KEY_FILE_PATH?.trim(),
     },
     retrieveCredentialsByDomain: process.env.RETRIEVE_CREDENTIALS_BY_DOMAIN?.trim() === 'true'

workflows/codefresh-csdp/versions/1.1.8/images/report-image-info/yarn.lock

@@ -665,10 +665,10 @@
     "@aws-sdk/util-buffer-from" "3.208.0"
     tslib "^2.3.1"
 
-"@codefresh-io/cf-report-image-toolbox@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@codefresh-io/cf-report-image-toolbox/-/cf-report-image-toolbox-1.0.0.tgz#3f8c6394e5e82d044826f2d751b04a9c776b153f"
-  integrity sha512-LncgfLcTv+M4aPqOl+rUU0PoMIwRP1pe6OIvd9yAiZYC52cY5FV7gfApGrKFtGtTMqbLK4MBW2/f03DzF4qp2Q==
+"@codefresh-io/cf-report-image-toolbox@^1.0.4":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@codefresh-io/cf-report-image-toolbox/-/cf-report-image-toolbox-1.0.4.tgz#823a22484094e65d203ab559a9635ce1c28790cf"
+  integrity sha512-80YxS+ADLxP+atLupDJsHaMLzc2imylYf75h0CtwEG0eSUPxTdw5J66Sx5fk2i+IuKwyD5m3U0AeGvpQ6sDxDg==
   dependencies:
     "@aws-sdk/client-sts" "^3.272.0"
     "@codefresh-io/docker-reference" "^0.0.11"

workflows/codefresh-csdp/versions/1.1.8/workflowTemplate.yaml

@@ -297,6 +297,12 @@ spec:
             default: 'gcr-key-file'
           - name: GCR_KEY_SECRET_KEY
             default: '.keyjson'
+          - name: GOOGLE_REGISTRY_HOST
+            default: 'gcr.io'
+          - name: GOOGLE_JSON_KEY
+            default: 'cf-not-exist'
+          - name: GOOGLE_KEY_SECRET_KEY
+            default: 'keyjson'
           - name: DOCKER_CONFIG_SECRET
             default: 'docker-registry'
           - name: DOCKER_CONFIG_SECRET_KEY
@@ -340,6 +346,14 @@ spec:
             value: '{{ inputs.parameters.CF_HOST_URL }}'
           - name: GCR_KEY_FILE_PATH
             value: '{{ inputs.parameters.GCR_KEY_FILE_PATH }}'
+          - name: GOOGLE_REGISTRY_HOST
+            value: '{{ inputs.parameters.GOOGLE_REGISTRY_HOST }}'
+          - name: GOOGLE_JSON_KEY
+            valueFrom:
+              secretKeyRef:
+                name: '{{ inputs.parameters.GOOGLE_JSON_KEY }}'
+                optional: true
+                key: '{{ inputs.parameters.GOOGLE_KEY_SECRET_KEY }}'
           - name: DOCKER_CONFIG_FILE_PATH
             value: '{{ inputs.parameters.DOCKER_CONFIG_FILE_PATH }}'
           - name: RETRIEVE_CREDENTIALS_BY_DOMAIN