@sap/cds-dk 6.0.2 → 6.1.1

package/lib/k8s/resources/helm/chart/templates/_deployment_helpers.tpl

@@ -1,14 +1,5 @@
 {{/*
-Generate VCAP_APPLICATION
-*/}}
-{{- define "cap.vcapApplication" -}}
-    {{- $deploymentHost := include "cap.deploymentHost" . -}}
-    {{- $VCAP_APPLICATION := dict "application_uris" (list (print $deploymentHost "." .Values.global.domain)) }}
-    {{- $VCAP_APPLICATION | toJson }}
-{{- end -}}
-
-{{/*
-Add custom env variables
+Add custom env variables 
 */}}
 {{- define "cap.env" -}}
     {{- if . -}}
@@ -19,155 +10,6 @@ Add custom env variables
     {{- end -}}
 {{- end -}}
 
-{{- define "cap.bindingsVolumes" -}}
-{{- if $.Values.newBindings -}}
-{{- include "cap.newBindingsVolumes" $ }}
-{{- else -}}
-{{- include "cap.oldBindingsVolumes" $ }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Old Service Bindings: volumes
-*/}}
-{{- define "cap.oldBindingsVolumes" -}}
-    {{- $ := . -}}
-    {{ range $bindingName, $binding := .deployment.bindings -}}
-        {{- $secret := include "cap.bindingSecretName" (dict "Release" $.Release "name" $.name "bindingName" $bindingName "binding" $binding) }}
-- name: {{ $bindingName }}-secret
-  secret:
-    secretName: {{ $secret | quote }}
-        {{- if and (eq $bindingName "db") $.deployment.multitenancy }}
-    # the "plan" property must not be in the secret for the service manager
-    # it would be used as plan for HANA
-    items:
-    - key: clientid
-      path: clientid
-    - key: clientsecret
-      path: clientsecret
-    - key: sm_url
-      path: sm_url
-    - key: url
-      path: url
-    - key: xsappname
-      path: xsappname
-          {{- end -}}
-          {{- if eq $.deployment.language "Node" }}
-- name: {{ $bindingName }}-metadata
-  secret:
-    secretName: {{ $secret | quote }}
-    optional: true
-    items:
-    - key: label
-      path: label
-    - key: plan
-      path: plan
-    - key: tags
-      path: tags
-        {{- end -}}
-    {{- end -}}
-{{- end -}}
-
-{{/*
-New Service Bindings: volumes
-*/}}
-{{- define "cap.newBindingsVolumes" -}}
-    {{- $ := . -}}
-    {{ range $bindingName, $binding := .deployment.bindings -}}
-        {{- $secret := include "cap.bindingSecretName" (dict "Release" $.Release "name" $.name "bindingName" $bindingName "binding" $binding) }}
-- name: {{ $bindingName }}-secret
-  secret:
-    secretName: {{ $secret | quote }}
-    {{- end -}}
-{{- end -}}
-
-
-{{- define "cap.bindingsEnv" -}}
-{{- if $.Values.newBindings -}}
-{{- include "cap.newBindingsEnv" $ }}
-{{- else -}}
-{{- include "cap.oldBindingsEnv" $ }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Old Service Bindings: env vars
-*/}}
-{{- define "cap.oldBindingsEnv" }}
-    {{- $ := . }}
-    {{- if eq .deployment.language "Java" }}
-        {{- range $key, $binding := .deployment.bindings }}
-            {{- $cleanKey := $key | upper | replace "-" "" | replace "_" "" | replace "." "" }}
-            {{- $prefix := print "CDS_ENVIRONMENT_K8S_SERVICEBINDINGS_" $cleanKey }}
-            {{- $secret := default (print $.Release.Name "-" $.name "-" $key) $binding.secret }}
-- name: {{ $prefix }}_SERVICE
-  valueFrom:
-    secretKeyRef:
-      name: {{ $secret | quote }}
-      key: label
-- name: {{ $prefix }}_PLAN
-  valueFrom:
-    secretKeyRef:
-      name: {{ $secret | quote }}
-      key: plan
-      optional: true
-- name: {{ $prefix }}_SECRETSPATH
-  value: /etc/secrets/cds/requires/{{ $key }}/credentials
-        {{- end }}
-    {{- else }}
-  {{- /* Read credentials from file system */ -}}
-- name: CDS_CONFIG
-  value: /etc/secrets/cds
-    {{ end }}
-{{- end }}
-
-{{/*
-New Service Bindings: env vars
-*/}}
-{{- define "cap.newBindingsEnv" }}
-- name: SERVICE_BINDING_ROOT
-  value: /bindings
-{{- end }}
-
-
-{{- define "cap.bindingsVolumeMounts" -}}
-{{- if $.Values.newBindings -}}
-{{- include "cap.newBindingsVolumeMounts" $ }}
-{{- else -}}
-{{- include "cap.oldBindingsVolumeMounts" $ }}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Old Service Bindings: volume mounts
-*/}}
-{{- define "cap.oldBindingsVolumeMounts" }}
-    {{- $ := . -}}
-    {{- range $key, $binding := .deployment.bindings }}
-- name: {{ $key }}-secret
-  mountPath: /etc/secrets/cds/requires/{{ $key }}/credentials
-  readOnly: true
-        {{- if eq $.deployment.language "Node" }}
-- name: {{ $key }}-metadata
-  mountPath: /etc/secrets/cds/requires/{{ $key }}/vcap
-  readOnly: true
-        {{- end }}
-    {{- end }}
-{{- end }}
-
-{{/*
-New Service Bindings: volume mounts
-*/}}
-{{- define "cap.newBindingsVolumeMounts" }}
-    {{- $ := . -}}
-    {{- range $key, $binding := .deployment.bindings }}
-- name: {{ $key }}-secret
-  mountPath: /bindings/{{ $key }}
-  readOnly: true
-    {{- end }}
-{{- end }}
-
-
 {{/*
 Get list of deployment names
 */}}

package/lib/k8s/resources/helm/chart/templates/_helpers.tpl

@@ -45,14 +45,6 @@ app.kubernetes.io/instance: {{ .Release.Name }}
 {{/*
 Image
 */}}
-{{- define "cap.image.srv" -}}
-    {{- if .Values.srv.image.tag -}}
-{{ .Values.srv.image.repository }}:{{ .Values.srv.image.tag }}
-    {{- else -}}
-{{ .Values.srv.image.repository }}
-    {{- end -}}
-{{- end -}}
-
 {{- define "cap.image" -}}
     {{- if .image.tag -}}
 {{ .image.repository }}:{{ .image.tag }}
@@ -64,14 +56,6 @@ Image
 {{/*
 Image Pull Policy
 */}}
-{{- define "cap.imagePullPolicy.srv" -}}
-    {{- if and (.Values.srv.image.tag) (ne .Values.srv.image.tag "latest") -}}
-IfNotPresent
-   {{- else -}}
-Always
-    {{- end -}}
-{{- end -}}
-
 {{- define "cap.imagePullPolicy" -}}
     {{- if and (.image.tag) (ne .image.tag "latest") -}}
 IfNotPresent
@@ -90,23 +74,6 @@ imagePullSecrets:
     {{- end -}}
 {{- end -}}
 
-
-{{/*
-Binding
-*/}}
-{{- define "cap.binding" -}}
-apiVersion: services.cloud.sap.com/v1alpha1
-kind: ServiceBinding
-metadata:
-  name: {{ include "cap.bindingSecretName" $ | quote }}
-  namespace: {{ $.Release.Namespace }}
-  labels: {{- include "cap.labels" $ | nindent 4 }}
-spec:
-  serviceInstanceName: {{ $.Release.Name }}-{{ $.binding.service }}
-  externalName: {{ include "cap.bindingSecretName" $ | quote }}
-  secretName: {{ include "cap.bindingSecretName" $ | quote }}
-{{- end -}}
-
 {{/*
 Service Instance NEW
 ternary dict ($.Files.Get $.service.config | fromJson)

package/lib/k8s/resources/helm/chart/templates/_sapcp_helpers.tpl

@@ -6,7 +6,7 @@ SAPCP Service Bindings: volume mounts
     {{- $ := . -}}
     {{- range $key, $binding := .bindings }}
 - name: {{ $key | replace "_" "-" }}-secret
-  mountPath: /etc/secrets/sapcp/{{ $key | replace "_" "-" }}/{{ $key }}
+  mountPath: /bindings/{{ $key }}
   readOnly: true
     {{- end }}
 {{- end }}