Merge pull request #4 from evosecurity/main

Update readme and add option for helm —wait

Author: ccapell

README.md

@@ -10,21 +10,23 @@ Note:  If your EKS cluster administrative access is in a private network, you wi
 
 Following inputs can be used as `step.with` keys
 
-| Name             | Type    | Description                        |
-|------------------|---------|------------------------------------|
-| `aws-secret-access-key`          | String  | AWS secret access key part of the aws credentials. This is used to login to EKS. |
-| `aws-access-key-id`      | String  | AWS access key id part of the aws credentials. This is used to login to EKS. |
-| `aws-region`      | String  | AWS region to use. This must match the region your desired cluster lies in. |
-| `cluster-name`      | String  | The name of the desired cluster. |
-| `cluster-role-arn`      | String  | If you wish to assume an admin role, provide the role arn here to login as. |
-| `config-files`      | String  | Comma separated list of helm values files. |
-| `namespace`      | String  | Kubernetes namespace to use.  Will create if it does not exist |
-| `values`      | String  | Comma separated list of value set for helms. e.x: key1=value1,key2=value2 |
-| `name`      | String  | The name of the helm release |
-| `chart-path`      | String  | The path to the chart. (defaults to `helm/`) |
-| `chart-repository` | String | The URL of the chart-repository (Optional)
-| `plugins`      | String  | Comma separated list of plugins to install. e.x: https://github.com/hypnoglow/helm-s3.git, https://github.com/someuser/helm-plugin.git (defaults to none) |
-
+| Name                    | Type   | Description                                                                                                                                               |
+| ----------------------- | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `aws-secret-access-key` | String | AWS secret access key part of the aws credentials. This is used to login to EKS.                                                                          |
+| `aws-access-key-id`     | String | AWS access key id part of the aws credentials. This is used to login to EKS.                                                                              |
+| `aws-region`            | String | AWS region to use. This must match the region your desired cluster lies in.                                                                               |
+| `cluster-name`          | String | The name of the desired cluster.                                                                                                                          |
+| `cluster-role-arn`      | String | If you wish to assume an admin role, provide the role arn here to login as.                                                                               |
+| `config-files`          | String | Comma separated list of helm values files.                                                                                                                |
+| `namespace`             | String | Kubernetes namespace to use.  Will create if it does not exist                                                                                            |
+| `values`                | String | Comma separated list of value set for helms. e.x: key1=value1,key2=value2                                                                                 |
+| `name`                  | String | The name of the helm release                                                                                                                              |
+| `chart-path`            | String | The path to the chart. (defaults to `helm/`)                                                                                                              |
+| `chart-repository`      | String | The URL of the chart-repository (Optional)                                                                                                                |
+| `plugins`               | String | Comma separated list of plugins to install. e.x: https://github.com/hypnoglow/helm-s3.git, https://github.com/someuser/helm-plugin.git (defaults to none) |
+| `timeout`               | String | The value of the timeout for the helm release                                                                                                             |
+| `update-deps`           | String | Update chart dependencies                                                                                                                                 |
+| `helm-wait`             | String | Add the helm --wait flag to the helm Release                                                                                                              |
 
 ## Example usage
 

action.yaml

@@ -51,9 +51,12 @@ inputs:
     plugins:
         description: 'Comma separated list of helm plugins to install. e.x: https://github.com/hypnoglow/helm-s3.git,https://github.com/someuser/helm-plugin.git'
         required: false
+    helm-wait:
+        description: 'Add the --wait flag to helm'
+        required: false
 runs:
     using: 'docker'
-    image: 'bitovi/deploy-eks-helm:v1.0.0'
+    image: 'docker://bitovi/deploy-eks-helm:v1.0.1'
     env:
         AWS_REGION: ${{ inputs.aws-region }}
         AWS_SECRET_ACCESS_KEY: ${{ inputs.aws-secret-access-key }}
@@ -68,4 +71,5 @@ runs:
         TIMEOUT: ${{ inputs.timeout }}
         UPDATE_DEPS: ${{ inputs.update-deps }}
         HELM_REPOSITORY: ${{ inputs.chart-repository }}
+        HELM_WAIT: ${{ inputs.helm-wait }}
         PLUGINS_LIST: ${{ inputs.plugins }}

deploy.sh

@@ -56,6 +56,11 @@ fi
 # Upgrade or install the chart.  This does it all.
 HELM_COMMAND="helm upgrade --install --timeout ${TIMEOUT}"
 
+# If we should wait, then do so 
+if [ -n "${HELM_WAIT}" ]; then
+    HELM_COMMAND="${HELM_COMMAND} --wait"
+fi
+
 # Set paramaters
 for config_file in ${DEPLOY_CONFIG_FILES//,/ }
 do