feat: add permission product name

onecx · Feb 19, 2024 · 9ceeee8 · 9ceeee8
1 parent 22dec3a
commit 9ceeee8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -2,6 +2,11 @@
     {{ .Release.Name }}-{{ .Values.name | default .Chart.Name }}
 {{- end -}}
 
+{{- define "app-angular.product.name" -}}
+    {{ .Release.Name }}
+{{- end -}}
+
+
 {{- define "app-angular.version" -}}
     {{ .Values.image.tag }} 
 {{- end -}}
@@ -36,6 +41,14 @@
     {{ end }}
 {{- end -}}
 
+{{- define "app-angular.permission.product.name" -}}
+    {{- if .Values.operator.permission.spec.productName -}}
+        {{- .Values.operator.permission.spec.productName -}}
+    {{- else -}}
+        {{ include "app-angular.product.name" $ }}
+    {{- end -}}
+{{- end -}}
+
 {{- define "app-angular.labels.common" -}}
 version: {{ .Values.version | default .Values.image.tag | quote }}
 helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

diff --git a/templates/config-env.yaml b/templates/config-env.yaml
@@ -8,4 +8,5 @@ metadata:
 data:
   APP_VERSION: {{ .Values.image.tag }}
   APP_ID: {{ template "app-angular.id" $ }}
+  PRODUCT_NAME: {{ include "app-angular.permission.product.name" $ }}
   {{ if and .Values.routing.enabled .Values.routing.path }}APP_BASE_HREF: {{ .Values.routing.path }}{{ end }}
diff --git a/templates/operator-permission.yaml b/templates/operator-permission.yaml
@@ -7,7 +7,7 @@ metadata:
     app: {{ include "app-angular.fullname" . }}
 {{ include "app-angular.labels.common" $ | indent 4 }}    
 spec:
-  productName: {{ .Values.operator.permission.spec.productName | default .Release.Name }}
+  productName: {{ include "app-angular.permission.product.name" $ }}
   appId: {{ .Values.operator.permission.spec.appId | default (include "app-angular.fullname" .) }} 
   name: {{ .Values.operator.permission.spec.name | default (include "app-angular.fullname" .) }}
   description: {{ .Values.operator.permission.spec.description | default (include "app-angular.fullname" .) }}  

diff --git a/tests/permissions-product.yaml b/tests/permissions-product.yaml
@@ -0,0 +1,5 @@
+operator:
+  permission:
+    enabled: true
+    spec:
+      productName: newProductName
diff --git a/tests/permissions.yaml b/tests/permissions.yaml
@@ -0,0 +1,3 @@
+operator:
+  permission:
+    enabled: true