removed cap & cav prefix on cap-operator resources

cap-js · Sep 10, 2024 · 34feaab · 34feaab
1 parent 0d4872e
commit 34feaab
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/files/chart/templates/_helpers.tpl b/files/chart/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{- define "capApplicationVersionName" -}}
-{{ printf "cav-%s-%d" (include "appName" $) (.Release.Revision) }}
+{{ printf "%s-%d" (include "appName" $) (.Release.Revision) }}
 {{- end -}}
 
 {{- define "appName" -}}

diff --git a/files/chart/templates/cap-operator-cros.yaml b/files/chart/templates/cap-operator-cros.yaml
@@ -2,7 +2,7 @@
 apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
-  name: cap-{{ include "appName" $ }}
+  name: {{ include "appName" $ }}
 spec:
   domains:
     primary: {{.Values.app.domains.primary}}
@@ -18,10 +18,10 @@ spec:
       value: {{ $v | default "invalidValue"}}
     {{- end }}
   btpAppName: {{ include "appName" $ }}
-  globalAccountId: "{{.Values.btp.globalAccountId}}"
+  globalAccountId: {{.Values.btp.globalAccountId}}
   provider:
-    subDomain: "{{.Values.btp.provider.subdomain}}"
-    tenantId: "{{.Values.btp.provider.tenantId}}"
+    subDomain: {{.Values.btp.provider.subdomain}}
+    tenantId: {{.Values.btp.provider.tenantId}}
   btp:
     services:
     {{- $serviceInstances := .Values.serviceInstances }}
@@ -51,8 +51,8 @@ metadata:
     helm.sh/resource-policy: keep
   name: {{ include "capApplicationVersionName" $ }}
 spec:
-  capApplicationInstance: "cap-{{ include "appName" $ }}"
-  version: "{{ .Release.Revision }}"
+  capApplicationInstance: {{ include "appName" $ }}
+  version: {{ .Release.Revision }}
   registrySecrets:
     {{- range .Values.imagePullSecrets }}
     - {{.}}

diff --git a/files/configurableTemplatesChart/templates/_helpers.tpl b/files/configurableTemplatesChart/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{- define "capApplicationVersionName" -}}
-{{ printf "cav-%s-%d" (include "appName" $) (.Release.Revision) }}
+{{ printf "%s-%d" (include "appName" $) (.Release.Revision) }}
 {{- end -}}
 
 {{- define "appName" -}}

diff --git a/files/configurableTemplatesChart/templates/cap-operator-cros.yaml b/files/configurableTemplatesChart/templates/cap-operator-cros.yaml
@@ -2,7 +2,7 @@
 apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
-  name: cap-{{ include "appName" $ }}
+  name: {{ include "appName" $ }}
 spec:
   domains:
     primary: {{.Values.app.domains.primary}}
@@ -51,8 +51,8 @@ metadata:
     helm.sh/resource-policy: keep
   name: {{ include "capApplicationVersionName" $ }}
 spec:
-  capApplicationInstance: cap-{{ include "appName" $ }}
-  version: "{{ .Release.Revision }}"
+  capApplicationInstance: {{ include "appName" $ }}
+  version: {{ .Release.Revision }}
   registrySecrets:
     {{- range .Values.imagePullSecrets }}
     - {{.}}

diff --git a/test/files/expectedConfigurableTemplatesChart/templates/_helpers.tpl b/test/files/expectedConfigurableTemplatesChart/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{- define "capApplicationVersionName" -}}
-{{ printf "cav-%s-%d" (include "appName" $) (.Release.Revision) }}
+{{ printf "%s-%d" (include "appName" $) (.Release.Revision) }}
 {{- end -}}
 
 {{- define "appName" -}}

diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-modified.yaml
@@ -2,7 +2,7 @@
 apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
-  name: cap-{{ include "appName" $ }}
+  name: {{ include "appName" $ }}
 spec:
   domains:
     primary: {{.Values.app.domains.primary}}
@@ -51,8 +51,8 @@ metadata:
     helm.sh/resource-policy: keep
   name: {{ include "capApplicationVersionName" $ }}
 spec:
-  capApplicationInstance: cap-{{ include "appName" $ }}
-  version: "{{ .Release.Revision }}"
+  capApplicationInstance: {{ include "appName" $ }}
+  version: {{ .Release.Revision }}
   registrySecrets:
     {{- range .Values.imagePullSecrets }}
     - {{.}}

diff --git a/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml b/test/files/expectedConfigurableTemplatesChart/templates/cap-operator-cros-mta.yaml
@@ -2,7 +2,7 @@
 apiVersion: sme.sap.com/v1alpha1
 kind: CAPApplication
 metadata:
-  name: cap-{{ include "appName" $ }}
+  name: {{ include "appName" $ }}
 spec:
   domains:
     primary: {{.Values.app.domains.primary}}
@@ -51,8 +51,8 @@ metadata:
     helm.sh/resource-policy: keep
   name: {{ include "capApplicationVersionName" $ }}
 spec:
-  capApplicationInstance: cap-{{ include "appName" $ }}
-  version: "{{ .Release.Revision }}"
+  capApplicationInstance: {{ include "appName" $ }}
+  version: {{ .Release.Revision }}
   registrySecrets:
     {{- range .Values.imagePullSecrets }}
     - {{.}}