rusackas commented on code in PR #41396: URL: https://github.com/apache/superset/pull/41396#discussion_r3652629875
########## helm/superset/tests/test-istio.sh: ########## @@ -0,0 +1,183 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Renders the chart with `helm template` for several `init.istio.*` value +# combinations and asserts that the relevant manifests contain (or omit) +# the expected fields. Intended to be run from the chart directory or via +# `bash helm/superset/tests/test-istio.sh` from the repo root. +# +# Covers the fix for: +# https://github.com/apache/superset/issues/25798 +set -euo pipefail + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +CHART_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" + +pass=0 +fail=0 + +assert_contains() { + local label="$1" + local needle="$2" + local haystack="$3" + if grep -qF -- "${needle}" <<<"${haystack}"; then + echo " PASS: ${label}" + pass=$((pass + 1)) + else + echo " FAIL: ${label}" + echo " expected to contain: ${needle}" + fail=$((fail + 1)) + fi +} + +assert_not_contains() { + local label="$1" + local needle="$2" + local haystack="$3" + if ! grep -qF -- "${needle}" <<<"${haystack}"; then + echo " PASS: ${label}" + pass=$((pass + 1)) + else + echo " FAIL: ${label}" + echo " expected NOT to contain: ${needle}" + fail=$((fail + 1)) + fi +} + +render() { + helm template release "${CHART_DIR}" "$@" +} + +extract_init_job() { + awk ' + /^# Source: superset\/templates\/init-job\.yaml/ { capture = 1 } + capture && /^---$/ { capture = 0 } + capture { print } + ' <<<"$1" +} + +extract_config_secret() { + awk ' + /^# Source: superset\/templates\/secret-superset-config\.yaml/ { capture = 1 } + capture && /^---$/ { capture = 0 } + capture { print } + ' <<<"$1" +} + +echo "==> defaults: no istio mitigations applied" +out_default="$(render)" +init_job_default="$(extract_init_job "${out_default}")" +config_default="$(extract_config_secret "${out_default}")" +assert_not_contains "default does not set sidecar.istio.io/inject label" \ + 'sidecar.istio.io/inject' "${init_job_default}" +assert_not_contains "default initscript does not register quitquitquit trap" \ + 'quitquitquit' "${config_default}" + +echo "==> init.istio.disableSidecarInjection=true" +out_disable="$(render --set init.istio.disableSidecarInjection=true)" +init_job_disable="$(extract_init_job "${out_disable}")" +config_disable="$(extract_config_secret "${out_disable}")" +assert_contains "init job sets sidecar.istio.io/inject: \"false\"" \ + 'sidecar.istio.io/inject: "false"' "${init_job_disable}" Review Comment: Not a bug — `init-job.yaml` already dereferences `dig "istio" "disableSidecarInjection" false .Values.init` to render the `sidecar.istio.io/inject: "false"` label (line 38-49). Ran `test-istio.sh` locally, all 16 cases including that one pass. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
