[release/4][BACKPORT] [tests] [flagger] [kiali] Update references to …

…prometheus resources (#1152) * Update prometheus resource names in metric tests * Update flagger metricsServer * Update kiali prometheus URL * Reorder metric test data * set extended-regexp when using extended-regexp syntax * adding-files-with-cherrypick-conflicts * Bump konvoy version for testing * Resolve merge conflicts Co-authored-by: Branden Rolston <[email protected]> Co-authored-by: Joe Julian <[email protected]>
d2iq-archive · May 20, 2021 · ccd341d · ccd341d
1 parent 75142a9
commit ccd341d
Show file tree

Hide file tree

Showing 10 changed files with 77 additions and 77 deletions.
diff --git a/Dispatchfile b/Dispatchfile
@@ -40,7 +40,7 @@ common_env = [
     k8s.corev1.EnvVar(name="GIT_TERMINAL_PROMPT", value="1"),
     k8s.corev1.EnvVar(name="GITHUB_TOKEN", valueFrom=secret_var("d2iq-dispatch-basic-auth", "password")),
     k8s.corev1.EnvVar(name="GOPRIVATE", value="github.com/mesosphere"),
-    k8s.corev1.EnvVar(name="KONVOY_VERSION", value="v1.6.1"),
+    k8s.corev1.EnvVar(name="KONVOY_VERSION", value="v1.8.0"),
     k8s.corev1.EnvVar(name="KUBEADDONS_ADDON_DELETE_DURATION", value="5m"),
     k8s.corev1.EnvVar(name="SSH_KEY_BASE64", valueFrom=secret_var( "d2iq-dispatch-git-ssh-base64", "ssh-privatekey-base64")),
 ]

diff --git a/Makefile b/Makefile
@@ -109,7 +109,7 @@ endif
 
 .PHONY: dispatch-test-install-upgrade
 .ONESHELL:
-dispatch-test-install-upgrade: $(GITHUB_CLI_BIN)
+dispatch-test-install-upgrade: test/konvoy $(GITHUB_CLI_BIN)
 	cd test
 	./dispatch_test_install_upgrade.sh
 

diff --git a/addons/flagger/flagger.yaml b/addons/flagger/flagger.yaml
@@ -8,7 +8,7 @@ metadata:
   annotations:
     sidecar.istio.io/inject: "false"
     appversion.kubeaddons.mesosphere.io/flagger: "0.19.0"
-    catalog.kubeaddons.mesosphere.io/addon-revision: "0.19.0-4"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "0.19.0-5"
     docs.kubeaddons.mesosphere.io/flagger: "https://docs.flagger.app/"
     values.chart.helm.kubeaddons.mesosphere.io/flagger: "https://raw.githubusercontent.com/mesosphere/charts/f4105ebb01fc758a4af356069a8ceae043201057/staging/flagger/values.yaml"
 spec:
@@ -38,7 +38,7 @@ spec:
     values: |
       ---
       meshProvider: istio
-      metricsServer: http://prometheus-kubeaddons-prom-prometheus.kubeaddons:9090
+      metricsServer: http://prometheus-kubeaddons-kube-prometheus.kubeaddons:9090
       podLabels:
         podmonitor.kubeaddons.mesosphere.io/path: "metrics"
         kubeaddons.mesosphere.io/name: "flagger"

diff --git a/addons/kiali/kiali.yaml b/addons/kiali/kiali.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     kubeaddons.mesosphere.io/name: kiali
   annotations:
-    catalog.kubeaddons.mesosphere.io/addon-revision: "v1.29.1-2"
+    catalog.kubeaddons.mesosphere.io/addon-revision: "v1.29.1-3"
     appversion.kubeaddons.mesosphere.io/kiali-operator: "v1.29.1"
     appversion.kubeaddons.mesosphere.io/kiali: "1.29.0"
     stage.kubeaddons.mesosphere.io/kiali: Experimental
@@ -55,7 +55,7 @@ spec:
             grafana:
               in_cluster_url: http://prometheus-kubeaddons-grafana.kubeaddons:3000
             prometheus:
-              url: http://prometheus-kubeaddons-prom-prometheus.kubeaddons:9090
+              url: http://prometheus-kubeaddons-kube-prometheus.kubeaddons:9090
             tracing:
               in_cluster_url: http://jaeger-kubeaddons-jaeger-operator-jaeger-query:16686
           deployment:

diff --git a/test/dispatch_test_install_upgrade.sh b/test/dispatch_test_install_upgrade.sh
@@ -18,7 +18,7 @@ fi
 
 
 echo "INFO: the following test groups will be run:"
-tests=$(go run -tags experimental scripts/test-wrapper.go origin ${branch} | (grep -E '^Test' || true) | grep -v 'TestAwsGroup\|TestElasticsearchGroup\|TestIstioGroup')
+tests=$(go run -tags experimental scripts/test-wrapper.go origin ${branch} | (grep -E '^Test' || true) | grep -Ev 'TestAwsGroup\|TestElasticsearchGroup\|TestIstioGroup')
 echo ${tests}
 
 for g in ${tests}

diff --git a/test/run-tests.sh b/test/run-tests.sh
@@ -8,7 +8,7 @@ set -euxo pipefail
 cd "$(dirname "$0")"
 
 echo "Setup Konvoy"
-source ./scripts/setup-konvoy.sh v1.6.1
+source ./scripts/setup-konvoy.sh v1.8.0
 
 echo "git fetch branches."
 git fetch

diff --git a/test/scripts/setup-konvoy.sh b/test/scripts/setup-konvoy.sh
@@ -2,7 +2,7 @@
 # NOTE: used by teamcity and dispatch
 
 UNAME=$(uname | tr '[:upper:]' '[:lower:]')
-KONVOY_VERSION="${1:-${KONVOY_VERSION:-v1.6.1}}"
+KONVOY_VERSION="${1:-${KONVOY_VERSION:-v1.8.0}}"
 
 set -euo pipefail