Skip to content

Commit

Permalink
update to track tayterz2 fork
Browse files Browse the repository at this point in the history
  • Loading branch information
tayterz2 committed Feb 23, 2025
1 parent fba99b8 commit 9233cec
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions scripts/build
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd ${TOP_DIR}
harvester_path=../harvester
if [ ! -d ${harvester_path} ];then
echo "No existing harvester source. Pulling..."
git clone --branch master --single-branch --depth 1 https://github.com/harvester/harvester.git ../harvester
git clone --branch master --single-branch --depth 1 https://github.com/tayterz2/harvester.git ../harvester
else
# When building against locally modified harvester source with
# "-v /path/to/local/harvester/repo:/go/src/github.com/harvester/harvester"
Expand All @@ -24,13 +24,13 @@ else
# to "0.0.0--" which later messes up the harvester charts when
# `scripts/patch-harvester` is run. Things do not end well after that.
# Happily, we can fix it with this git config option:
git config --global --add safe.directory /go/src/github.com/harvester/harvester
git config --global --add safe.directory /go/src/github.com/tayterz2/harvester
fi

addons_path=../addons
if [ ! -d ${addons_path} ];then
echo "No existing addons source. Pulling..."
git clone --branch main --single-branch --depth 1 https://github.com/harvester/addons.git ../addons
git clone --branch main --single-branch --depth 1 https://github.com/tayterz2/addons.git ../addons
fi

source ${SCRIPTS_DIR}/version-harvester $harvester_path
Expand All @@ -50,13 +50,13 @@ echo "The ARCH is: ${ARCH}"

mkdir -p bin

LINKFLAGS="-X github.com/harvester/harvester-installer/pkg/config.RKE2Version=$RKE2_VERSION
-X github.com/harvester/harvester-installer/pkg/config.RancherVersion=$RANCHER_VERSION
-X github.com/harvester/harvester-installer/pkg/version.Version=$VERSION
-X github.com/harvester/harvester-installer/pkg/version.HarvesterVersion=$HARVESTER_VERSION
-X github.com/harvester/harvester-installer/pkg/config.HarvesterChartVersion=$HARVESTER_CHART_VERSION
-X github.com/harvester/harvester-installer/pkg/config.MonitoringChartVersion=$MONITORING_VERSION
-X github.com/harvester/harvester-installer/pkg/config.LoggingChartVersion=$LOGGING_VERSION
LINKFLAGS="-X github.com/tayterz2/harvester-installer/pkg/config.RKE2Version=$RKE2_VERSION
-X github.com/tayterz2/harvester-installer/pkg/config.RancherVersion=$RANCHER_VERSION
-X github.com/tayterz2/harvester-installer/pkg/version.Version=$VERSION
-X github.com/tayterz2/harvester-installer/pkg/version.HarvesterVersion=$HARVESTER_VERSION
-X github.com/tayterz2/harvester-installer/pkg/config.HarvesterChartVersion=$HARVESTER_CHART_VERSION
-X github.com/tayterz2/harvester-installer/pkg/config.MonitoringChartVersion=$MONITORING_VERSION
-X github.com/tayterz2/harvester-installer/pkg/config.LoggingChartVersion=$LOGGING_VERSION
$LINKFLAGS"

if [ "$(uname)" = "Linux" ]; then
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-bundle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ mkdir -p ${RANCHERD_IMAGES_DIR}
harvester_path=../harvester
if [ ! -d ${harvester_path} ];then
echo "No existing harvester source. Pulling..."
git clone --branch master --single-branch --depth 1 https://github.com/harvester/harvester.git ../harvester
git clone --branch master --single-branch --depth 1 https://github.com/tayterz2/harvester.git ../harvester
fi

# Revert harvester chart version patch to clean dirty git status
Expand Down

0 comments on commit 9233cec

Please sign in to comment.