Skip to content

Commit e726a3e

Browse files
committed
make sure chart linting passes
Signed-off-by: Eric Sauer <esauer@redhat.com>
1 parent 0bccca1 commit e726a3e

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

pelorus-operator/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION ?= 0.0.10-rc.60-rc.60-rc.60-rc.60-rc.60-rc.6
6+
VERSION ?= 0.0.10-rc.6
77

88
# CHANNELS define the bundle channels used in the bundle.
99
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

scripts/chart-test.sh

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,6 @@ if ! grep "default \"v$CURRENT_CHART_VERSION\"" pelorus-operator/helm-charts/pel
5050
exit 1
5151
fi
5252

53-
# Ensure version of the Grafana and Prometheus operators is in sync
54-
# with pelorus-operator.
55-
56-
GRAFANA_VER_HELM=$(grep grafana_subscription_version pelorus-operator/helm-charts/operators/values.yaml | cut -d':' -f2 | tr -d ' ')
57-
PROMETHEUS_VER_HELM=$(grep prometheus_subscription_version pelorus-operator/helm-charts/operators/values.yaml | cut -d':' -f2 | tr -d ' ')
58-
59-
if ! grep "$GRAFANA_VER_HELM" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
60-
echo "ERROR: Grafana version $GRAFANA_VER_HELM not found in the pelorus-operator/bundle/metadata/properties.yaml"
61-
exit 1
62-
else
63-
echo "OK: Grafana version $GRAFANA_VER_HELM in sync with the pelorus-operator/bundle/metadata/properties.yaml"
64-
fi
65-
66-
if ! grep "$PROMETHEUS_VER_HELM" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
67-
echo "ERROR: Prometheus version $PROMETHEUS_VER_HELM not found in the pelorus-operator/bundle/metadata/properties.yaml"
68-
exit 1
69-
else
70-
echo "OK: Prometheus version $PROMETHEUS_VER_HELM in sync with the pelorus-operator/bundle/metadata/properties.yaml"
71-
fi
72-
7353
# Enforce operator version bump when charts folder is touched
7454

7555
CURRENT_OPERATOR_VERSION="$(grep "^VERSION ?= " pelorus-operator/Makefile | cut -c 12-)"

0 commit comments

Comments
 (0)