Skip to content

Commit 7883089

Browse files
authored
Merge pull request #142 from hzxuzhonghu/release-0.2
[release-0.2] fix make chart
2 parents 0085abd + a995fc8 commit 7883089

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ sync-crds: gen-crd
109109

110110
.PHONY: gen-chart
111111
gen-chart: sync-crds
112-
HELM_CHART_VERSION=$(HELM_CHART_VERSION) hack/gen-chart.sh
112+
HELM_CHART_VERSION=$(HELM_CHART_VERSION) IMAGE_TAG=$(IMAGE_TAG) hack/gen-chart.sh
113113

114114
.PHONY: test
115115
test: clean tidy

hack/gen-chart.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ MAINIFESTS_CHART_PATH=${REPO_ROOT}/manifests/charts
3030
HELM_CHARTS=(base cluster-operator)
3131
HELM_CHART_VERSION=${HELM_CHART_VERSION:-"0.1.0"}
3232
IMAGE_HUB=${IMAGE_HUB:-"ghcr.io/kurator-dev"}
33+
IMAGE_TAG=${IMAGE_TAG:-"latest"}
3334

3435
for c in "${HELM_CHARTS[@]}"
3536
do
3637
echo "gen chart $c"
3738
cp -r "${MAINIFESTS_CHART_PATH}/${c}" "${CHART_OUT_PATH}/${c}"
3839
sed -i "s|hub: ghcr.io/kurator-dev|hub: ${IMAGE_HUB}|g" $(find ${CHART_OUT_PATH}/${HELM_CHART_NAME} -type f | grep values.yaml)
39-
sed -i "s|tag: latest|tag: ${IMAGE_VERSION}|g" $(find ${CHART_OUT_PATH}/${HELM_CHART_NAME} -type f | grep values.yaml)
40+
sed -i "s|tag: latest|tag: ${IMAGE_TAG}|g" $(find ${CHART_OUT_PATH}/${HELM_CHART_NAME} -type f | grep values.yaml)
4041
sed -i "s|version: 0.1.0|version: ${HELM_CHART_VERSION}|g" $(find ${CHART_OUT_PATH}/${HELM_CHART_NAME} -type f | grep Chart.yaml)
4142
helm package "${CHART_OUT_PATH}/${c}" -d "${CHART_OUT_PATH}"
4243
done

manifests/charts/cluster-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ image:
44
hub: ghcr.io/kurator-dev
55
pullPolicy: IfNotPresent
66
# Overrides the image tag whose default is the chart appVersion.
7-
tag: "latest"
7+
tag: latest
88

99
logging:
1010
level: 0

0 commit comments

Comments
 (0)