From 6faf9bf4bfc2d5041522f56b4900aa77fe837b96 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Mon, 6 Mar 2023 11:13:35 -0500 Subject: [PATCH] bug fix for https://github.com/Infisical/infisical/issues/403 --- helm-charts/secrets-operator/Chart.yaml | 2 +- helm-charts/secrets-operator/templates/_helpers.tpl | 6 +++--- k8-operator/Makefile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm-charts/secrets-operator/Chart.yaml b/helm-charts/secrets-operator/Chart.yaml index 89f7af5c4..001ae6cc0 100644 --- a/helm-charts/secrets-operator/Chart.yaml +++ b/helm-charts/secrets-operator/Chart.yaml @@ -13,7 +13,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.2 +version: 0.1.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/helm-charts/secrets-operator/templates/_helpers.tpl b/helm-charts/secrets-operator/templates/_helpers.tpl index 44e464d93..69017a4c5 100644 --- a/helm-charts/secrets-operator/templates/_helpers.tpl +++ b/helm-charts/secrets-operator/templates/_helpers.tpl @@ -12,13 +12,13 @@ If release name contains chart name it will be used as a full name. */}} {{- define "secrets-operator.fullname" -}} {{- if .Values.fullnameOverride }} -{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- .Values.fullnameOverride | trunc 15 | trimSuffix "-" }} {{- else }} {{- $name := default .Chart.Name .Values.nameOverride }} {{- if contains $name .Release.Name }} -{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- .Release.Name | trunc 15 | trimSuffix "-" }} {{- else }} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- printf "%s-%s" .Release.Name $name | trunc 15 | trimSuffix "-" }} {{- end }} {{- end }} {{- end }} diff --git a/k8-operator/Makefile b/k8-operator/Makefile index a8b056376..c1b7a57d2 100644 --- a/k8-operator/Makefile +++ b/k8-operator/Makefile @@ -37,7 +37,7 @@ help: ## Display this help. @awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n make \033[36m\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf " \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST) -## Chart +## Chart - NOTE: change helper file to have 15 length for full name method helm-chart: $(KUSTOMIZE) build config/default | helmify ../helm-charts/secrets-operator