Skip to content

Commit c3b51ae

Browse files
wheatdogVicente-Cheng
authored andcommitted
common: update common resource for v1.8-head
Signed-off-by: Tim Liou <tim.liou@suse.com>
1 parent ac119cd commit c3b51ae

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

scripts/build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cd ${TOP_DIR}
1212
harvester_path=../harvester
1313
if [ ! -d ${harvester_path} ];then
1414
echo "No existing harvester source. Pulling..."
15-
git clone --branch master --single-branch --depth 1 https://github.com/harvester/harvester.git ../harvester
15+
git clone --branch v1.8 --single-branch --depth 1 https://github.com/harvester/harvester.git ../harvester
1616
else
1717
# When building against locally modified harvester source with
1818
# "-v /path/to/local/harvester/repo:/go/src/github.com/harvester/harvester"
@@ -30,7 +30,7 @@ fi
3030

3131
source ${SCRIPTS_DIR}/lib/addon
3232
addons_path=${TOP_DIR}/../addons
33-
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git main
33+
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git v1.8
3434

3535
MONITORING_VERSION=${RANCHER_MONITORING_CHART_VERSION}
3636
LOGGING_VERSION=${RANCHER_LOGGING_CHART_VERSION}

scripts/build-bundle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cd ${TOP_DIR}
1111

1212
source ${SCRIPTS_DIR}/lib/addon
1313
addons_path=${TOP_DIR}/../addons
14-
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git main
14+
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git v1.8
1515
# generate template file in ${addons_path}, and this is used for subsequent checks
1616
generate_addon ${addons_path}
1717

@@ -42,7 +42,7 @@ mkdir -p ${RANCHERD_IMAGES_DIR}
4242
harvester_path=../harvester
4343
if [ ! -d ${harvester_path} ];then
4444
echo "No existing harvester source. Pulling..."
45-
git clone --branch master --single-branch --depth 1 https://github.com/harvester/harvester.git ../harvester
45+
git clone --branch v1.8 --single-branch --depth 1 https://github.com/harvester/harvester.git ../harvester
4646
fi
4747

4848
# Revert harvester chart version patch to clean dirty git status

scripts/package-harvester-os

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
source ${SCRIPTS_DIR}/lib/addon
1717
addons_path=${TOP_DIR}/../addons
18-
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git main
18+
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git v1.8
1919

2020
MONITORING_VERSION=${RANCHER_MONITORING_CHART_VERSION}
2121
LOGGING_VERSION=${RANCHER_LOGGING_CHART_VERSION}

scripts/test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SCRIPTS_DIR="${TOP_DIR}/scripts"
88
source ${SCRIPTS_DIR}/lib/addon
99

1010
addons_path=${TOP_DIR}/../addons
11-
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git main
11+
load_and_source_addon ${addons_path} https://github.com/harvester/addons.git v1.8
1212

1313
generate_addon ${addons_path}
1414
# copy the generated addon yamls to installer

0 commit comments

Comments
 (0)