Skip to content

Commit

Permalink
build: fix master version helm values replacement
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Trost <galexrt@googlemail.com>
  • Loading branch information
galexrt committed Mar 5, 2024
1 parent d44d54e commit 83d34d7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Documentation/Helm-Charts/operator-chart.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ The following table lists the configurable parameters of the rook-operator chart
| `hostpathRequiresPrivileged` | Runs Ceph Pods as privileged to be able to write to `hostPaths` in OpenShift with SELinux restrictions. | `false` |
| `image.pullPolicy` | Image pull policy | `"IfNotPresent"` |
| `image.repository` | Image | `"rook/ceph"` |
| `image.tag` | Image tag | `master` |
| `image.tag` | Image tag | `"master"` |
| `imagePullSecrets` | imagePullSecrets option allow to pull docker images from private docker registry. Option will be passed to all service accounts. | `nil` |
| `logLevel` | Global log level for the operator. Options: `ERROR`, `WARNING`, `INFO`, `DEBUG` | `"INFO"` |
| `monitoring.enabled` | Enable monitoring. Requires Prometheus to be pre-installed. Enabling will also create RBAC rules to allow Operator to create ServiceMonitors | `false` |
Expand Down
2 changes: 1 addition & 1 deletion build/makelib/helm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $(HELM_OUTPUT_DIR)/$(1)-$(VERSION).tgz: $(HELM) $(HELM_OUTPUT_DIR) $(shell find
@echo === helm package $(1)
@rm -rf $(OUTPUT_DIR)/$(1)
@cp -aL $(HELM_CHARTS_DIR)/$(1) $(OUTPUT_DIR)
@$(SED_IN_PLACE) 's|master|$(VERSION)|g' $(OUTPUT_DIR)/$(1)/values.yaml
@$(SED_IN_PLACE) 's|"master"|"$(VERSION)"|g' $(OUTPUT_DIR)/$(1)/values.yaml
@$(HELM) lint $(abspath $(OUTPUT_DIR)/$(1)) --set image.tag=$(VERSION)
@$(HELM) package --version $(VERSION) --app-version $(VERSION) -d $(HELM_OUTPUT_DIR) $(abspath $(OUTPUT_DIR)/$(1))
$(HELM_INDEX): $(HELM_OUTPUT_DIR)/$(1)-$(VERSION).tgz
Expand Down
4 changes: 2 additions & 2 deletions deploy/charts/rook-ceph/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ image:
# -- Image
repository: rook/ceph
# -- Image tag
# @default -- `master`
tag: master
# @default -- `"master"`
tag: "master"
# -- Image pull policy
pullPolicy: IfNotPresent

Expand Down

0 comments on commit 83d34d7

Please sign in to comment.