Skip to content

Commit 5bac98b

Browse files
committed
[Fix] sc-24030 update some library prefix for airgap images
Signed-off-by: Kent Huang <kentwelcome@gmail.com> [Feature] image-load-and-push support containerd & harbor Signed-off-by: Kent Huang <kentwelcome@gmail.com>
1 parent df66be7 commit 5bac98b

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

install/airgap/image-load-and-push.sh

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ set -euo pipefail
44
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
55
REGISTRY=primehub.airgap:5000
66
REGISTRY_TYPE='docker-registry'
7+
CONTAINER_ENGINE='docker'
8+
CONTAINER_CLI='docker'
79
USER=''
810
PASSWORD=''
911

@@ -48,7 +50,7 @@ function create_project() {
4850
}" > /dev/null
4951
}
5052

51-
while getopts "u:p:r:h" OPT; do
53+
while getopts "u:p:r:hc" OPT; do
5254
case $OPT in
5355
u)
5456
USER=$OPTARG
@@ -59,6 +61,10 @@ while getopts "u:p:r:h" OPT; do
5961
r)
6062
REGISTRY=$OPTARG
6163
;;
64+
c)
65+
CONTAINER_ENGINE='containerd'
66+
CONTAINER_CLI='nerdctl'
67+
;;
6268
h)
6369
print_usage
6470
exit
@@ -87,6 +93,7 @@ echo "images.txt: $IMAGES_LIST"
8793
echo "images.tgz: $IMAGES_FILE"
8894
echo "registry: $REGISTRY"
8995
echo "type: $REGISTRY_TYPE"
96+
echo "engine: $CONTAINER_ENGINE"
9097
echo "username: $USER"
9198
echo
9299

@@ -111,12 +118,12 @@ fi
111118

112119
if [[ ${USER} != '' && ${PASSWORD} != '' ]]; then
113120
echo "login ${REGISTRY} ..."
114-
echo ${PASSWORD} | docker login ${REGISTRY} -u ${USER} --password-stdin
121+
echo ${PASSWORD} | $CONTAINER_CLI login ${REGISTRY} -u ${USER} --password-stdin
115122
fi
116123

117124
# load to docker file
118125
echo "load images..."
119-
docker load -i $IMAGES_FILE
126+
$CONTAINER_CLI load -i $IMAGES_FILE
120127

121128
echo "push images..."
122129
# push to registry
@@ -128,18 +135,19 @@ for image in `cat $IMAGES_LIST`; do
128135
if [[ "$(echo $image | cut -d':' -f1)" != *"/"* ]]; then
129136
project='library'
130137
push_image="library/${image}"
131-
132-
echo "push ${image} without library prefix"
133-
docker tag ${image} ${REGISTRY}/${image}
134-
docker push ${REGISTRY}/${image}
135138
fi
136139

137140
if [[ ${REGISTRY_TYPE} == 'harbor' ]]; then
138141
echo "create project ${project}"
139142
create_project ${project}
143+
144+
echo "push ${push_image}"
145+
$CONTAINER_CLI tag ${image} ${REGISTRY}/${push_image}
146+
$CONTAINER_CLI push ${REGISTRY}/${push_image}
147+
else
148+
echo "push ${image} without library prefix"
149+
$CONTAINER_CLI tag ${image} ${REGISTRY}/${image}
150+
$CONTAINER_CLI push ${REGISTRY}/${image}
140151
fi
141152

142-
echo "push ${push_image}"
143-
docker tag ${image} ${REGISTRY}/${push_image}
144-
docker push ${REGISTRY}/${push_image}
145153
done

install/helmfiles/primehub/images.yaml.gotmpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ console:
4545
image:
4646
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}infuseai/primehub-console
4747
reloaderImage:
48-
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}busybox
48+
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}library/busybox
4949
graphql:
5050
image:
5151
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}infuseai/primehub-console-graphql
5252
reloaderImage:
53-
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}busybox
53+
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}library/busybox
5454
watcher:
5555
image:
5656
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}infuseai/primehub-console-watcher
@@ -119,16 +119,16 @@ sshBastionServer:
119119

120120
usage:
121121
initImage:
122-
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}busybox
122+
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}library/busybox
123123
image:
124124
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}infuseai/primehub-usage
125125
dbImage:
126-
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}postgres
126+
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}library/postgres
127127

128128
keycloak:
129129
init:
130130
image:
131-
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}busybox
131+
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}library/busybox
132132
image:
133133
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}jboss/keycloak
134134
theme:

install/helmfiles/prometheus-operator/images.yaml.gotmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ prometheusOperator:
2626
prometheusConfigReloaderImage:
2727
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}quay.io/coreos/prometheus-config-reloader
2828
hyperkubeImage:
29-
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}rancher/hyperkube
30-
tag: v1.12.7-rancher1
29+
repository: {{ env "PRIMEHUB_AIRGAPPED_IMAGE_PREFIX" }}k8s.gcr.io/hyperkube
30+
tag: v1.7.12
3131

3232
grafana:
3333
image:

0 commit comments

Comments
 (0)