From f8f0c1cf5de6d4eb6e1eedc7c6c6ec72d909bfd7 Mon Sep 17 00:00:00 2001 From: Zane Williamson Date: Thu, 31 Mar 2022 14:44:14 -0700 Subject: [PATCH] udpating chart for istio --- charts/dinghy-ping/Chart.yaml | 2 +- charts/dinghy-ping/templates/istio-virtual-service.yaml | 2 +- charts/dinghy-ping/values.yaml | 3 +-- tests/api_test.py | 4 +--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/charts/dinghy-ping/Chart.yaml b/charts/dinghy-ping/Chart.yaml index 904bbd6..e1118b3 100644 --- a/charts/dinghy-ping/Chart.yaml +++ b/charts/dinghy-ping/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v1.0.0" description: A Helm chart for dinghy-ping name: dinghy-ping -version: 0.4.5 +version: 0.4.6 icon: https://user-images.githubusercontent.com/538171/64288240-732bef00-cf16-11e9-830a-7b08759bffad.jpg maintainers: - name: sepulworld diff --git a/charts/dinghy-ping/templates/istio-virtual-service.yaml b/charts/dinghy-ping/templates/istio-virtual-service.yaml index 9c0d6b0..254a8e0 100644 --- a/charts/dinghy-ping/templates/istio-virtual-service.yaml +++ b/charts/dinghy-ping/templates/istio-virtual-service.yaml @@ -11,7 +11,7 @@ metadata: heritage: {{ .Release.Service }} spec: gateways: - {{ toYaml . | indent 4 }} + {{ toYaml .Values.istioVirtualService.gateways | indent 4 }} hosts: - {{ .Release.Name }}.{{- .Values.subdomain }} http: diff --git a/charts/dinghy-ping/values.yaml b/charts/dinghy-ping/values.yaml index d4a5f94..9fe3827 100644 --- a/charts/dinghy-ping/values.yaml +++ b/charts/dinghy-ping/values.yaml @@ -25,8 +25,7 @@ nginxIngress: istioVirtualService: enabled: false - # gateways: - # - istio-gateways/private-gateway + gateways: [] tls: [] # - secretName: chart-example-tls # hosts: diff --git a/tests/api_test.py b/tests/api_test.py index 197b77b..c17117d 100644 --- a/tests/api_test.py +++ b/tests/api_test.py @@ -2,9 +2,7 @@ import sys import pytest -import services.api as service - -sys.path.insert(0, "./dinghy_ping/") +import dinghy_ping.services.api as service with open("tests/multiple_domains.json") as f: multiple_domains = json.load(f)