@sap/cds-dk 7.3.0 → 7.3.2

package/lib/init/template/helm/subcharts/web-application/templates/rbac.yaml

@@ -0,0 +1,26 @@
+---
+{{- if .Values.rbac.rules }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels: {{- include "web-application.labels" . | nindent 4 }}
+  name: {{ include "web-application.fullname" . }}
+rules:
+{{- .Values.rbac.rules | toYaml | nindent 2}}
+---
+{{- end }}
+{{- if or .Values.rbac.rules .Values.rbac.role .Values.rbac.clusterRole }}
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels: {{- include "web-application.labels" . | nindent 4 }}
+  name: {{ include "web-application.fullname" . }}
+subjects:
+  - kind: ServiceAccount
+    name: {{ tpl (default (include "web-application.fullname" .) .Values.serviceAccountName) . }}
+    namespace: {{ .Release.Namespace }}
+roleRef:
+  kind: {{ ternary "Role" "ClusterRole" (empty .Values.rbac.clusterRole) }}
+  name: {{ tpl (default (include "web-application.fullname" .) (default .Values.rbac.role .Values.rbac.clusterRole)) . }}
+  apiGroup: rbac.authorization.k8s.io
+{{- end }}

package/lib/init/template/helm/subcharts/web-application/templates/secret.yaml

@@ -4,7 +4,7 @@ kind: Secret
 type: kubernetes.io/dockerconfigjson
 metadata:
   name: {{ include "web-application.internal.imagePullSecretName" . }}
-  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
+  labels: {{- include "web-application.labels" . | nindent 4 }}
 data:
   .dockerconfigjson: {{ default .Values.global.imagePullSecret.dockerconfigjson .Values.imagePullSecret.dockerconfigjson }}
 {{- end }}

package/lib/init/template/helm/subcharts/web-application/templates/service-account.yaml

@@ -2,5 +2,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "web-application.internal.fullname" . }}
+  name: {{ include "web-application.fullname" . }}
 {{- end }}

package/lib/init/template/helm/subcharts/web-application/templates/service-binding.yaml

@@ -8,7 +8,7 @@ apiVersion: services.cloud.sap.com/v1
 kind: ServiceBinding
 metadata:
   name: {{ include "web-application.internal.bindingName" (dict "root" $ "name" $name) }}
-  labels: {{- include "web-application.internal.labels" $ | nindent 4 }}
+  labels: {{- include "web-application.labels" $ | nindent 4 }}
 spec:
   serviceInstanceName: {{include "web-application.internal.serviceInstanceName" (dict "binding" $mergedParams "root" $) }}
   secretKey: credentials

package/lib/init/template/helm/subcharts/web-application/templates/service.yaml

@@ -1,11 +1,29 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "web-application.internal.fullname" . }}
-  labels: {{- include "web-application.internal.labels" . | nindent 4 }}
+  name: {{ include "web-application.fullname" . }}
+  labels: {{- include "web-application.labels" . | nindent 4 }}
 spec:
   ports:
     - port: {{ .Values.port }}
       targetPort: {{ .Values.port }}
       protocol: TCP
-  selector: {{- include "web-application.internal.selectorLabels" . | nindent 4 }}
+  selector: {{- include "web-application.selectorLabels" . | nindent 4 }}
+{{- if .Values.prometheus.enabled }}
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "web-application.fullname" . }}-metrics
+  labels: {{- include "web-application.labels" . | nindent 4 }}
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/path: {{ .Values.prometheus.path }}
+    prometheus.io/port: {{ .Values.prometheus.port | default .Values.port | quote }}
+spec:
+  ports:
+    - port: {{ .Values.prometheus.port | default .Values.port }}
+      targetPort: {{ .Values.prometheus.port | default .Values.port }}
+      protocol: TCP
+  selector: {{- include "web-application.selectorLabels" . | nindent 4 }}
+{{- end }}

package/lib/init/template/helm/subcharts/web-application/templates/virtual-service.yaml

@@ -0,0 +1,36 @@
+{{- if include "web-application.internal.TENANT_HOST_PATTERN" . -}}
+apiVersion: networking.istio.io/v1beta1
+kind: VirtualService
+metadata:
+  name: {{ include "web-application.fullname" . }}-multitenancy
+  labels: {{- include "web-application.labels" . | nindent 4 }}
+spec:
+  gateways:
+    - {{ tpl (default .Values.expose.gateway .Values.expose.tenantGateway) $ }}
+  hosts:
+    - "*"
+  http:
+    - corsPolicy:
+        allowHeaders:
+          - Authorization
+          - Content-Type
+          - "*"
+        allowMethods:
+          - GET
+          - POST
+          - PUT
+          - DELETE
+          - PATCH
+        allowOrigins:
+          - regex: .*
+      match:
+        - uri:
+            regex: /.*
+          headers:
+            Host:
+              regex: {{ tpl (include "web-application.internal.TENANT_HOST_PATTERN" .) . }}
+      route:
+        - weight: 100
+          destination:
+            host: "{{ include "web-application.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
+{{- end }}