Chart gitsync vars #56245

ido177 · 2025-09-30T07:02:43Z

At this moment, users have to specify git_username and git_token twice in the git-sync secret, once for GIT_SYNC_* (v3) and once for GITSYNC_* (v4). This is redundant and confusing.

---
apiVersion: v1
kind: Secret
metadata:
  name: airflow-git-credentials
stringData:
  GITSYNC_USERNAME: "git_username"
  GITSYNC_PASSWORD: "git_token"
  GIT_SYNC_USERNAME: "git_username"
  GIT_SYNC_PASSWORD: "git_token"

This PR updates the Helm chart logic to choose the correct environment variable set based on the git-sync image tag:
If the tag is < 4.0.0 - use GIT_SYNC_*
If the tag is >= 4.0.0 or latest - use GITSYNC_*
Example (after this change)

apiVersion: v1
kind: Secret
metadata:
  name: airflow-git-credentials
stringData:
  GITSYNC_USERNAME: "git_username"
  GITSYNC_PASSWORD: "git_token"

Only the relevant variables need to be set, depending on the git-sync version.

…endent on the GitSync version

romsharon98

LGTM, there are more duplicate envs above your changes it will be nice to do the same for them

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

* Error message improvied * Error messages of bteq improved * Bump ruff to 0.13.3 and prek to 0.2.3 (#56355) * fix: allow mapped tasks to accept zero-length inputs on rerun (#56162) * fix: allow mapped tasks to accept zero-length inputs on rerun * fix: add test for rerun args of different length * chore: revise comments to align with the changes * chore: add comments before the task state check * fix: replace legacy query syntax * Chart gitsync vars (#56245) * make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests * Update provider's metadata (#56357) * Fix install_java.sh (#56211) Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com> * Add new PL translations. (#56359) --------- Co-authored-by: Amogh Desai <amoghrajesh1999@gmail.com> Co-authored-by: Zhen-Lun (Kevin) Hong <zhenlun.hong01@gmail.com> Co-authored-by: Kirill Romanikhin <63454209+ido177@users.noreply.github.com> Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: VladaZakharova <uladaz@google.com> Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com>

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

* Error message improvied * Error messages of bteq improved * Bump ruff to 0.13.3 and prek to 0.2.3 (apache#56355) * fix: allow mapped tasks to accept zero-length inputs on rerun (apache#56162) * fix: allow mapped tasks to accept zero-length inputs on rerun * fix: add test for rerun args of different length * chore: revise comments to align with the changes * chore: add comments before the task state check * fix: replace legacy query syntax * Chart gitsync vars (apache#56245) * make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests * Update provider's metadata (apache#56357) * Fix install_java.sh (apache#56211) Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com> * Add new PL translations. (apache#56359) --------- Co-authored-by: Amogh Desai <amoghrajesh1999@gmail.com> Co-authored-by: Zhen-Lun (Kevin) Hong <zhenlun.hong01@gmail.com> Co-authored-by: Kirill Romanikhin <63454209+ido177@users.noreply.github.com> Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: VladaZakharova <uladaz@google.com> Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com>

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

* Error message improvied * Error messages of bteq improved * Bump ruff to 0.13.3 and prek to 0.2.3 (apache#56355) * fix: allow mapped tasks to accept zero-length inputs on rerun (apache#56162) * fix: allow mapped tasks to accept zero-length inputs on rerun * fix: add test for rerun args of different length * chore: revise comments to align with the changes * chore: add comments before the task state check * fix: replace legacy query syntax * Chart gitsync vars (apache#56245) * make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests * Update provider's metadata (apache#56357) * Fix install_java.sh (apache#56211) Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com> * Add new PL translations. (apache#56359) --------- Co-authored-by: Amogh Desai <amoghrajesh1999@gmail.com> Co-authored-by: Zhen-Lun (Kevin) Hong <zhenlun.hong01@gmail.com> Co-authored-by: Kirill Romanikhin <63454209+ido177@users.noreply.github.com> Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: VladaZakharova <uladaz@google.com> Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com>

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

* Error message improvied * Error messages of bteq improved * Bump ruff to 0.13.3 and prek to 0.2.3 (apache#56355) * fix: allow mapped tasks to accept zero-length inputs on rerun (apache#56162) * fix: allow mapped tasks to accept zero-length inputs on rerun * fix: add test for rerun args of different length * chore: revise comments to align with the changes * chore: add comments before the task state check * fix: replace legacy query syntax * Chart gitsync vars (apache#56245) * make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests * Update provider's metadata (apache#56357) * Fix install_java.sh (apache#56211) Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com> * Add new PL translations. (apache#56359) --------- Co-authored-by: Amogh Desai <amoghrajesh1999@gmail.com> Co-authored-by: Zhen-Lun (Kevin) Hong <zhenlun.hong01@gmail.com> Co-authored-by: Kirill Romanikhin <63454209+ido177@users.noreply.github.com> Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: VladaZakharova <uladaz@google.com> Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com>

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

* Error message improvied * Error messages of bteq improved * Bump ruff to 0.13.3 and prek to 0.2.3 (apache#56355) * fix: allow mapped tasks to accept zero-length inputs on rerun (apache#56162) * fix: allow mapped tasks to accept zero-length inputs on rerun * fix: add test for rerun args of different length * chore: revise comments to align with the changes * chore: add comments before the task state check * fix: replace legacy query syntax * Chart gitsync vars (apache#56245) * make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests * Update provider's metadata (apache#56357) * Fix install_java.sh (apache#56211) Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com> * Add new PL translations. (apache#56359) --------- Co-authored-by: Amogh Desai <amoghrajesh1999@gmail.com> Co-authored-by: Zhen-Lun (Kevin) Hong <zhenlun.hong01@gmail.com> Co-authored-by: Kirill Romanikhin <63454209+ido177@users.noreply.github.com> Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Co-authored-by: VladaZakharova <uladaz@google.com> Co-authored-by: Ulada Zakharava <vlada_zakharava@epam.com>

ido177 and others added 2 commits September 30, 2025 09:47

make the variable name in .Values.dags.gitSync.credentials secret dep…

fe5fa0d

…endent on the GitSync version

Merge branch 'apache:main' into chart-gitsync-vars

4b4e4c6

ido177 requested review from dstandish, hussein-awala and jedcunningham as code owners September 30, 2025 07:02

boring-cyborg bot added the area:helm-chart Airflow Helm Chart label Sep 30, 2025

ido177 force-pushed the chart-gitsync-vars branch from 2dd6e18 to d67907b Compare September 30, 2025 08:37

update gitsync tests

78d95d8

ido177 force-pushed the chart-gitsync-vars branch from d67907b to 78d95d8 Compare September 30, 2025 09:07

romsharon98 approved these changes Oct 3, 2025

View reviewed changes

romsharon98 merged commit d0da0c0 into apache:main Oct 3, 2025
77 checks passed

eladkal added this to the Airflow Helm Chart 1.19.0 milestone Oct 3, 2025

sc250072 pushed a commit to Teradata/airflow that referenced this pull request Oct 3, 2025

Chart gitsync vars (apache#56245)

8e8b8e1

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 4, 2025

Chart gitsync vars (apache#56245)

bde485b

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 5, 2025

Chart gitsync vars (apache#56245)

170a081

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 5, 2025

Chart gitsync vars (apache#56245)

9fa30fb

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 7, 2025

Chart gitsync vars (apache#56245)

b0cea65

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 8, 2025

Chart gitsync vars (apache#56245)

2b26574

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 9, 2025

Chart gitsync vars (apache#56245)

371f96c

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 10, 2025

Chart gitsync vars (apache#56245)

803213e

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 11, 2025

Chart gitsync vars (apache#56245)

69b8a91

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 12, 2025

Chart gitsync vars (apache#56245)

c2b60d8

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

dabla pushed a commit to dabla/airflow that referenced this pull request Oct 12, 2025

Chart gitsync vars (apache#56245)

6bace3d

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 14, 2025

Chart gitsync vars (apache#56245)

3ea5e5f

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 15, 2025

Chart gitsync vars (apache#56245)

b0988b4

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 17, 2025

Chart gitsync vars (apache#56245)

29c5a0a

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

abdulrahman305 bot pushed a commit to abdulrahman305/airflow that referenced this pull request Oct 19, 2025

Chart gitsync vars (apache#56245)

fc7aca2

* make the variable name in .Values.dags.gitSync.credentials secret dependent on the GitSync version * update gitsync tests

Miretpl mentioned this pull request Jan 6, 2026

Add conditional support for GIT_SYNC_USERNAME/GIT_SYNC_PASSWORD vs GITSYNC_USERNAME/GITSYNC_PASSWORD in Helm Chart #52320

Open

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Chart gitsync vars #56245

Chart gitsync vars #56245

Uh oh!

ido177 commented Sep 30, 2025

Uh oh!

romsharon98 left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Chart gitsync vars #56245

Chart gitsync vars #56245

Uh oh!

Conversation

ido177 commented Sep 30, 2025

Uh oh!

romsharon98 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants