Docker Login enhancement (#11)

* Removing email input from docker-login * imagepullsecret fix * Function refactoring
Azure · Jul 30, 2019 · c1d5769 · c1d5769
1 parent 4945a96
commit c1d5769
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 26 deletions.
diff --git a/docker-login/action.yml b/docker-login/action.yml
@@ -13,10 +13,6 @@ inputs:
     description: 'Login Server'
     required: true
     default: 'index.docker.io'
-  email:
-    description: 'Email'
-    required: true
-    default: ''
 branding:
   color: 'green'
 runs:

diff --git a/docker-login/lib/login.js b/docker-login/lib/login.js
@@ -18,13 +18,11 @@ function run() {
         let username = core.getInput('username', { required: true });
         let password = core.getInput('password', { required: true });
         let loginServer = core.getInput('loginServer', { required: true });
-        let email = core.getInput('email', { required: true });
         let authenticationToken = new Buffer(`${username}:${password}`).toString('base64');
         let config = {
             "auths": {
                 [loginServer]: {
-                    auth: authenticationToken,
-                    email: email
+                    auth: authenticationToken
                 }
             }
         };

diff --git a/docker-login/src/login.ts b/docker-login/src/login.ts
@@ -8,14 +8,12 @@ async function run() {
     let username = core.getInput('username', { required: true });
     let password = core.getInput('password', { required: true });
     let loginServer = core.getInput('loginServer', { required: true });
-    let email = core.getInput('email', { required: true });
     let authenticationToken = new Buffer(`${username}:${password}`).toString('base64');
 
     let config = {
         "auths": {
             [loginServer]: {
-                auth: authenticationToken,
-                email: email
+                auth: authenticationToken
             }
         }
     }

diff --git a/k8s-deploy/lib/kubernetes-utils.js b/k8s-deploy/lib/kubernetes-utils.js
@@ -36,8 +36,7 @@ function setImagePullSecrets(inputObject, newImagePullSecrets) {
     }
     if (utils_1.isEqual(inputObject.kind, 'pod')) {
         if (inputObject
-            && inputObject.spec
-            && inputObject.spec.imagePullSecrets) {
+            && inputObject.spec) {
             if (newImagePullSecrets.length > 0) {
                 inputObject.spec.imagePullSecrets = newImagePullSecrets;
             }
@@ -52,8 +51,7 @@ function setImagePullSecrets(inputObject, newImagePullSecrets) {
             && inputObject.spec.jobTemplate
             && inputObject.spec.jobTemplate.spec
             && inputObject.spec.jobTemplate.spec.template
-            && inputObject.spec.jobTemplate.spec.template.spec
-            && inputObject.spec.jobTemplate.spec.template.spec.imagePullSecrets) {
+            && inputObject.spec.jobTemplate.spec.template.spec) {
             if (newImagePullSecrets.length > 0) {
                 inputObject.spec.jobTemplate.spec.template.spec.imagePullSecrets = newImagePullSecrets;
             }
@@ -66,8 +64,7 @@ function setImagePullSecrets(inputObject, newImagePullSecrets) {
         if (inputObject
             && inputObject.spec
             && inputObject.spec.template
-            && inputObject.spec.template.spec
-            && inputObject.spec.template.spec.imagePullSecrets) {
+            && inputObject.spec.template.spec) {
             if (newImagePullSecrets.length > 0) {
                 inputObject.spec.template.spec.imagePullSecrets = newImagePullSecrets;
             }

diff --git a/k8s-deploy/lib/run.js b/k8s-deploy/lib/run.js
@@ -25,7 +25,7 @@ function setKubectlPath() {
             const version = core.getInput('kubect-version');
             kubectlPath = toolCache.find('kubectl', version);
             if (!kubectlPath) {
-                yield installKubectl(version);
+                kubectlPath = yield installKubectl(version);
             }
         }
         else {
@@ -101,7 +101,7 @@ function installKubectl(version) {
         if (utils_1.isEqual(version, 'latest')) {
             version = yield kubectl_util_1.getStableKubectlVersion();
         }
-        kubectlPath = yield kubectl_util_1.downloadKubectl(version);
+        return yield kubectl_util_1.downloadKubectl(version);
     });
 }
 function checkClusterContext() {

diff --git a/k8s-deploy/src/kubernetes-utils.ts b/k8s-deploy/src/kubernetes-utils.ts
@@ -39,8 +39,7 @@ function setImagePullSecrets(inputObject: any, newImagePullSecrets: any) {
 
     if (isEqual(inputObject.kind, 'pod')) {
         if (inputObject
-            && inputObject.spec
-            && inputObject.spec.imagePullSecrets) {
+            && inputObject.spec) {
             if (newImagePullSecrets.length > 0) {
                 inputObject.spec.imagePullSecrets = newImagePullSecrets;
             } else {
@@ -53,8 +52,7 @@ function setImagePullSecrets(inputObject: any, newImagePullSecrets: any) {
             && inputObject.spec.jobTemplate
             && inputObject.spec.jobTemplate.spec
             && inputObject.spec.jobTemplate.spec.template
-            && inputObject.spec.jobTemplate.spec.template.spec
-            && inputObject.spec.jobTemplate.spec.template.spec.imagePullSecrets) {
+            && inputObject.spec.jobTemplate.spec.template.spec) {
             if (newImagePullSecrets.length > 0) {
                 inputObject.spec.jobTemplate.spec.template.spec.imagePullSecrets = newImagePullSecrets;
             } else {
@@ -65,8 +63,7 @@ function setImagePullSecrets(inputObject: any, newImagePullSecrets: any) {
         if (inputObject
             && inputObject.spec
             && inputObject.spec.template
-            && inputObject.spec.template.spec
-            && inputObject.spec.template.spec.imagePullSecrets) {
+            && inputObject.spec.template.spec) {
             if (newImagePullSecrets.length > 0) {
                 inputObject.spec.template.spec.imagePullSecrets = newImagePullSecrets;
             } else {

diff --git a/k8s-deploy/src/run.ts b/k8s-deploy/src/run.ts
@@ -18,7 +18,7 @@ async function setKubectlPath() {
         const version = core.getInput('kubect-version');
         kubectlPath = toolCache.find('kubectl', version);
         if (!kubectlPath) {
-            await installKubectl(version);
+            kubectlPath = await installKubectl(version);
         }
     } else {
         kubectlPath = await io.which('kubectl', false);
@@ -96,7 +96,7 @@ async function installKubectl(version: string) {
     if (isEqual(version, 'latest')) {
         version = await getStableKubectlVersion();
     }
-    kubectlPath = await downloadKubectl(version);
+    return await downloadKubectl(version);
 }
 
 function checkClusterContext() {