From 6e6bc87079d83735ccd56e5fb607d3ee9088cf81 Mon Sep 17 00:00:00 2001
From: chirichidi <tolessnoise@gmail.com>
Date: Tue, 20 Feb 2024 10:17:04 +0900
Subject: [PATCH] test: test the "ct lint-and-install --all --target-branch
 main"

Signed-off-by: chirichidi <tolessnoise@gmail.com>
---
 .../airflow/sample-values-CeleryExecutor.yaml  | 12 ++++++------
 charts/airflow/templates/_helpers/pods.tpl     |  2 +-
 .../templates/_helpers/validate-values.tpl     |  2 +-
 charts/airflow/values.yaml                     | 18 +++++++++---------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/charts/airflow/sample-values-CeleryExecutor.yaml b/charts/airflow/sample-values-CeleryExecutor.yaml
index 831db831..16fe97ca 100644
--- a/charts/airflow/sample-values-CeleryExecutor.yaml
+++ b/charts/airflow/sample-values-CeleryExecutor.yaml
@@ -33,12 +33,12 @@ airflow:
   ## a list of users to create
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/security/airflow-users.md
   users:
-  - username: admin
-    password: admin
-    role: Admin
-    email: admin@example.com
-    firstName: admin
-    lastName: admin
+    - username: admin
+      password: admin
+      role: Admin
+      email: admin@example.com
+      firstName: admin
+      lastName: admin
 
   ## a list airflow connections to create
   ## [FAQ] https://github.com/airflow-helm/charts/blob/main/charts/airflow/docs/faq/dags/airflow-connections.md
diff --git a/charts/airflow/templates/_helpers/pods.tpl b/charts/airflow/templates/_helpers/pods.tpl
index dca4d1f6..a60cc86f 100644
--- a/charts/airflow/templates/_helpers/pods.tpl
+++ b/charts/airflow/templates/_helpers/pods.tpl
@@ -307,7 +307,7 @@ EXAMPLE USAGE: {{ include "airflow.container.s3_sync" (dict "Release" .Release "
       valueFrom:
         secretKeyRef:
           name: {{ .Values.dags.s3Sync.profile }}
-          key: {{ .Values.dags.s3Sync.idKey }}
+          key: {{ .Values.dags.s3Sync.accessKey }}
     - name: AWS_SECRET_ACCESS_KEY
       valueFrom:
         secretKeyRef:
diff --git a/charts/airflow/templates/_helpers/validate-values.tpl b/charts/airflow/templates/_helpers/validate-values.tpl
index 6daece5b..1c9c8fd6 100644
--- a/charts/airflow/templates/_helpers/validate-values.tpl
+++ b/charts/airflow/templates/_helpers/validate-values.tpl
@@ -138,7 +138,7 @@
   {{ required "If `dags.s3Sync.enabled=true`, then `persistence.enabled` must be disabled!" nil }}
   {{- end }}
   {{- if not .Values.dags.s3Sync.bucket }}
-  {{ required "If `dags.s3Sync.enabled=true`, then `dags.gitSync.bucket` must be non-empty!" nil }}
+  {{ required "If `dags.s3Sync.enabled=true`, then `dags.s3Sync.bucket` must be non-empty!" nil }}
   {{- end }}
 {{- end }}
 
diff --git a/charts/airflow/values.yaml b/charts/airflow/values.yaml
index ed35f159..5e5129eb 100644
--- a/charts/airflow/values.yaml
+++ b/charts/airflow/values.yaml
@@ -1464,7 +1464,7 @@ dags:
   ## configs for a sync from s3 object storage
   ##
   s3Sync:
-    ## if the git-sync sidecar container is enabled
+    ## if the s3-sync sidecar container is enabled
     ##
     enabled: false
 
@@ -1474,10 +1474,10 @@ dags:
       repository: amazon/aws-cli
       tag: 2.13.15
       pullPolicy: IfNotPresent
-      uid: 65533
-      gid: 65533
+      uid: 50000
+      gid: 0
 
-    ## resource requests/limits for the git-sync container
+    ## resource requests/limits for the s3-sync container
     ## - spec for ResourceRequirements:
     ##   https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#resourcerequirements-v1-core
     ##
@@ -1497,14 +1497,14 @@ dags:
     ##
     ## ____ EXAMPLE _______________
     ##   # s3 sub path
-    ##   s3Path: "s3://<bucket>/<path>/<to>/<dags>"
+    ##   s3Path: "s3://<bucket>/<s3Path>"
     ##
     bucket: ""
     s3Path: ""
 
-    ## Due to the issue where keys must consist of alphanumeric characters, and for security reasons, 
-    ## it is strongly recommended to inject Secrets into Pods' environment variables from external services like ExternalSecrets. 
-    ## This approach ensures sensitive information is securely managed and not embedded within source code or values.yaml, 
+    ## Due to the issue where keys must consist of alphanumeric characters, and for security reasons
+    ## it is strongly recommended to inject Secrets into Pods' environment variables from external services like ExternalSecrets.
+    ## This approach ensures sensitive information is securely managed and not embedded within source code or values.yaml,
     ## aligning with best practices for secure application configuration.
     ##
     ## the name of the pre-created Secret with AWS credentials
@@ -1512,7 +1512,7 @@ dags:
 
     ## the key in `dags.s3Sync.profile` with your access key id
     ##
-    idKey: keyId
+    accessKey: accessKey
 
     ## the key in `dags.s3Sync.profile` with your secret access key
     ##