fix: Update Chart.yaml version and fix some values

mairror · Mar 11, 2022 · afc9216 · afc9216
1 parent a77cc6b
commit afc9216
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/chart/mairror/Chart.yaml b/chart/mairror/Chart.yaml
@@ -4,7 +4,7 @@ description: A helm chart to deploy mairror application
 
 type: application
 
-version: 0.0.1
+version: 0.0.2
 
 maintainers:
   - name: Alejandro Aceituna

diff --git a/chart/mairror/README.md b/chart/mairror/README.md
@@ -2,7 +2,7 @@
 
 A helm chart to deploy mairror application
 
-![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 ## Additional Information
 

diff --git a/chart/mairror/templates/_helpers.tpl b/chart/mairror/templates/_helpers.tpl
@@ -30,7 +30,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.mairror_api.fullnameOverride }}
 {{- .Values.mairror_api.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default "mairror-api" .Values.mairror_api.nameOverride }}
+{{- $name := default "api" .Values.mairror_api.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -43,7 +43,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.mairror_predictor.fullnameOverride }}
 {{- .Values.mairror_predictor.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default "mairror-predictor" .Values.mairror_predictor.nameOverride }}
+{{- $name := default "predictor" .Values.mairror_predictor.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -56,7 +56,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.mairror_bot.fullnameOverride }}
 {{- .Values.mairror_bot.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default "mairror-bot" .Values.mairror_bot.nameOverride }}
+{{- $name := default "bot" .Values.mairror_bot.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -69,7 +69,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.mairror_front.fullnameOverride }}
 {{- .Values.mairror_front.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default "mairror-front" .Values.mairror_front.nameOverride }}
+{{- $name := default "front" .Values.mairror_front.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -82,7 +82,7 @@ If release name contains chart name it will be used as a full name.
 {{- if .Values.mairror_processor.fullnameOverride }}
 {{- .Values.mairror_processor.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default "mairror-processor" .Values.mairror_processor.nameOverride }}
+{{- $name := default "processor" .Values.mairror_processor.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}

diff --git a/chart/mairror/templates/ingress_api.yaml b/chart/mairror/templates/ingress_api.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.mairror_api.ingress.enabled -}}
 {{- $fullName := include "mairror_api.fullname" . -}}
 {{- $svcPort := .Values.mairror_api.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+{{- if and .Values.mairror_api.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}

diff --git a/chart/mairror/templates/ingress_front.yaml b/chart/mairror/templates/ingress_front.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.mairror_front.ingress.enabled -}}
 {{- $fullName := include "mairror_front.fullname" . -}}
 {{- $svcPort := .Values.mairror_front.service.port -}}
-{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+{{- if and .Values.mairror_front.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
   {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
   {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}}
   {{- end }}