Merge pull request #1771 from magda-io/release/0.0.49-RC3

changes during deployment attempts

Author: AlexGilleran

CHANGES.md

@@ -24,6 +24,10 @@
 -   Better support for SPSS files in the format minion
 -   Made files marked with a ".extension" format resolve to "extension" correctly in the format minion.
 -   Fixed an redirection issue when handling 404 status from registry API
+-   Re-added admin api to released docker images
+-   Made gateway nominate its container port to fix it working with a password and also the GCE ingress
+-   Stopped the helm chart from assuming that the `postgres` user password and the `proxyuser` password are the same in GKE deploys
+-   Fixed the storage account credentials being created incorrectly through the secrets tool
 
 ## 0.0.48
 

deploy/helm/magda/charts/gateway/templates/deployment.yaml

@@ -15,6 +15,8 @@ spec:
       - name: gateway
         image: {{ template "dockerimage" . }}
         imagePullPolicy: {{ .Values.image.pullPolicy | default .Values.global.image.pullPolicy }}
+        ports:
+        - containerPort: {{ .Values.service.internalPort }}
         command: [
             "node",
             "/usr/src/app/component/dist/index.js",

deploy/helm/magda/templates/_helpers.tpl

@@ -44,7 +44,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
           valueFrom:
             secretKeyRef:
               name: cloudsql-db-credentials
-              key: password
+              key: postgres-password
         {{- else if not .Values.global.noDbAuth }}
         - name: PGPASSWORD
           valueFrom:

magda-admin-api/package.json

@@ -9,7 +9,8 @@
     "dev": "run-typescript-in-nodemon src/index.ts",
     "docker-build-local": "create-docker-context-for-node-component --build --push --tag auto --local",
     "docker-build-prod": "create-docker-context-for-node-component --build --push --tag auto",
-    "test": "mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/*.spec.ts\""
+    "test": "mocha --compilers ts:ts-node/register,tsx:ts-node/register --require tsconfig-paths/register \"src/test/**/*.spec.ts\"",
+    "retag-and-push": "retag-and-push"
   },
   "dependencies": {
     "@magda/typescript-common": "^0.0.49-RC2",

scripts/create-secrets/k8sExecution.js

@@ -96,7 +96,7 @@ function doK8sExecution(config, shouldNotAsk = false) {
                 namespace,
                 "cloudsql-instance-credentials",
                 "credentials.json",
-                configData["cloudsql-instance-credentials"]
+                configData["cloudsql-instance-credentials"]["data"]
             );
         }
 
@@ -106,7 +106,7 @@ function doK8sExecution(config, shouldNotAsk = false) {
                 namespace,
                 "storage-account-credentials",
                 "db-service-account-private-key.json",
-                configData["storage-account-credentials"]
+                configData["storage-account-credentials"]["data"]
             );
         }