From 0735b36d814d44f3a447ebdccab7c057f80e1303 Mon Sep 17 00:00:00 2001 From: StevenMcElligott <89483932+StevenMcElligott@users.noreply.github.com> Date: Sat, 27 May 2023 07:15:27 -0400 Subject: [PATCH] fix(Common): Fix ingress typo (#430) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [ ] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [ ] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [ ] ⚖️ My code follows the style guidelines of this project - [ ] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [ ] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- library/common/templates/class/_ingress.tpl | 6 +++--- library/common/templates/class/_route.tpl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/common/templates/class/_ingress.tpl b/library/common/templates/class/_ingress.tpl index c6a8fb07..ce6bc7c6 100644 --- a/library/common/templates/class/_ingress.tpl +++ b/library/common/templates/class/_ingress.tpl @@ -19,15 +19,15 @@ within the common library. {{/* Get the name of the primary service, if any */}} - {{- $primarySeriviceName := (include "tc.v1.common.lib.util.service.primary" (dict "services" .Values.service "root" .)) -}} + {{- $primaryServiceName := (include "tc.v1.common.lib.util.service.primary" (dict "services" .Values.service "root" .)) -}} {{/* Get service values of the primary service, if any */}} - {{- $primaryService := get .Values.service $primarySeriviceName -}} + {{- $primaryService := get .Values.service $primaryServiceName -}} {{- $defaultServiceName := $fullName -}} {{- if and (hasKey $primaryService "nameOverride") $primaryService.nameOverride -}} {{- $defaultServiceName = printf "%v-%v" $defaultServiceName $primaryService.nameOverride -}} {{- end -}} - {{- $defaultServicePort := get $primaryService.ports (include "tc.v1.common.lib.util.service.ports.primary" (dict "svcValues" $primaryService "svcName" $primarySeriviceName )) -}} + {{- $defaultServicePort := get $primaryService.ports (include "tc.v1.common.lib.util.service.ports.primary" (dict "svcValues" $primaryService "svcName" $primaryServiceName )) -}} {{- $mddwrNamespace := "tc-system" -}} {{- if $values.ingressClassName -}} diff --git a/library/common/templates/class/_route.tpl b/library/common/templates/class/_route.tpl index 6bae0ff6..7770c90e 100644 --- a/library/common/templates/class/_route.tpl +++ b/library/common/templates/class/_route.tpl @@ -20,15 +20,15 @@ within the common library. {{- $routeKind := $values.kind | default "HTTPRoute" -}} {{/* Get the name of the primary service, if any */}} -{{- $primarySeriviceName := (include "tc.v1.common.lib.util.service.primary" (dict "services" .Values.service "root" .)) -}} +{{- $primaryServiceName := (include "tc.v1.common.lib.util.service.primary" (dict "services" .Values.service "root" .)) -}} {{/* Get service values of the primary service, if any */}} -{{- $primaryService := get .Values.service $primarySeriviceName -}} +{{- $primaryService := get .Values.service $primaryServiceName -}} {{- $defaultServiceName := $fullName -}} {{- if and (hasKey $primaryService "nameOverride") $primaryService.nameOverride -}} {{- $defaultServiceName = printf "%v-%v" $defaultServiceName $primaryService.nameOverride -}} {{- end -}} -{{- $defaultServicePort := get $primaryService.ports (include "tc.v1.common.lib.util.service.ports.primary" (dict "svcValues" $primaryService "svcName" $primarySeriviceName )) -}} +{{- $defaultServicePort := get $primaryService.ports (include "tc.v1.common.lib.util.service.ports.primary" (dict "svcValues" $primaryService "svcName" $primaryServiceName )) -}} --- apiVersion: gateway.networking.k8s.io/v1alpha2