make sure chart linting passes

Author: etsauer

pelorus-operator/Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.0.10-rc.60-rc.60-rc.60-rc.60-rc.60-rc.6
+VERSION ?= 0.0.10-rc.6
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

scripts/chart-test.sh

@@ -50,26 +50,6 @@ if ! grep "default \"v$CURRENT_CHART_VERSION\"" pelorus-operator/helm-charts/pel
   exit 1
 fi
 
-# Ensure version of the Grafana and Prometheus operators is in sync
-# with pelorus-operator.
-
-GRAFANA_VER_HELM=$(grep grafana_subscription_version pelorus-operator/helm-charts/operators/values.yaml | cut -d':' -f2 | tr -d ' ')
-PROMETHEUS_VER_HELM=$(grep prometheus_subscription_version pelorus-operator/helm-charts/operators/values.yaml | cut -d':' -f2 | tr -d ' ')
-
-if ! grep "$GRAFANA_VER_HELM" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
-  echo "ERROR: Grafana version $GRAFANA_VER_HELM not found in the pelorus-operator/bundle/metadata/properties.yaml"
-  exit 1
-else
-  echo "OK: Grafana version $GRAFANA_VER_HELM in sync with the pelorus-operator/bundle/metadata/properties.yaml"
-fi
-
-if ! grep "$PROMETHEUS_VER_HELM" pelorus-operator/bundle/metadata/properties.yaml >/dev/null; then
-  echo "ERROR: Prometheus version $PROMETHEUS_VER_HELM not found in the pelorus-operator/bundle/metadata/properties.yaml"
-  exit 1
-else
-  echo "OK: Prometheus version $PROMETHEUS_VER_HELM in sync with the pelorus-operator/bundle/metadata/properties.yaml"
-fi
-
 # Enforce operator version bump when charts folder is touched
 
 CURRENT_OPERATOR_VERSION="$(grep "^VERSION ?= " pelorus-operator/Makefile  | cut -c 12-)"