From ec00f8f2dad2629d983e9ba45ff893659170a633 Mon Sep 17 00:00:00 2001 From: "matteo.gazzetta" Date: Tue, 5 Dec 2023 12:11:05 +0100 Subject: [PATCH 1/2] Fix lint --- .github/workflows/pull_request.yaml | 1 + .github/workflows/push.yaml | 1 + application/templates/ingress.yaml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml index 446be1b5..559369c4 100644 --- a/.github/workflows/pull_request.yaml +++ b/.github/workflows/pull_request.yaml @@ -32,6 +32,7 @@ jobs: - name: Helm Lint run: | helm lint ${CHART_NAME} + helm lint ${CHART_NAME} -f ${CHART_NAME}/values-test.yaml - name: Run Checkov action uses: bridgecrewio/checkov-action@master diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 1e355410..68e6d12d 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -38,6 +38,7 @@ jobs: - name: Helm Lint run: | helm lint ${CHART_NAME} + helm lint ${CHART_NAME} -f ${CHART_NAME}/values-test.yaml - name: Install kubectl uses: azure/setup-kubectl@v3 diff --git a/application/templates/ingress.yaml b/application/templates/ingress.yaml index bef3de8c..2ca833b2 100644 --- a/application/templates/ingress.yaml +++ b/application/templates/ingress.yaml @@ -2,7 +2,7 @@ --- {{- $servicePort := .Values.ingress.servicePort -}} {{- $pathType := .Values.ingress.pathType -}} -{{- $applicationNameTpl := include "application.name" . -}} +{{- $applicationNameTpl := include "application.name" . }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: From 63284f6a7eaf863814332598d453b1d944fbcbfb Mon Sep 17 00:00:00 2001 From: Zadkiel Aharonian Date: Thu, 7 Dec 2023 12:14:00 +0100 Subject: [PATCH 2/2] Update ingress.yaml --- application/templates/ingress.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/templates/ingress.yaml b/application/templates/ingress.yaml index 2ca833b2..075147dd 100644 --- a/application/templates/ingress.yaml +++ b/application/templates/ingress.yaml @@ -1,8 +1,8 @@ {{- if (.Values.ingress).enabled -}} ---- {{- $servicePort := .Values.ingress.servicePort -}} {{- $pathType := .Values.ingress.pathType -}} -{{- $applicationNameTpl := include "application.name" . }} +{{- $applicationNameTpl := include "application.name" . -}} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: