From f7c386f755d5b08f039571aaf5b07f9f7020d304 Mon Sep 17 00:00:00 2001 From: Yi Chen Date: Wed, 25 Dec 2024 14:10:09 +0800 Subject: [PATCH 1/2] Bump git-sync version to v4.4.0 Signed-off-by: Yi Chen --- charts/cron-tfjob/values.yaml | 2 +- charts/etjob/values.yaml | 2 +- charts/evaluatejob/values.yaml | 2 +- charts/mpijob/values.yaml | 2 +- charts/pytorchjob/values.yaml | 2 +- charts/tfjob/values.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/cron-tfjob/values.yaml b/charts/cron-tfjob/values.yaml index d3c0cf879..5289ccd99 100644 --- a/charts/cron-tfjob/values.yaml +++ b/charts/cron-tfjob/values.yaml @@ -43,7 +43,7 @@ tfjob: # rsync image rsyncImage: registry.cn-zhangjiakou.aliyuncs.com/acs/rsync:v3.1.0-aliyun # git sync image - gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5 + gitImage: registry-cn-zhangjiakou.ack.aliyuncs.com/acs/git-sync:4.4.0 imagePullPolicy: Always diff --git a/charts/etjob/values.yaml b/charts/etjob/values.yaml index b5c4c9fc4..0af1fa6cb 100644 --- a/charts/etjob/values.yaml +++ b/charts/etjob/values.yaml @@ -10,7 +10,7 @@ gpuCount: 0 # user define # rsync image rsyncImage: registry.cn-zhangjiakou.aliyuncs.com/acs/rsync:v3.1.0-aliyun # git sync image -gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5 +gitImage: registry-cn-zhangjiakou.ack.aliyuncs.com/acs/git-sync:4.4.0 shmSize: 2Gi privileged: false diff --git a/charts/evaluatejob/values.yaml b/charts/evaluatejob/values.yaml index 8e82bd9a5..3f65cb08b 100644 --- a/charts/evaluatejob/values.yaml +++ b/charts/evaluatejob/values.yaml @@ -7,7 +7,7 @@ syncMode: git # rsync image rsyncImage: registry.cn-zhangjiakou.aliyuncs.com/acs/rsync:v3.1.0-aliyun # git sync image -gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5 +gitImage: registry-cn-zhangjiakou.ack.aliyuncs.com/acs/git-sync:4.4.0 image: "registry.cn-beijing.aliyuncs.com/hzx-kubeflow/evaluate_test_tensorflow1.15:1.0.3" diff --git a/charts/mpijob/values.yaml b/charts/mpijob/values.yaml index f82cbed2d..13bb61b0c 100644 --- a/charts/mpijob/values.yaml +++ b/charts/mpijob/values.yaml @@ -10,7 +10,7 @@ gpuCount: 0 # user define # rsync image rsyncImage: registry.cn-zhangjiakou.aliyuncs.com/acs/rsync:v3.1.0-aliyun # git sync image -gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5 +gitImage: registry-cn-zhangjiakou.ack.aliyuncs.com/acs/git-sync:4.4.0 shmSize: 2Gi privileged: false diff --git a/charts/pytorchjob/values.yaml b/charts/pytorchjob/values.yaml index d1dd171ed..2bff7ca67 100644 --- a/charts/pytorchjob/values.yaml +++ b/charts/pytorchjob/values.yaml @@ -13,7 +13,7 @@ gpuCount: 0 # user define # rsync image rsyncImage: registry.cn-zhangjiakou.aliyuncs.com/acs/rsync:v3.1.0-aliyun # git sync image -gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5 +gitImage: registry-cn-zhangjiakou.ack.aliyuncs.com/acs/git-sync:4.4.0 privileged: false diff --git a/charts/tfjob/values.yaml b/charts/tfjob/values.yaml index 9b8f13dbc..42ddabfcd 100644 --- a/charts/tfjob/values.yaml +++ b/charts/tfjob/values.yaml @@ -39,7 +39,7 @@ evaluatorAnnotations: {} # rsync image rsyncImage: registry.cn-zhangjiakou.aliyuncs.com/acs/rsync:v3.1.0-aliyun # git sync image -gitImage: registry.cn-zhangjiakou.aliyuncs.com/acs/git-sync:v3.3.5 +gitImage: registry-cn-zhangjiakou.ack.aliyuncs.com/acs/git-sync:4.4.0 imagePullPolicy: Always From 51ce61fe228727ec1f0b7de3ff6dd29f20137c80 Mon Sep 17 00:00:00 2001 From: Yi Chen Date: Wed, 25 Dec 2024 15:22:42 +0800 Subject: [PATCH 2/2] Replace deprecated GIT_SYNC_* environment variables with GITSYNC_* Signed-off-by: Yi Chen --- charts/cron-tfjob/templates/_tfjob.yaml | 24 ++++++++++----------- charts/etjob/templates/etjob.yaml | 12 +++++------ charts/evaluatejob/templates/job.yaml | 6 +++--- charts/modeljob/templates/job.yaml | 6 +++--- charts/mpijob/templates/mpijob.yaml | 6 +++--- charts/pytorchjob/templates/pytorchjob.yaml | 12 +++++------ charts/tfjob/templates/tfjob.yaml | 24 ++++++++++----------- 7 files changed, 45 insertions(+), 45 deletions(-) diff --git a/charts/cron-tfjob/templates/_tfjob.yaml b/charts/cron-tfjob/templates/_tfjob.yaml index 167d53a51..c1b44f44f 100644 --- a/charts/cron-tfjob/templates/_tfjob.yaml +++ b/charts/cron-tfjob/templates/_tfjob.yaml @@ -222,13 +222,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.tfjob.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.tfjob.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -531,13 +531,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.tfjob.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.tfjob.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -859,13 +859,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.tfjob.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.tfjob.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -1146,13 +1146,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.tfjob.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.tfjob.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: diff --git a/charts/etjob/templates/etjob.yaml b/charts/etjob/templates/etjob.yaml index 5563ed428..8127344ba 100644 --- a/charts/etjob/templates/etjob.yaml +++ b/charts/etjob/templates/etjob.yaml @@ -192,13 +192,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -479,13 +479,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: diff --git a/charts/evaluatejob/templates/job.yaml b/charts/evaluatejob/templates/job.yaml index 59586501d..2d3cd446b 100644 --- a/charts/evaluatejob/templates/job.yaml +++ b/charts/evaluatejob/templates/job.yaml @@ -104,13 +104,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource }} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName }} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: diff --git a/charts/modeljob/templates/job.yaml b/charts/modeljob/templates/job.yaml index a72815bf4..83d684b39 100644 --- a/charts/modeljob/templates/job.yaml +++ b/charts/modeljob/templates/job.yaml @@ -109,13 +109,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource }} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName }} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: diff --git a/charts/mpijob/templates/mpijob.yaml b/charts/mpijob/templates/mpijob.yaml index b4432b7ac..77511784d 100644 --- a/charts/mpijob/templates/mpijob.yaml +++ b/charts/mpijob/templates/mpijob.yaml @@ -197,13 +197,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: diff --git a/charts/pytorchjob/templates/pytorchjob.yaml b/charts/pytorchjob/templates/pytorchjob.yaml index de5326dca..39a080e5d 100644 --- a/charts/pytorchjob/templates/pytorchjob.yaml +++ b/charts/pytorchjob/templates/pytorchjob.yaml @@ -204,13 +204,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -502,13 +502,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: diff --git a/charts/tfjob/templates/tfjob.yaml b/charts/tfjob/templates/tfjob.yaml index a1e1f25c4..999f74874 100644 --- a/charts/tfjob/templates/tfjob.yaml +++ b/charts/tfjob/templates/tfjob.yaml @@ -245,13 +245,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -591,13 +591,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -949,13 +949,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: @@ -1267,13 +1267,13 @@ spec: value: "{{ $value }}" {{- end }} {{- if eq "git" $syncMode }} - - name: GIT_SYNC_REPO + - name: GITSYNC_REPO value: {{ .Values.syncSource}} - name: GIT_SYNC_DEST value: {{ .Values.syncGitProjectName}} - - name: GIT_SYNC_ROOT + - name: GITSYNC_ROOT value: /code - - name: GIT_SYNC_ONE_TIME + - name: GITSYNC_ONE_TIME value: "true" {{- end }} volumeMounts: