From 388c89c8e79aa6b17632599d0ebb4923b806ac85 Mon Sep 17 00:00:00 2001 From: ties Date: Thu, 29 Aug 2024 15:35:05 +0000 Subject: [PATCH 1/3] Update templates/helm.yaml --- templates/helm.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/helm.yaml b/templates/helm.yaml index cec5d09..790b5e7 100644 --- a/templates/helm.yaml +++ b/templates/helm.yaml @@ -1,6 +1,8 @@ +{{ $name := .Values.subchartData.name }} {{ $repository := .Values.subchartData.repository }} {{- if hasPrefix "oci://" .Values.subchartData.repository }} -{{- $repository = printf "%s/%s" .Values.subchartData.repository .Values.name }} +{{- $name = printf "%s/%s" .Values.subchartData.repository .Values.subchartData.name }} +{{- $repository = "" }} {{- end }} apiVersion: helm.cattle.io/v1 kind: HelmChart @@ -9,7 +11,9 @@ metadata: namespace: {{ .Values.namespace }} spec: chart: {{ .Values.name }} +{{- if $repository }} repo: {{ $repository }} +{{- end }} targetNamespace: {{ .Values.namespace }} version: {{ .Values.subchartData.version }} valuesContent: |- From d5eefece63fe23efcf5ca42bb0089ffdf9da2e3f Mon Sep 17 00:00:00 2001 From: ties Date: Thu, 29 Aug 2024 15:35:33 +0000 Subject: [PATCH 2/3] Update Chart.yaml --- Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Chart.yaml b/Chart.yaml index 8c07a72..9b6a2b4 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,4 +1,4 @@ apiVersion: v2 name: chart_template description: chart_description -version: 0.0.4 \ No newline at end of file +version: 0.0.5 \ No newline at end of file From 06b5940cff7223705e74cec49aa8499397adaabd Mon Sep 17 00:00:00 2001 From: ties Date: Thu, 29 Aug 2024 15:36:54 +0000 Subject: [PATCH 3/3] Update templates/helm.yaml --- templates/helm.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/helm.yaml b/templates/helm.yaml index 790b5e7..81628d9 100644 --- a/templates/helm.yaml +++ b/templates/helm.yaml @@ -1,7 +1,7 @@ -{{ $name := .Values.subchartData.name }} +{{ $name := .Values.name }} {{ $repository := .Values.subchartData.repository }} {{- if hasPrefix "oci://" .Values.subchartData.repository }} -{{- $name = printf "%s/%s" .Values.subchartData.repository .Values.subchartData.name }} +{{- $name = printf "%s/%s" .Values.subchartData.repository .Values.name }} {{- $repository = "" }} {{- end }} apiVersion: helm.cattle.io/v1 @@ -10,7 +10,7 @@ metadata: name: {{ .Values.name }} namespace: {{ .Values.namespace }} spec: - chart: {{ .Values.name }} + chart: {{ $name }} {{- if $repository }} repo: {{ $repository }} {{- end }}