Merge branch 'main' into merge/update-with-upstream-artie-labs

 Conflicts:
	Dockerfile

Author: Dakad

Dockerfile

@@ -10,14 +10,15 @@ ARG KUBERNETES_VERSION=1.31.7
 # gcloud version: https://cloud.google.com/sdk/docs/release-notes
 ARG GCLOUD_VERSION=500.0.0
 ARG DOCTL_VERSION=1.57.0
+ARG AWSCLI_VERSION=2.13.25-r0
 ARG HELM_PLUGINS_TO_INSTALL="https://github.com/databus23/helm-diff"
 
 
 #gcloud path
 ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
 
 #install packages
-RUN apk add --update --upgrade --no-cache jq bash curl git gettext libintl py-pip aws-cli
+RUN apk add --update --upgrade --no-cache jq bash curl git gettext libintl py-pip
 
 #install kubectl
 RUN curl -sL -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl; \
@@ -27,6 +28,9 @@ RUN curl -sL -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes
 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-x86_64.tar.gz \
     -O /tmp/google-cloud-sdk.tar.gz | bash
 
+#install awscli
+RUN pip install awscli==${AWSCLI_VERSION}
+
 # For use with gke-gcloud-auth-plugin below
 # see https://cloud.google.com/blog/products/containers-kubernetes/kubectl-auth-changes-in-gke
 # for details

README.md

@@ -120,7 +120,7 @@ Deploy an helm chart
     the file in that path. A `hide: true` parameter ensures that the value is not logged and instead replaced with `***HIDDEN***`.
     A `type: string` parameter makes sure Helm always treats the value as a string (uses the `--set-string` option to Helm; useful if the value varies
     and may look like a number, eg. if it's a Git commit hash).
-    A `type: file` parameter makes Helm treats the `path` as file (uses the `--set-file` option to Helm). 
+    A `type: file` parameter makes Helm treats the `path` as file (uses the `--set-file` option to Helm).
     A `verbatim: true` parameter escapes backslashes so the value is passed as-is to the Helm chart (useful for `((credentials))`).
     The default behaviour of backslashes in `--set` is to quote the next character so `val\ue` is treated as `value` by Helm.
 -   `token_path`: _Optional._ Path to file containing the bearer token for Kubernetes.  This, 'token' or `admin_key`/`admin_cert` are required if `cluster_url` is https.
@@ -254,7 +254,7 @@ jobs:
         path: version/image_tag # Read value from version/number
         type: string            # Make sure it's interpreted as a string by Helm (not a number)
       - key: configuration
-        path: configuration/production.yaml # add path to --set-file helm option 
+        path: configuration/production.yaml # add path to --set-file helm option
         type: file            # use --set-file helm option ( --set-file configuration=configuration/production.yaml )
   # ...
 ```