Skip to content

Commit 33a489c

Browse files
committed
Changed base images(OS version) and Updated mail addresses
1 parent 86f588f commit 33a489c

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

.github/workflows/helm_template.result

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ spec:
8989

9090
initContainers:
9191
- name: svrinit-dummy
92-
image: alpine:3.21
92+
image: alpine:3.22
9393
env:
9494
- name: HTTP_PROXY
9595
value: ""
@@ -169,7 +169,7 @@ spec:
169169

170170
containers:
171171
- name: svrupdate-dummy
172-
image: alpine:3.21
172+
image: alpine:3.22
173173
env:
174174
- name: HTTP_PROXY
175175
value: ""
@@ -200,7 +200,7 @@ spec:
200200
command: ["/bin/sh", "/configmap/dbaas-k2hdkc-k2hr3-registration.sh", "-del"]
201201

202202
- name: svrchmpx-dummy
203-
image: chmpx:1.0.109
203+
image: chmpx:1.0.110
204204
env:
205205
- name: HTTP_PROXY
206206
value: ""
@@ -230,7 +230,7 @@ spec:
230230
args: ["/configmap/dbaas-k2hdkc-chmpxproc-wrap.sh"]
231231

232232
- name: svrk2hdkc-dummy
233-
image: k2hdkc:1.0.16
233+
image: k2hdkc:1.0.17
234234
env:
235235
- name: HTTP_PROXY
236236
value: ""
@@ -313,7 +313,7 @@ spec:
313313

314314
initContainers:
315315
- name: slvinit-dummy
316-
image: alpine:3.21
316+
image: alpine:3.22
317317
env:
318318
- name: HTTP_PROXY
319319
value: ""
@@ -393,7 +393,7 @@ spec:
393393

394394
containers:
395395
- name: slvupdate-dummy
396-
image: alpine:3.21
396+
image: alpine:3.22
397397
env:
398398
- name: HTTP_PROXY
399399
value: ""
@@ -424,7 +424,7 @@ spec:
424424
command: ["/bin/sh", "/configmap/dbaas-k2hdkc-k2hr3-registration.sh", "-del"]
425425

426426
- name: slvchmpx-dummy
427-
image: chmpx:1.0.109
427+
image: chmpx:1.0.110
428428
env:
429429
- name: HTTP_PROXY
430430
value: ""
@@ -454,7 +454,7 @@ spec:
454454
args: ["/configmap/dbaas-k2hdkc-chmpxproc-wrap.sh"]
455455

456456
- name: slvk2hdkc-dummy
457-
image: k2hdkc:1.0.16
457+
image: k2hdkc:1.0.17
458458
env:
459459
- name: HTTP_PROXY
460460
value: ""
@@ -2060,7 +2060,7 @@ data:
20602060
# Sleep time ajusting
20612061
#
20622062
for _ONE_NAME in $(echo "${ALL_HOST_NAMES}" | sort); do
2063-
if echo "${_ONE_NAME}" | grep -q "$(hostname)"; then
2063+
if echo "${_ONE_NAME}" | grep -q "$(hostname -f)"; then
20642064
break
20652065
fi
20662066
SLEEP_GAP=$((SLEEP_GAP + 2))
@@ -4145,7 +4145,7 @@ spec:
41454145

41464146
initContainers:
41474147
- name: chkinit-dummy
4148-
image: alpine:3.21
4148+
image: alpine:3.22
41494149
env:
41504150
- name: HTTP_PROXY
41514151
value: ""
@@ -4225,7 +4225,7 @@ spec:
42254225

42264226
containers:
42274227
- name: chkk2hdkc-dummy
4228-
image: k2hdkc:1.0.16
4228+
image: k2hdkc:1.0.17
42294229
env:
42304230
- name: HTTP_PROXY
42314231
value: ""
@@ -4300,7 +4300,7 @@ spec:
43004300

43014301
containers:
43024302
- name: setup-k2hr3-dummy-job
4303-
image: alpine:3.21
4303+
image: alpine:3.22
43044304
env:
43054305
- name: HTTP_PROXY
43064306
value: ""
@@ -4386,7 +4386,7 @@ spec:
43864386

43874387
containers:
43884388
- name: unsetup-k2hr3-dummy-job
4389-
image: alpine:3.21
4389+
image: alpine:3.22
43904390
env:
43914391
- name: HTTP_PROXY
43924392
value: ""

files/dbaas-k2hdkc-chmpxproc-wrap.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ALL_HOST_NAMES=$(grep 'NAME[[:space:]]*=' "${INI_FILE_PATH}" 2>/dev/null | sed '
171171
# Sleep time ajusting
172172
#
173173
for _ONE_NAME in $(echo "${ALL_HOST_NAMES}" | sort); do
174-
if echo "${_ONE_NAME}" | grep -q "$(hostname)"; then
174+
if echo "${_ONE_NAME}" | grep -q "$(hostname -f)"; then
175175
break
176176
fi
177177
SLEEP_GAP=$((SLEEP_GAP + 2))

templates/_helpers.tpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
200200
{{- else }}
201201
{{- $tmpdkcorg := default "antpickax" .Values.images.default.organization }}
202202
{{- $tmpdkcname := "k2hdkc" }}
203-
{{- $tmpdkcver := "1.0.16" }}
203+
{{- $tmpdkcver := "1.0.17" }}
204204
{{- if .Values.images.dkc.organization }}
205205
{{- $tmpdkcorg = .Values.images.dkc.organization }}
206206
{{- end }}
@@ -225,7 +225,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
225225
{{- else }}
226226
{{- $tmpchmpxorg := default "antpickax" .Values.images.default.organization }}
227227
{{- $tmpchmpxname := "chmpx" }}
228-
{{- $tmpchmpxver := "1.0.109" }}
228+
{{- $tmpchmpxver := "1.0.110" }}
229229
{{- if .Values.images.chmpx.organization }}
230230
{{- $tmpchmpxorg = .Values.images.chmpx.organization }}
231231
{{- end }}
@@ -250,7 +250,7 @@ app.kubernetes.io/instance: {{ .Release.Name }}
250250
{{- else }}
251251
{{- $tmpinitorg := "" }}
252252
{{- $tmpinitname := "alpine" }}
253-
{{- $tmpinitver := "3.21" }}
253+
{{- $tmpinitver := "3.22" }}
254254
{{- if .Values.images.init.organization }}
255255
{{- $tmpinitorg = .Values.images.init.organization }}
256256
{{- end }}

values.schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
"exclusiveMinimum": 0
122122
},
123123
"image": {
124-
"description": "[optional] Specifies the docker image for k2hdkc slave container. If empty, antpickax/k2hdkc:1.0.3 is set as default.",
124+
"description": "[optional] Specifies the docker image for k2hdkc slave container. If empty, antpickax/k2hdkc:1.0.17 is set as default.",
125125
"type": "string"
126126
},
127127
"command": {

0 commit comments

Comments
 (0)