@magda/scripts 2.0.0-alpha.4 → 2.0.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magda/scripts",
-  "version": "2.0.0-alpha.4",
+  "version": "2.0.0-alpha.7",
   "description": "Scripts for building, running, and deploying MAGDA",
   "license": "Apache-2.0",
   "bin": {
@@ -28,7 +28,7 @@
     "release": "npm publish || echo \"Skip releasing npm package @magda/scripts.\""
   },
   "devDependencies": {
-    "@types/pg": "^7.4.14",
+    "@types/pg": "^8.6.5",
     "@types/request": "^2.48.1"
   },
   "magda": {
@@ -58,7 +58,7 @@
     "lodash": "^4.17.5",
     "moment": "^2.19.4",
     "nodemon": "^1.11.0",
-    "pg": "^7.11.0",
+    "pg": "^8.7.3",
     "pkg": "^4.3.4",
     "pwgen": "0.1.6",
     "request": "^2.88.0",

package/set-scss-vars.js

@@ -48,9 +48,14 @@ async function run(programOptions) {
     const env = getEnvByClusterType(programOptions.isMinikube === true);
     checkIfKubectlValid(env);
     checkNamespace(env, namespace);
-    const image = createConfigMap(env, namespace, COMPILER_CONFIG_MAP_NAME, {
-        [COMPILER_CONFIG_MAP_KEY]: JSON.stringify(vars)
-    });
+    const [image, pullSecrets] = createConfigMap(
+        env,
+        namespace,
+        COMPILER_CONFIG_MAP_NAME,
+        {
+            [COMPILER_CONFIG_MAP_KEY]: JSON.stringify(vars)
+        }
+    );
     console.log(
         chalk.green(
             `Successfully created config \`${COMPILER_CONFIG_MAP_NAME}\` in namespace \`${namespace}\`.`
@@ -59,7 +64,7 @@ async function run(programOptions) {
     console.log(
         chalk.yellow(`Creating updating job in namespace \`${namespace}\`...`)
     );
-    const jobId = createJob(env, namespace, image);
+    const jobId = createJob(env, namespace, image, pullSecrets);
     console.log(
         chalk.green(
             `Job \`${jobId}\` in namespace \`${namespace}\` has been created.`
@@ -192,11 +197,21 @@ function createConfigMap(env, namespace, configMapName, data) {
         input: configContent,
         env: env
     });
-    return configObj.data.image;
+
+    let pullSecrets;
+    if (configObj.data.pullSecrets) {
+        try {
+            pullSecrets = JSON.parse(configObj.data.pullSecrets);
+        } catch (e) {
+            console.log("No valid pullSecrets info found from configMap.");
+        }
+    }
+
+    return [configObj.data.image, pullSecrets];
 }
 
-function buildJobTemplateObject(namespace, jobId, image) {
-    return {
+function buildJobTemplateObject(namespace, jobId, image, pullSecrets) {
+    const manifest = {
         kind: "Job",
         apiVersion: "batch/v1",
         metadata: {
@@ -257,11 +272,19 @@ function buildJobTemplateObject(namespace, jobId, image) {
             }
         }
     };
+    if (pullSecrets && pullSecrets.length) {
+        manifest.spec.template.spec.imagePullSecrets = pullSecrets.map(
+            (item) => ({
+                name: item
+            })
+        );
+    }
+    return manifest;
 }
 
-function createJob(env, namespace, image) {
+function createJob(env, namespace, image, pullSecrets) {
     const jobId = uniqid("scss-compiler-");
-    const jobObj = buildJobTemplateObject(namespace, jobId, image);
+    const jobObj = buildJobTemplateObject(namespace, jobId, image, pullSecrets);
 
     const configContent = JSON.stringify(jobObj);