-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Update helm version to v3.19.5 #5781
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 3 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,19 +24,20 @@ jobs: | |
| name: build docker images(dataset-controller) | ||
| command: | | ||
| FLUID_VERSION=$(sed -n -e 's/^VERSION := //p' Makefile) | ||
| HELM_VERSION=$(sed -n -e 's/^HELM_VERSION ?= //p' Makefile) | ||
| FLUID_VERSION=$FLUID_VERSION-$(git rev-parse --short HEAD || echo "HEAD") | ||
|
||
| docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=v3.17.3 --build-arg FLUID_VERSION=$FLUID_VERSION . -f docker/Dockerfile.dataset -t dataset-controller:${CIRCLE_BUILD_NUM} | ||
| docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=$HELM_VERSION --build-arg FLUID_VERSION=$FLUID_VERSION . -f docker/Dockerfile.dataset -t dataset-controller:${CIRCLE_BUILD_NUM} | ||
|
Comment on lines
+28
to
+29
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The extraction of Consider using a more robust regex and quoting the variables in the HELM_VERSION=${HELM_VERSION:-$(sed -n -e 's/^HELM_VERSION ?= \([^ ]*\).*/\1/p' Makefile)}
docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION="$HELM_VERSION" --build-arg FLUID_VERSION="$FLUID_VERSION" . -f docker/Dockerfile.dataset -t dataset-controller:${CIRCLE_BUILD_NUM} |
||
| - run: | ||
| name: build docker images(alluxioruntime-controller) | ||
| command: | | ||
| FLUID_VERSION=$(sed -n -e 's/^VERSION := //p' Makefile) | ||
| FLUID_VERSION=$FLUID_VERSION-$(git rev-parse --short HEAD || echo "HEAD") | ||
|
Comment on lines
32
to
34
|
||
| docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=v3.17.3 --build-arg FLUID_VERSION=$FLUID_VERSION . -f docker/Dockerfile.alluxioruntime -t alluxioruntime-controller:${CIRCLE_BUILD_NUM} | ||
| docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=$(sed -n -e 's/^HELM_VERSION ?= //p' Makefile) --build-arg FLUID_VERSION=$FLUID_VERSION . -f docker/Dockerfile.alluxioruntime -t alluxioruntime-controller:${CIRCLE_BUILD_NUM} | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar to the previous step, extracting HELM_VERSION=$(sed -n -e 's/^HELM_VERSION ?= //p' Makefile)
docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=$HELM_VERSION --build-arg FLUID_VERSION=$FLUID_VERSION . -f docker/Dockerfile.alluxioruntime -t alluxioruntime-controller:${CIRCLE_BUILD_NUM} |
||
| - run: | ||
| name: build docker images(fluid-csi) | ||
| command: | | ||
| FLUID_VERSION=$(sed -n -e 's/^VERSION := //p' Makefile) | ||
| FLUID_VERSION=$FLUID_VERSION-$(git rev-parse --short HEAD || echo "HEAD") | ||
|
Comment on lines
39
to
41
|
||
| docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=v3.17.3 . -f docker/Dockerfile.csi -t fluid-csi:${CIRCLE_BUILD_NUM} | ||
| docker build --build-arg TARGETARCH=amd64 --build-arg HELM_VERSION=$(sed -n -e 's/^HELM_VERSION ?= //p' Makefile) . -f docker/Dockerfile.csi -t fluid-csi:${CIRCLE_BUILD_NUM} | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The docker build . -f docker/Dockerfile.csi -t fluid-csi:${CIRCLE_BUILD_NUM} |
||
|
|
||
| # maybe later we need to upload output to helm repository | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CI script parses HELM_VERSION from the Makefile inline in the
docker buildinvocation. Sincesedsucceeds even when there is no match, this can silently pass an emptyHELM_VERSIONand build with an unintended Helm version. Consider extractingHELM_VERSIONinto a variable on its own line and adding an explicit non-empty check (fail fast) before runningdocker build(and reuse the variable for readability).