From 857e0126c30313c98f1e3c116208b76450bb31c3 Mon Sep 17 00:00:00 2001 From: Michael Kalantar Date: Tue, 31 Oct 2023 16:30:51 -0400 Subject: [PATCH] fix release chart for mm istio (#1651) * deprecate routing-actions chart Signed-off-by: Michael Kalantar * fix problem with mm release chart Signed-off-by: Michael Kalantar --------- Signed-off-by: Michael Kalantar --- charts/release/Chart.yaml | 2 +- charts/release/templates/_mm-istio.blue-green.tpl | 4 ++++ charts/release/templates/_mm-istio.canary.tpl | 4 ++++ charts/release/templates/_mm-istio.tpl | 4 ---- charts/routing-actions/Chart.yaml | 5 +++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/charts/release/Chart.yaml b/charts/release/Chart.yaml index 2c0da8a52..8519eb002 100644 --- a/charts/release/Chart.yaml +++ b/charts/release/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: release -version: 0.18.1 +version: 0.18.2 description: Iter8 supported application release type: application keywords: diff --git a/charts/release/templates/_mm-istio.blue-green.tpl b/charts/release/templates/_mm-istio.blue-green.tpl index 7d8492e9e..58f2120b2 100644 --- a/charts/release/templates/_mm-istio.blue-green.tpl +++ b/charts/release/templates/_mm-istio.blue-green.tpl @@ -1,5 +1,9 @@ {{- define "env.mm-istio.blue-green" }} +{{- /* ServiceEntry */}} +{{ include "env.mm-istio.service" . }} +--- + {{- /* prepare versions for simpler processing */}} {{- $versions := include "normalize.versions.kserve-mm" . | mustFromJson }} diff --git a/charts/release/templates/_mm-istio.canary.tpl b/charts/release/templates/_mm-istio.canary.tpl index 6a238c950..817781447 100644 --- a/charts/release/templates/_mm-istio.canary.tpl +++ b/charts/release/templates/_mm-istio.canary.tpl @@ -1,5 +1,9 @@ {{- define "env.mm-istio.canary" }} +{{- /* ServiceEntry */}} +{{ include "env.mm-istio.service" . }} +--- + {{- /* routemap */}} {{ include "env.mm-istio.canary.routemap" . }} diff --git a/charts/release/templates/_mm-istio.tpl b/charts/release/templates/_mm-istio.tpl index f6d7f05f5..2fc3bd73d 100644 --- a/charts/release/templates/_mm-istio.tpl +++ b/charts/release/templates/_mm-istio.tpl @@ -9,10 +9,6 @@ --- {{- end }} {{- /* range $i, $v := $versions */}} -{{- /* ServiceEntry */}} -{{ include "env.mm-istio.service" . }} ---- - {{- /* routemap (and other strategy specific objects) */}} {{- if not .Values.application.strategy }} {{ include "env.mm-istio.none" . }} diff --git a/charts/routing-actions/Chart.yaml b/charts/routing-actions/Chart.yaml index ef27ecfb9..c2937327f 100644 --- a/charts/routing-actions/Chart.yaml +++ b/charts/routing-actions/Chart.yaml @@ -1,7 +1,8 @@ apiVersion: v2 name: routing-actions -version: 0.18.1 -description: Iter8 routing actions +version: 0.18.2 +deprecated: true +description: DEPRECATED Iter8 routing actions type: application keywords: - Iter8