From cbb97c2c0fa2a85d970ccc01e3304b6d4bdff6fa Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Wed, 1 Feb 2023 11:16:33 +0100 Subject: [PATCH 01/11] single tenant app --- helm/Chart.lock | 12 ++++++ helm/Chart.yaml | 25 ++++++++++++ helm/values-dev-images.yaml | 12 ++++++ helm/values-dev.yaml | 24 ++++++++++++ helm/values.yaml | 52 +++++++++++++++++++++++++ srv/src/main/resources/application.yaml | 3 ++ values.yaml | 43 -------------------- 7 files changed, 128 insertions(+), 43 deletions(-) create mode 100644 helm/Chart.lock create mode 100644 helm/Chart.yaml create mode 100644 helm/values-dev-images.yaml create mode 100644 helm/values-dev.yaml create mode 100644 helm/values.yaml delete mode 100644 values.yaml diff --git a/helm/Chart.lock b/helm/Chart.lock new file mode 100644 index 00000000..00c8b3da --- /dev/null +++ b/helm/Chart.lock @@ -0,0 +1,12 @@ +dependencies: +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 0.8.0 +- name: content-deployment + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 0.3.1 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 0.1.1 +digest: sha256:c384559e093eb6710cfbe569ca1a393bb5a4d659535813e1a2aeaa4ac90e0446 +generated: "2023-01-25T17:27:53.61432+01:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml new file mode 100644 index 00000000..dea7c627 --- /dev/null +++ b/helm/Chart.yaml @@ -0,0 +1,25 @@ +apiVersion: v2 +name: cloud-sample-java +type: application +version: 0.1.0 +dependencies: + - name: web-application + version: '>=0.8.0' + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + alias: bookshop-srv + - name: web-application + version: '>=0.8.0' + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + alias: bookshop-app + - name: content-deployment + version: '>=0.3.1' + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + alias: bookshop-db + - name: service-instance + version: '>=0.0.1' + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + alias: bookshop-uaa + - name: service-instance + version: '>=0.0.1' + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + alias: bookshop-hdi-container \ No newline at end of file diff --git a/helm/values-dev-images.yaml b/helm/values-dev-images.yaml new file mode 100644 index 00000000..4e00d635 --- /dev/null +++ b/helm/values-dev-images.yaml @@ -0,0 +1,12 @@ +bookshop-srv: + image: + repository: dhlam/bookshop-srv + tag: 1.0.0 +bookshop-app: + image: + repository: dhlam/bookshop-app + tag: 1.0.0 +bookshop-db: + image: + repository: dhlam/bookshop-db + tag: 1.0.3 \ No newline at end of file diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml new file mode 100644 index 00000000..6d0ac0a9 --- /dev/null +++ b/helm/values-dev.yaml @@ -0,0 +1,24 @@ +bookshop-uaa: + parameters: + oauth2-configuration: + redirect-uris: + - https://*.c-81ddb81.stage.kyma.ondemand.com/login/callback + xsappname: bookshop-java-public + tenant-mode: dedicated + scopes: + - name: $XSAPPNAME.admin + description: admin + attributes: + - name: businessPartner + description: S/4 BusinessPartner ID assigned to the user + valueType: string + role-templates: + - name: admin + description: generated + scope-references: + - $XSAPPNAME.admin + attribute-references: + - businessPartner +bookshop-app: + env: + destinations: '[{"forwardAuthToken":true,"name":"backend","strictSSL":true,"url":"https://rel1-bookshop-srv-bookshop.c-81ddb81.stage.kyma.ondemand.com"}]' \ No newline at end of file diff --git a/helm/values.yaml b/helm/values.yaml new file mode 100644 index 00000000..637cc6c3 --- /dev/null +++ b/helm/values.yaml @@ -0,0 +1,52 @@ +bookshop-srv: + resources: + requests: + cpu: 1 + memory: 1G + limits: + memory: 1G + env: + SPRING_PROFILES_ACTIVE: cloud + bindings: + bookshop-hdi-container: + serviceInstanceFullname: bookshop-hdi-container + bookshop-uaa: + serviceInstanceFullname: bookshop-uaa + health: + liveness: + path: actuator/health + readiness: + path: actuator/health +bookshop-app: + resources: + limits: + memory: 256M + requests: + cpu: 1 + memory: 256M + bindings: + bookshop-uaa: + serviceInstanceFullname: bookshop-uaa + health: + liveness: + path: / + readiness: + path: / +bookshop-db: + resources: + limits: + memory: 1G + requests: + cpu: 250m + memory: 1G + bindings: + bookshop-hdi-container: + serviceInstanceFullname: bookshop-hdi-container +bookshop-hdi-container: + serviceOfferingName: hana + servicePlanName: hdi-shared + fullnameOverride: bookshop-hdi-container +bookshop-uaa: + serviceOfferingName: xsuaa + servicePlanName: broker + fullnameOverride: bookshop-uaa \ No newline at end of file diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index bac88b9e..6608824b 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -46,6 +46,9 @@ cds: kind: enterprise-messaging format: cloudevents subscribe-prefix: sap/S4HANAOD/java/ce/ + security: + authentication.mode: never + authorization.enabled: false --- spring: diff --git a/values.yaml b/values.yaml deleted file mode 100644 index 6439db80..00000000 --- a/values.yaml +++ /dev/null @@ -1,43 +0,0 @@ -global: - # >>> Execute the following command to receive the domain: - # $ kubectl get gateway -n kyma-system kyma-gateway -o jsonpath='{.spec.servers[0].hosts[0]}' - # Remove the leading "*." - domain: null - imagePullSecret: - name: container-registry -hana_deployer: - image: - # >>> Replace with your container registry - repository: /bookshop-hana-deployer - tag: latest - bindings: - hana: - fromSecret: bookshop-db -html5_apps_deployer: - cloudService: java.bookshop - backendDestinations: - bookshop-srv: - service: srv - image: - # >>> Replace with your container registry - repository: /bookshop-html5-deployer - tag: latest -srv: - bindings: - db: - fromSecret: bookshop-db - image: - # >>> Replace with your container registry - repository: /bookshop-srv - tag: latest - env: - SPRING_PROFILES_ACTIVE: cloud - resources: - limits: - cpu: 2000m - ephemeral-storage: 1G - memory: 2G - requests: - cpu: 1000m - ephemeral-storage: 1G - memory: 2G From 182474fe96ebdf5650099f5cce07212959133ed1 Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Fri, 3 Feb 2023 10:28:53 +0100 Subject: [PATCH 02/11] Current versions of helm charts --- helm/Chart.lock | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/helm/Chart.lock b/helm/Chart.lock index 00c8b3da..4eb707b8 100644 --- a/helm/Chart.lock +++ b/helm/Chart.lock @@ -1,12 +1,18 @@ dependencies: - name: web-application repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.8.0 + version: 0.9.0 +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 0.9.0 - name: content-deployment repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.3.1 + version: 0.4.0 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 0.3.0 - name: service-instance repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.1.1 -digest: sha256:c384559e093eb6710cfbe569ca1a393bb5a4d659535813e1a2aeaa4ac90e0446 -generated: "2023-01-25T17:27:53.61432+01:00" + version: 0.3.0 +digest: sha256:595c783f247c1fca13b9e093355cc2060553d78d4f4f280d5ebb7dc654f18ef2 +generated: "2023-02-02T10:08:12.298722+01:00" From 1e7e37e0099b36b4af8ccd1a8abfab1f06f37ccc Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Fri, 3 Feb 2023 10:35:43 +0100 Subject: [PATCH 03/11] removed local test settings --- srv/src/main/resources/application.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 6608824b..bac88b9e 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -46,9 +46,6 @@ cds: kind: enterprise-messaging format: cloudevents subscribe-prefix: sap/S4HANAOD/java/ce/ - security: - authentication.mode: never - authorization.enabled: false --- spring: From 53725e2f4c0b67a5583a8f859f93857d85141b16 Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Mon, 17 Jun 2024 19:08:12 +0200 Subject: [PATCH 04/11] Charts from unified runtime --- helm/multi-tenant/Chart.lock | 21 ++++ helm/multi-tenant/Chart.yaml | 31 +++++ .../charts/service-instance-1.5.0.tgz | Bin 0 -> 3021 bytes .../charts/web-application-1.15.0.tgz | Bin 0 -> 13736 bytes helm/multi-tenant/values.yaml | 109 ++++++++++++++++++ helm/single-tenant/Chart.lock | 18 +++ helm/single-tenant/Chart.yaml | 29 +++++ .../charts/content-deployment-1.6.0.tgz | Bin 0 -> 6226 bytes .../charts/service-instance-1.5.0.tgz | Bin 0 -> 3021 bytes .../charts/web-application-1.15.0.tgz | Bin 0 -> 13736 bytes helm/single-tenant/values.yaml | 70 +++++++++++ xs-security-mt.json | 2 +- xs-security.json | 2 +- 13 files changed, 280 insertions(+), 2 deletions(-) create mode 100644 helm/multi-tenant/Chart.lock create mode 100644 helm/multi-tenant/Chart.yaml create mode 100644 helm/multi-tenant/charts/service-instance-1.5.0.tgz create mode 100644 helm/multi-tenant/charts/web-application-1.15.0.tgz create mode 100644 helm/multi-tenant/values.yaml create mode 100644 helm/single-tenant/Chart.lock create mode 100644 helm/single-tenant/Chart.yaml create mode 100644 helm/single-tenant/charts/content-deployment-1.6.0.tgz create mode 100644 helm/single-tenant/charts/service-instance-1.5.0.tgz create mode 100644 helm/single-tenant/charts/web-application-1.15.0.tgz create mode 100644 helm/single-tenant/values.yaml diff --git a/helm/multi-tenant/Chart.lock b/helm/multi-tenant/Chart.lock new file mode 100644 index 00000000..88befa07 --- /dev/null +++ b/helm/multi-tenant/Chart.lock @@ -0,0 +1,21 @@ +dependencies: +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.15.0 +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.15.0 +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.15.0 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.5.0 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.5.0 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.5.0 +digest: sha256:f472cd80725ccc634a6b708e0988592d106befb2a556e6132c4a52dd83511e62 +generated: "2024-06-14T16:17:25.549919+02:00" diff --git a/helm/multi-tenant/Chart.yaml b/helm/multi-tenant/Chart.yaml new file mode 100644 index 00000000..21ec8758 --- /dev/null +++ b/helm/multi-tenant/Chart.yaml @@ -0,0 +1,31 @@ +apiVersion: v2 +name: bookshop +description: A simple CAP project. +type: application +version: 1.0.0-SNAPSHOT +appVersion: 1.0.0-SNAPSHOT +dependencies: + - name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: srv + - name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: approuter + - name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: sidecar + - name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: xsuaa + - name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: saas-registry + - name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: service-manager \ No newline at end of file diff --git a/helm/multi-tenant/charts/service-instance-1.5.0.tgz b/helm/multi-tenant/charts/service-instance-1.5.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..c6a48eaea95f50abe4c7c987e8ec88b094ccc0e5 GIT binary patch literal 3021 zcmV;;3o`T{iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PH*KbK5rZ`K-TUM{%c4ejz14Vox>G4{3gvxn6szC&{#P*U7~Y zxs*_o00V$dRN4Rg4IX@oq$oRanmOY`tN{DQVs{BHC5lTLphuZhgatTxz9d5VE0V+y zKGm2`r_+<;WAk@9oi_hYkB*)`I5<8ze0q3za(Hs|V0v(Te0=->rk_lLo{>pK#DnRr zc{P>$N(M>kuP7wtYzCKyqYz~vXsXQrpTXZTP9V@80TCAv2qcQK1vsyP+-oFo26L5q zxjXR`1yNj#7)fvjO)ncso{0eEY~;aGsZ`D;lLb}FZ0;-0W9dthPBKO#ilHYmrf7nb z4I*ll;tWWd#xx*WC^l3 ze;4B+{6^y#<_MX@&>UzaA@B&)65-sp>EIx7~frk5kOk=)E zkSWjy-XA?Qe}B0|A!vv*h&UgO8oY=E!hky%6JRXQD2ro_ehy2FQxp(oEYRm0_Nk9P zocpgZMk3M3Tq*>?q8|>dK(a4pn_xjlx{P5Y@Ucoq|8scA${%ac=*7zk7laHa@lxp4)?cuAN7naxQM z@QkT%rH;iRGDS%&^_B><8d)AcI=1k^89WvIlIqZip%!JX(q}<{Qa&%Kyf(~dPKcUZ z#%5ir0cE)%HEH~)P%sj=7|c^Bm8SVKl}hhHkV(Z8P-G#&W}bPjbVHFRg(d+{DTdnK z=MLrv%0kK(=ehYPGZZdx1p$d;4B=dJIM>oyj&I09&PERbz%#C4f6a-|!oB86p`-+v zr70K6P%Mn7h2#;CFr?ZoNvyXlqKizJGz2LTBteBj`tZV;Ep|FPf*4kyoorbH+jWHAw~zFJbUT3z632A3rMO4a#8a&}g#1nX<9$WPfE1w(}rtgD&; zQeg|WsHhv{h2V)cN?v7L6jXf5Cm|2yL=kx*CzSnxf$~D4h*v2oCLxtd(0QiNs~kB` zVvq@(JPa|S3_W*bQFzEMso+fO>|GK;$vj5sWsqk!xl}+ z${`fRntV0?JI92+IgUfN2_378wC9xpfHyd1zr zWQ$~dpcAF$HqGFmN5uKe#JeU)eq8M6^3P(+OhB*B+Rd#@_t-keYgl`6^U$Z`hk)4&Xr$ngG|pgy|le;F(>A-)d9x8~7b{~sJ393D05 z|C58`)BF1WF2>p%lkuM2@9_-AI+@HS6TS1E^8zjwlTeUIdDGL0gM8u;X_zAodWipk z^ICeH$9z6X2xTpfm-Eoi`I-rz>lB^O>M%?NYWBYuXMNmKwmXFCa$bYm*!|W~EDNAA zV~kx`av*7SVO`R-F{?ILHP6FIi8yhvPwJ4ZN*1dhJ-T3ApqDWnT#eQyoaGSL6(y_B zKEp(+VRQ(l%OJLBuBJrk$gBZ=pL*XB@6WgHujjvgJZ_b*`Fu7^#tp2`E@zuB4HC8A z2|us2g=_C3X@T_FrR;w4942rNe!uLk(o~DDVfJO8{I5u!@;8^vFdRILS&RuU{ zYvO@nd9eoGkt1s`)#r*%sA1yWP|O0YwT@_oWSeJx1Lgu(<4%aTJz@;7T3wKBP_XTE zHple<)jmDb&eisn&DrY#A*XVgFzhT=5t;{)s@SOath_Jl1MjWthWqR`2N^eRNV?D7 zpc9p+tFvKlIrblKciW+UF?i=&f=~TM=zqZo1KdBq6B}4!<#1$J^b>}g7cvF<4wXcKGq@hRy?O=a?bIyD46ffcFbC9g z8#ul7U32u*dmDsruxkbG;CgTabC*)BIkwb`8@z_rkDpe^!O+7Xw?p+q^whgOv8?kg z$|nq^x2-ou_TTIKH!NS%*m(b=FiB&gP)^?2?i=Z=^meUaTl>FGoBdy>)8nK2_djx(ckke# z(xnCdul8L}^*a9%_;3YEWGsM_BlD9cud^tkA7Si`!O=t(>YpPc_j7?nA&~q_y?m`f`D+ntb^wh< zqr$|^w@cs}4Y*vI!!>n(KB)fBW0zlU7K zZ>0B)9Jk^1DD@Yxqh0MfQx#{`p}}=kXh$^;>%8AW#bl20PEKp^%0SUHWp(rHZ`Y#^ zS0FHrNq{i^zcGy8jdzb3JV`jSGRs|Lwis6ECB}&_mlJ`ugKh@vb?E`G+$>zd`;04N z^c=%zZonxE;w&6uCf_PD1Vdtsf#Tw4C#;{_K!*ft%4cbsTl4yQMAFo+w~ZA&^jf72 zl!{7yUi8|@aRWOyRq$G+Ob8;J>) z(dqs7A9pfLWsu+a>oSTbR24CxSQu}#(v~Mw5Vmj?&lA`)*RFOecWJQ!V27S5pl*}*75MM9#;Y?QaZ4ofh#Xty8IK*3mtt1;}k8@*ahXA|knR*&1M z=hey{Tmhpj)JftPs!s@9loqeNzx3;G&@4)$8M}D6Q~X~fiHFd6)Fp|_9s1#^rO*52 z4hAj5{$5Sdny>iP7cCa7-hsVdZ$+pT*R4#-cPkdC+ONG{8{2gv>mPIuS&re(TG4Kh^a=a-J< zHyPXWe{s-mTmWp#|A(g=`TyzZ;eGzUi*du`m&fN?_Pb$<^7~R$Pi84TavYMP2GH3a zigrowm4}d){8s<0wDQ!|vYw}q#@C~pNckGHT?BSF&RX!kPeLoKwvlNI-8t@n)Y}c( zN4RWzb>YAK%Ckze0=8QYtoUIikLFYLZqX8PuL3*!zKz0FadB@>S literal 0 HcmV?d00001 diff --git a/helm/multi-tenant/charts/web-application-1.15.0.tgz b/helm/multi-tenant/charts/web-application-1.15.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..3a3014a9c06957df00a926c5a5cd70708b89fac1 GIT binary patch literal 13736 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 S`Tqd`0RR8$o8l+{r~v@qcEExF literal 0 HcmV?d00001 diff --git a/helm/multi-tenant/values.yaml b/helm/multi-tenant/values.yaml new file mode 100644 index 00000000..679b5261 --- /dev/null +++ b/helm/multi-tenant/values.yaml @@ -0,0 +1,109 @@ +global: + domain: c-865b338.stage.kyma.ondemand.com # e.g. c-865b338.stage.kyma.ondemand.com + imagePullSecret: + name: image-pull-secret # e.g. image-pull-secret + image: + registry: cdsjava.common.repositories.cloud.sap # e.g. cdsjava.common.repositories.cloud.sap +srv: + bindings: + auth: + serviceInstanceName: xsuaa + service-manager: + serviceInstanceName: service-manager + saas-registry: + serviceInstanceName: saas-registry + image: + repository: i541520/bookshop/bookshop-srv # e.g. bookshop/bookshop-srv + tag: latest # e.g. latest + env: + SPRING_PROFILES_ACTIVE: cloud + CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-" + CDS_MULTITENANCY_APPUI_URL: https://{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.{{ .Values.global.domain }} + CDS_MULTITENANCY_MTXS_ENABLED: "true" + CDS_MULTITENANCY_SIDECAR_URL: https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.{{ .Values.global.domain }} + resources: + limits: + ephemeral-storage: 1G + memory: 1G + requests: + ephemeral-storage: 1G + cpu: 1000m + memory: 1G + health: + liveness: + path: /actuator/health + readiness: + path: /actuator/health +approuter: + bindings: + auth: + serviceInstanceName: xsuaa + image: + repository: i541520/bookshop/bookshop-approuter # e.g. bookshop/bookshop-approuter + tag: latest-1 # e.g. latest + env: + TENANT_HOST_PATTERN: "^(.*)-{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.{{ .Values.global.domain }}" + destinations: '[{"name":"backend","url":"https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.{{ .Values.global.domain }}","forwardAuthToken":true}]' + resources: + limits: + ephemeral-storage: 1G + memory: 500M + requests: + ephemeral-storage: 1G + cpu: 500m + memory: 500M + health: + liveness: + path: / + readiness: + path: / +xsuaa: + serviceOfferingName: xsuaa + servicePlanName: application + parameters: + xsappname: bookshop-mtx + oauth2-configuration: + redirect-uris: + - https://*.{{ .Values.global.domain}}/** +service-manager: + serviceOfferingName: service-manager + servicePlanName: container +saas-registry: + serviceOfferingName: saas-registry + servicePlanName: application + parameters: + xsappname: bookshop-mtx + appName: bookshop-mtx + displayName: bookshop-mtx + description: A simple MTX CAP project. + category: "CAP Application" + appUrls: + getDependencies: "https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.{{ .Values.global.domain }}/mt/v1.0/subscriptions/dependencies" + onSubscription: "https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.{{ .Values.global.domain }}/mt/v1.0/subscriptions/tenants/{tenantId}" + onSubscriptionAsync: true + onUnSubscriptionAsync: true + onUpdateDependenciesAsync: true + callbackTimeoutMillis: 300000 +sidecar: + bindings: + auth: + serviceInstanceName: xsuaa + service-manager: + serviceInstanceName: service-manager + image: + repository: i541520/bookshop/bookshop-sidecar # e.g. bookshop/bookshop-sidecar + tag: latest # e.g. latest + resources: + limits: + ephemeral-storage: 1G + memory: 500M + requests: + ephemeral-storage: 1G + cpu: 500m + memory: 500M + health: + liveness: + path: /health + readiness: + path: /health + startupTimeoutSeconds: 120 \ No newline at end of file diff --git a/helm/single-tenant/Chart.lock b/helm/single-tenant/Chart.lock new file mode 100644 index 00000000..44e6c84c --- /dev/null +++ b/helm/single-tenant/Chart.lock @@ -0,0 +1,18 @@ +dependencies: +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.15.0 +- name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.15.0 +- name: content-deployment + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.6.0 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.5.0 +- name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: 1.5.0 +digest: sha256:a04531d2fa246628d99c25c5305b9a4394f2a0701db15f87c6e8f50773dd9b90 +generated: "2024-06-14T16:21:23.40273+02:00" diff --git a/helm/single-tenant/Chart.yaml b/helm/single-tenant/Chart.yaml new file mode 100644 index 00000000..00d6ab73 --- /dev/null +++ b/helm/single-tenant/Chart.yaml @@ -0,0 +1,29 @@ +# +# This file is generated by "cds add helm" +apiVersion: v2 +name: bookshop +description: A simple CAP project. +type: application +version: 1.0.0-SNAPSHOT +appVersion: 1.0.0-SNAPSHOT +dependencies: + - name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: srv + - name: web-application + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: approuter + - name: content-deployment + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: hdi-deployer + - name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: xsuaa + - name: service-instance + repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ + version: ">0.0.0" + alias: bookshop-hdi \ No newline at end of file diff --git a/helm/single-tenant/charts/content-deployment-1.6.0.tgz b/helm/single-tenant/charts/content-deployment-1.6.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..e259ebb6f0a75d53abea4ba7a8b102aa69171ca1 GIT binary patch literal 6226 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 literal 0 HcmV?d00001 diff --git a/helm/single-tenant/charts/service-instance-1.5.0.tgz b/helm/single-tenant/charts/service-instance-1.5.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..c6a48eaea95f50abe4c7c987e8ec88b094ccc0e5 GIT binary patch literal 3021 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 literal 0 HcmV?d00001 diff --git a/helm/single-tenant/charts/web-application-1.15.0.tgz b/helm/single-tenant/charts/web-application-1.15.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..3a3014a9c06957df00a926c5a5cd70708b89fac1 GIT binary patch literal 13736 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 S`Tqd`0RR8$o8l+{r~v@qcEExF literal 0 HcmV?d00001 diff --git a/helm/single-tenant/values.yaml b/helm/single-tenant/values.yaml new file mode 100644 index 00000000..189dcd22 --- /dev/null +++ b/helm/single-tenant/values.yaml @@ -0,0 +1,70 @@ +global: + domain: c-865b338.stage.kyma.ondemand.com # e.g. c-865b338.stage.kyma.ondemand.com + imagePullSecret: + name: image-pull-secret # e.g. image-pull-secret + image: + registry: cdsjava.common.repositories.cloud.sap # e.g. cdsjava.common.repositories.cloud.sap +srv: + bindings: + auth: + serviceInstanceName: xsuaa + db: + serviceInstanceName: bookshop-hdi + image: + repository: i541520/bookshop/bookshop-srv # e.g. bookshop/bookshop-srv + tag: latest # e.g. latest + env: + SPRING_PROFILES_ACTIVE: cloud + resources: + limits: + ephemeral-storage: 1G + memory: 1G + requests: + ephemeral-storage: 1G + cpu: 1000m + memory: 1G + health: + liveness: + path: /actuator/health + readiness: + path: /actuator/health +approuter: + bindings: + auth: + serviceInstanceName: xsuaa + env: + destinations: '[{"name":"backend","url":"https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.{{ .Values.global.domain }}","forwardAuthToken":true,"strictSSL": true}]' + image: + repository: i541520/bookshop/bookshop-approuter # e.g. bookshop/bookshop-approuter + tag: latest-1 # e.g. latest + resources: + limits: + ephemeral-storage: 1G + memory: 500M + requests: + ephemeral-storage: 1G + cpu: 500m + memory: 500M + health: + liveness: + path: / + readiness: + path: / +hdi-deployer: + image: + repository: i541520/bookshop/bookshop-hdi-deployer # bookshop/hdi-deployer + tag: latest-1 # latest + bindings: + bookshop-hdi: + serviceInstanceName: bookshop-hdi +xsuaa: + serviceOfferingName: xsuaa + servicePlanName: broker + parameters: + xsappname: bookshop + oauth2-configuration: + redirect-uris: + - https://*.{{ .Values.global.domain}}/** +bookshop-hdi: + serviceOfferingName: hana + servicePlanName: hdi-shared \ No newline at end of file diff --git a/xs-security-mt.json b/xs-security-mt.json index 984ce269..c1cd78c6 100644 --- a/xs-security-mt.json +++ b/xs-security-mt.json @@ -1,5 +1,5 @@ { - "xsappname": "bookshop-java-public", + "xsappname": "bookshop-mtx", "tenant-mode": "shared", "scopes": [ { diff --git a/xs-security.json b/xs-security.json index 03d9b1d0..1065f558 100644 --- a/xs-security.json +++ b/xs-security.json @@ -1,5 +1,5 @@ { - "xsappname": "bookshop-java-public", + "xsappname": "bookshop", "tenant-mode": "dedicated", "scopes": [ { From e96e80d2be8bc93b9a7998f29fff170e7a833a62 Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Mon, 17 Jun 2024 19:41:48 +0200 Subject: [PATCH 05/11] Adapted readme for approach without cds add helm --- README.md | 173 +++++---------------------------- helm/multi-tenant/values.yaml | 6 +- helm/single-tenant/values.yaml | 2 +- 3 files changed, 31 insertions(+), 150 deletions(-) diff --git a/README.md b/README.md index d475cd09..9bb82870 100644 --- a/README.md +++ b/README.md @@ -260,86 +260,11 @@ Before you can access the UI using the (tenant-specific) URL to the bookshop(-mt - Logged into Kyma Runtime (with `kubectl` CLI), Cloud Foundry space (with `cf` CLI) and Container Registry (with `docker login`) - `@sap/cds-dk` >= 6.6.0 -### Add Deployment Files - -CAP tooling provides you a Helm chart for deployment to Kyma. - -For single tenant deployment, replace the `requires` section in _`.cdsrc.json`_ with: - -``` - "requires": { - "auth": { - "kind": "xsuaa" - }, - "approuter": { - "kind": "cloudfoundry" - }, - "db": { - "kind": "hana-cloud" - } - }, -``` - -**In addition** remove `"profile": "with-mtx-sidecar"` from `.cdsrc.json` and delete the `mtx` folder in root. - -For multi tenant deployment, replace the `requires` section in _`.cdsrc.json`_ with: - -``` - "requires": { - "multitenancy": true, - "extensibility": true, - "toggles": true, - "auth": { - "kind": "xsuaa" - }, - "approuter": { - "kind": "cloudfoundry" - } - }, -``` - -Add the CAP Helm chart with the required features to this project: - -```bash -cds add helm -``` - -#### Use API_BUSSINESS_PARTNER Remote Service (optional, single tenant only) - -You can try the `API_BUSINESS_PARTNER` service with a real S/4HANA system with the following configuration: - -1. Create either an on-premise or cloud destination in your subaccount. - -2. Add configuration required for the destination service by executing the following command. - - ```bash - cds add destination - ``` - -3. Set the profiles `cloud` and `destination` active in your `values.yaml` file: - - ```yaml - srv: - ... - env: - SPRING_PROFILES_ACTIVE: cloud,destination - ``` - -4. For on-premise only: Add the connectivity service to your Helm chart: - - ```bash - cds add connectivity - ``` - - Note: `cds add helm` will not add configuration required to create a Connectivity Service Instance. This Service Instance should be created by the Kyma Cluster Administrator. For more information regarding configuration of Connectivity Instance, please check the [documentation](https://cap.cloud.sap/docs/guides/deployment/deploy-to-kyma#connectivity-service). - -*See also: [API_BUSINESS_PARTNER Remote Service and Spring Profiles](#api_business_partner-remote-service-and-spring-profiles)* - ### Prepare Kubernetes Namespace #### Create container registry secret -Create a secret `container-registry` with credentials to access the container registry: +Create a secret `image-pull-secret` with credentials to access the container registry: ``` bash ./scripts/create-container-registry-secret.sh @@ -359,7 +284,7 @@ bash ./scripts/create-db-secret.sh bookshop-db It will create a HDI container `bookshop-db` instance on your currently targeted Cloud Foundry space and a secret `bookshop-db` with the credentials in your current Kubernetes namespace. -Make the following changes to your _`chart/values.yaml`_. +Make the following changes to your _`helm/single-tenant/values.yaml`_. ```diff srv: @@ -381,7 +306,7 @@ hana-deployer: - servicePlanName: hdi-shared ``` -Make the following changes to your _`chart/Chart.yaml`_. +Make the following changes to your _`helm/single-tenant/Chart.yaml`_. ```diff dependencies: @@ -439,7 +364,7 @@ dependencies: cds build --production ``` -**Build image for CAP service:** +**Build & publish container images for CAP service:** ```bash mvn clean package -DskipTests=true @@ -450,116 +375,72 @@ pack build $YOUR_CONTAINER_REGISTRY/bookshop-srv \ --path srv/target/*-exec.jar \ --buildpack gcr.io/paketo-buildpacks/sap-machine \ --buildpack gcr.io/paketo-buildpacks/java \ - --builder paketobuildpacks/builder-jammy-base \ + --builder paketobuildpacks/builder:base \ --env SPRING_PROFILES_ACTIVE=cloud \ - --env BP_JVM_VERSION=17 + --env BP_JVM_VERSION=17 \ + --publish ``` (Replace `$YOUR_CONTAINER_REGISTRY` with the full-qualified hostname of your container registry) -**Build Approuter Image:** +**Build & publish Approuter Image:** ```bash pack build $YOUR_CONTAINER_REGISTRY/bookshop-approuter \ --path app \ - --buildpack gcr.io/paketo-buildpacks/nodejs \ - --builder paketobuildpacks/builder-jammy-base \ - --env BP_NODE_RUN_SCRIPTS="" + --builder paketobuildpacks/builder:base \ + --env BP_NODE_RUN_SCRIPTS="" \ + --publish ``` -**Build database deployer image (single tenant only):** +**Build & publish database deployer image (single tenant only):** ```bash -pack build $YOUR_CONTAINER_REGISTRY/bookshop-hana-deployer \ +pack build $YOUR_CONTAINER_REGISTRY/bookshop-hdi-deployer \ --path db \ - --buildpack gcr.io/paketo-buildpacks/nodejs \ - --builder paketobuildpacks/builder-jammy-base \ - --env BP_NODE_RUN_SCRIPTS="" + --builder paketobuildpacks/builder:base \ + --env BP_NODE_RUN_SCRIPTS="" \ + --publish ``` -**Build sidecar image (multi tenant only):** +**Build & publish sidecar image (multi tenant only):** ```bash pack build $YOUR_CONTAINER_REGISTRY/bookshop-sidecar \ --path mtx/sidecar/gen \ - --buildpack gcr.io/paketo-buildpacks/nodejs \ - --builder paketobuildpacks/builder-jammy-base \ - --env BP_NODE_RUN_SCRIPTS="" -``` - -### Push container images - -You can push all the container images to your container registry, using: - -```bash -docker push $YOUR_CONTAINER_REGISTRY/bookshop-srv - -docker push $YOUR_CONTAINER_REGISTRY/bookshop-approuter + --builder paketobuildpacks/builder:base \ + --env BP_NODE_RUN_SCRIPTS="" \ + --publish ``` -#### Single Tenant - -```bash -docker push $YOUR_CONTAINER_REGISTRY/bookshop-hana-deployer -``` - -#### Multi Tenant - -```bash -docker push $YOUR_CONTAINER_REGISTRY/bookshop-sidecar -``` ### Configuration -Make the following changes in the _`chart/values.yaml`_ file. +Complete the configuration in the _`helm/single-tenant/values.yaml`_ and/or _`helm/multi-tenant/values.yaml`_ files: 1. Change value of `global.domain` key to your cluster domain. +2. Change value of `global.image.registry` to the URL of your container registry. +3. Change value of `global.imagePullSecret.name` to the image registry secret created in [Create container registry secret](#create-container-registry-secret) step if you haven't used the name `image-pull-secret`. -2. Replace `` in `xsuaa.parameters.oauth2-configuration.redirect-uris` with your cluster domain. - -3. Replace `` with your container registry. - -4. Make the following change to add backend destinations required by Approuter. - -```diff -- backendDestinations: {} -+ backendDestinations: -+ backend: -+ service: srv -+ mtx-api: -+ service: srv -``` - -5. Add your image registry secret created in [Create container registry secret](#create-container-registry-secret) step. - -```diff -global: - domain: null -- imagePullSecret: {} -+ imagePullSecret: -+ name: container-registry -``` - -6. If the application is deployed multiple times in the same cluster, make sure to adapt the values of `xsappname` and `appName` under `saasRegistryParameters` in `values/Chart.yaml` ### Deployment -Deploy the helm chart using the following command: +Deploy the helm chart using the following command from the project root directory: #### Single Tenant ```bash -helm install bookshop ./chart --set-file xsuaa.jsonParameters=xs-security.json +helm upgrade --install --namespace= ./helm/single-tenant --set-file xsuaa.jsonParameters=xs-security.json ``` Before you can access the UI you should make sure to [Setup Authorizations in SAP Business Technology Platform](#setup-authorizations-in-sap-business-technology-platform). -Click on the approuter url logged by the `helm install` to access the UI. +URL to access the UI: `https://-approuter-.` #### Multi Tenant ```bash -helm install bookshop ./chart --set-file xsuaa.jsonParameters=xs-security-mt.json +helm upgrade --install --namespace= ./helm/multi-tenant --set-file xsuaa.jsonParameters=xs-security-mt.json ``` In case of multi tenant, you'll have to subscribe to the application from a different subaccount. You can follow the steps mentioned [here](https://cap.cloud.sap/docs/guides/deployment/as-saas#subscribe) to access the application. diff --git a/helm/multi-tenant/values.yaml b/helm/multi-tenant/values.yaml index 679b5261..46ca83b0 100644 --- a/helm/multi-tenant/values.yaml +++ b/helm/multi-tenant/values.yaml @@ -1,9 +1,9 @@ global: - domain: c-865b338.stage.kyma.ondemand.com # e.g. c-865b338.stage.kyma.ondemand.com + domain: # e.g. c-865b338.stage.kyma.ondemand.com imagePullSecret: name: image-pull-secret # e.g. image-pull-secret image: - registry: cdsjava.common.repositories.cloud.sap # e.g. cdsjava.common.repositories.cloud.sap + registry: # e.g. cdsjava.common.repositories.cloud.sap srv: bindings: auth: @@ -64,7 +64,7 @@ xsuaa: xsappname: bookshop-mtx oauth2-configuration: redirect-uris: - - https://*.{{ .Values.global.domain}}/** + - "https://*.{{ .Values.global.domain}}/**" service-manager: serviceOfferingName: service-manager servicePlanName: container diff --git a/helm/single-tenant/values.yaml b/helm/single-tenant/values.yaml index 189dcd22..2424c881 100644 --- a/helm/single-tenant/values.yaml +++ b/helm/single-tenant/values.yaml @@ -64,7 +64,7 @@ xsuaa: xsappname: bookshop oauth2-configuration: redirect-uris: - - https://*.{{ .Values.global.domain}}/** + - "https://*.{{ .Values.global.domain}}/**" bookshop-hdi: serviceOfferingName: hana servicePlanName: hdi-shared \ No newline at end of file From 2546568c79b1e393a45021f432b6c68482c6a370 Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Mon, 17 Jun 2024 20:16:11 +0200 Subject: [PATCH 06/11] Restructured values.yaml files and readme --- README.md | 53 +++++++++++++++++++++++++++++++-- helm/multi-tenant/values.yaml | 54 +++++++++++++++++----------------- helm/single-tenant/values.yaml | 14 ++++----- 3 files changed, 84 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 9bb82870..7f72f11b 100644 --- a/README.md +++ b/README.md @@ -416,18 +416,65 @@ pack build $YOUR_CONTAINER_REGISTRY/bookshop-sidecar \ ### Configuration -Complete the configuration in the _`helm/single-tenant/values.yaml`_ and/or _`helm/multi-tenant/values.yaml`_ files: +Complete the configuration in the +- _`helm/single-tenant/values.yaml`_ file if you're going for a **single-tenant deployment**, or the +- _`helm/multi-tenant/values.yaml`_ file if you're going for a **multi-tenant deployment** +#### For both single- and multi-tenant deployment 1. Change value of `global.domain` key to your cluster domain. 2. Change value of `global.image.registry` to the URL of your container registry. 3. Change value of `global.imagePullSecret.name` to the image registry secret created in [Create container registry secret](#create-container-registry-secret) step if you haven't used the name `image-pull-secret`. +```yaml +global: + domain: # e.g. c-865b338.stage.kyma.ondemand.com + imagePullSecret: + name: image-pull-secret # e.g. image-pull-secret + image: + registry: # e.g. cdsjava.common.repositories.cloud.sap +``` + +4. Set `srv.image.repository` and `srv.image.tag` to the image path and tag you used in the `pack build` command for the `bookshop-srv`. +```yaml +srv: + image: + repository: # e.g. bookshop/bookshop-srv + tag: latest # e.g. latest +``` + +5. Set `approuter.image.repository` and `approuter.image.tag` to the image path and tag you used in the `pack build` command for the `bookshop-approuter`. +```yaml +approuter: + image: + repository: # e.g. bookshop/bookshop-approuter + tag: # e.g. latest +``` + +#### For single-tenant deployment only + +6. In the `helm/single-tenant/values.yaml` file, set `hdi-deployer.image.repository` and `hdi-deployer.image.tag` to the image path and tag you used in the `pack build` command for the `bookshop-hdi-deployer`. +```yaml +hdi-deployer: + image: + repository: # e.g. bookshop/bookshop-hdi-deployer + tag: # e.g. latest +``` + +#### For multi-tenant deployment only + +6. In the `helm/multi-tenant/values.yaml` file, set `sidecar.image.repository` and `sidecar.image.tag` to the image path and tag you used in the `pack build` command for the `bookshop-sidecar`. +```yaml +sidecar: + image: + repository: # e.g. bookshop/bookshop-sidecar + tag: # e.g. latest +``` ### Deployment Deploy the helm chart using the following command from the project root directory: -#### Single Tenant +#### Single-Tenant ```bash helm upgrade --install --namespace= ./helm/single-tenant --set-file xsuaa.jsonParameters=xs-security.json @@ -437,7 +484,7 @@ Before you can access the UI you should make sure to [Setup Authorizations in SA URL to access the UI: `https://-approuter-.` -#### Multi Tenant +#### Multi-Tenant ```bash helm upgrade --install --namespace= ./helm/multi-tenant --set-file xsuaa.jsonParameters=xs-security-mt.json diff --git a/helm/multi-tenant/values.yaml b/helm/multi-tenant/values.yaml index 46ca83b0..3d340a0c 100644 --- a/helm/multi-tenant/values.yaml +++ b/helm/multi-tenant/values.yaml @@ -1,5 +1,5 @@ global: - domain: # e.g. c-865b338.stage.kyma.ondemand.com + domain: # e.g. c-123b456.stage.kyma.ondemand.com imagePullSecret: name: image-pull-secret # e.g. image-pull-secret image: @@ -13,7 +13,7 @@ srv: saas-registry: serviceInstanceName: saas-registry image: - repository: i541520/bookshop/bookshop-srv # e.g. bookshop/bookshop-srv + repository: # e.g. bookshop/bookshop-srv tag: latest # e.g. latest env: SPRING_PROFILES_ACTIVE: cloud @@ -39,8 +39,8 @@ approuter: auth: serviceInstanceName: xsuaa image: - repository: i541520/bookshop/bookshop-approuter # e.g. bookshop/bookshop-approuter - tag: latest-1 # e.g. latest + repository: # e.g. bookshop/bookshop-approuter + tag: # e.g. latest env: TENANT_HOST_PATTERN: "^(.*)-{{ .Release.Name }}-approuter-{{ .Release.Namespace }}.{{ .Values.global.domain }}" destinations: '[{"name":"backend","url":"https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.{{ .Values.global.domain }}","forwardAuthToken":true}]' @@ -57,6 +57,29 @@ approuter: path: / readiness: path: / +sidecar: + bindings: + auth: + serviceInstanceName: xsuaa + service-manager: + serviceInstanceName: service-manager + image: + repository: # e.g. bookshop/bookshop-sidecar + tag: # e.g. latest + resources: + limits: + ephemeral-storage: 1G + memory: 500M + requests: + ephemeral-storage: 1G + cpu: 500m + memory: 500M + health: + liveness: + path: /health + readiness: + path: /health + startupTimeoutSeconds: 120 xsuaa: serviceOfferingName: xsuaa servicePlanName: application @@ -84,26 +107,3 @@ saas-registry: onUnSubscriptionAsync: true onUpdateDependenciesAsync: true callbackTimeoutMillis: 300000 -sidecar: - bindings: - auth: - serviceInstanceName: xsuaa - service-manager: - serviceInstanceName: service-manager - image: - repository: i541520/bookshop/bookshop-sidecar # e.g. bookshop/bookshop-sidecar - tag: latest # e.g. latest - resources: - limits: - ephemeral-storage: 1G - memory: 500M - requests: - ephemeral-storage: 1G - cpu: 500m - memory: 500M - health: - liveness: - path: /health - readiness: - path: /health - startupTimeoutSeconds: 120 \ No newline at end of file diff --git a/helm/single-tenant/values.yaml b/helm/single-tenant/values.yaml index 2424c881..fc44d9f3 100644 --- a/helm/single-tenant/values.yaml +++ b/helm/single-tenant/values.yaml @@ -1,9 +1,9 @@ global: - domain: c-865b338.stage.kyma.ondemand.com # e.g. c-865b338.stage.kyma.ondemand.com + domain: # e.g. c-123b456.stage.kyma.ondemand.com imagePullSecret: - name: image-pull-secret # e.g. image-pull-secret + name: # e.g. image-pull-secret image: - registry: cdsjava.common.repositories.cloud.sap # e.g. cdsjava.common.repositories.cloud.sap + registry: # e.g. cdsjava.common.repositories.cloud.sap srv: bindings: auth: @@ -35,8 +35,8 @@ approuter: env: destinations: '[{"name":"backend","url":"https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.{{ .Values.global.domain }}","forwardAuthToken":true,"strictSSL": true}]' image: - repository: i541520/bookshop/bookshop-approuter # e.g. bookshop/bookshop-approuter - tag: latest-1 # e.g. latest + repository: # e.g. bookshop/bookshop-approuter + tag: # e.g. latest resources: limits: ephemeral-storage: 1G @@ -52,8 +52,8 @@ approuter: path: / hdi-deployer: image: - repository: i541520/bookshop/bookshop-hdi-deployer # bookshop/hdi-deployer - tag: latest-1 # latest + repository: # e.g. bookshop/hdi-deployer + tag: # e.g. latest bindings: bookshop-hdi: serviceInstanceName: bookshop-hdi From 4be7328dfc0c40caab834be0a4de3fe5df012200 Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Mon, 17 Jun 2024 20:24:17 +0200 Subject: [PATCH 07/11] Fixed readme --- README.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7f72f11b..89bde987 100644 --- a/README.md +++ b/README.md @@ -279,10 +279,10 @@ This step is only required if you're using a BTP Trial account. If you're using ##### Single Tenant ``` -bash ./scripts/create-db-secret.sh bookshop-db +bash ./scripts/create-db-secret.sh bookshop-hdi ``` -It will create a HDI container `bookshop-db` instance on your currently targeted Cloud Foundry space and a secret `bookshop-db` with the credentials in your current Kubernetes namespace. +It will create a HDI container `bookshop-hdi` instance on your currently targeted Cloud Foundry space and a secret `bookshop-hdi` with the credentials in your current Kubernetes namespace. Make the following changes to your _`helm/single-tenant/values.yaml`_. @@ -294,14 +294,14 @@ srv: + fromSecret: bookshop-db ... -hana-deployer: +hdi-deployer: bindings: - hana: -- serviceInstanceName: hana + bookshop-hdi: +- serviceInstanceName: bookshop-hdi + fromSecret: bookshop-db ... -- hana: +- bookshop-hdi: - serviceOfferingName: hana - servicePlanName: hdi-shared ``` @@ -312,8 +312,9 @@ Make the following changes to your _`helm/single-tenant/Chart.yaml`_. dependencies: ... - - name: service-instance -- alias: hana +- repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: ">0.0.0" +- alias: bookshop-hdi ... ``` @@ -325,7 +326,7 @@ bash ./scripts/create-sm-secret.sh bookshop-sm It will create a Service Manager `bookshop-sm` instance on your currently targeted Cloud Foundry space and a secret `bookshop-sm` with the credentials in your current Kubernetes namespace. -Make the following changes to your _`chart/values.yaml`_. +Make the following changes to your _`helm/multi-tenant/values.yaml`_. ```diff srv: @@ -347,14 +348,15 @@ sidecar: - servicePlanName: container ``` -Make the following changes to your _`chart/Chart.yaml`_. +Make the following changes to your _`helm/multi-tenant/Chart.yaml`_. ```diff dependencies: ... - - name: service-instance -- alias: service-manager +- repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: ">0.0.0" +- alias: service-manager ... ``` From a194261bb8af4a88bc904d6cfe424ed93ef7af9c Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Mon, 17 Jun 2024 20:26:20 +0200 Subject: [PATCH 08/11] Emphasis optional step --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 89bde987..7deafb67 100644 --- a/README.md +++ b/README.md @@ -272,9 +272,11 @@ bash ./scripts/create-container-registry-secret.sh The *Docker Server* is the full qualified hostname of your container registry. -#### Create a HDI container / Service Manager Instance and a Secret +#### [Optional] Create a HDI container / Service Manager Instance and a Secret -This step is only required if you're using a BTP Trial account. If you're using a production or a free tier account then you can create HDI Container from Kyma directly by adding a [mapping to your Kyma namespace in your HANA Cloud Instance](https://blogs.sap.com/2022/12/15/consuming-sap-hana-cloud-from-the-kyma-environment/) and skip this step. +**Only required if you're using a BTP Trial account**. + +If you're using a production or a free tier account then you can create HDI Container from Kyma directly by adding a [mapping to your Kyma namespace in your HANA Cloud Instance](https://blogs.sap.com/2022/12/15/consuming-sap-hana-cloud-from-the-kyma-environment/) and **skip this step**. ##### Single Tenant From 281791601261b32d72445fcd6d88b77b33e905e5 Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Mon, 17 Jun 2024 20:32:52 +0200 Subject: [PATCH 09/11] Emphasis optional step --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7deafb67..a8871d1b 100644 --- a/README.md +++ b/README.md @@ -272,11 +272,11 @@ bash ./scripts/create-container-registry-secret.sh The *Docker Server* is the full qualified hostname of your container registry. -#### [Optional] Create a HDI container / Service Manager Instance and a Secret +#### Create a HDI container / Service Manager Instance and a Secret (optional) **Only required if you're using a BTP Trial account**. -If you're using a production or a free tier account then you can create HDI Container from Kyma directly by adding a [mapping to your Kyma namespace in your HANA Cloud Instance](https://blogs.sap.com/2022/12/15/consuming-sap-hana-cloud-from-the-kyma-environment/) and **skip this step**. +If you're using a production or a free tier account you can create HDI Container from Kyma directly by adding a [mapping to your Kyma namespace in your HANA Cloud Instance](https://blogs.sap.com/2022/12/15/consuming-sap-hana-cloud-from-the-kyma-environment/). Then **skip this step and continue with [Build](#build)**. ##### Single Tenant From 5897e69a896e5e44bd05aeea34fcfb8b6bf8757c Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Tue, 18 Jun 2024 13:27:37 +0200 Subject: [PATCH 10/11] Remove redundant helm chart --- helm/Chart.lock | 18 ------------- helm/Chart.yaml | 25 ------------------ helm/values-dev-images.yaml | 12 --------- helm/values-dev.yaml | 24 ----------------- helm/values.yaml | 52 ------------------------------------- 5 files changed, 131 deletions(-) delete mode 100644 helm/Chart.lock delete mode 100644 helm/Chart.yaml delete mode 100644 helm/values-dev-images.yaml delete mode 100644 helm/values-dev.yaml delete mode 100644 helm/values.yaml diff --git a/helm/Chart.lock b/helm/Chart.lock deleted file mode 100644 index 4eb707b8..00000000 --- a/helm/Chart.lock +++ /dev/null @@ -1,18 +0,0 @@ -dependencies: -- name: web-application - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.9.0 -- name: web-application - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.9.0 -- name: content-deployment - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.4.0 -- name: service-instance - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.3.0 -- name: service-instance - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - version: 0.3.0 -digest: sha256:595c783f247c1fca13b9e093355cc2060553d78d4f4f280d5ebb7dc654f18ef2 -generated: "2023-02-02T10:08:12.298722+01:00" diff --git a/helm/Chart.yaml b/helm/Chart.yaml deleted file mode 100644 index dea7c627..00000000 --- a/helm/Chart.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v2 -name: cloud-sample-java -type: application -version: 0.1.0 -dependencies: - - name: web-application - version: '>=0.8.0' - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - alias: bookshop-srv - - name: web-application - version: '>=0.8.0' - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - alias: bookshop-app - - name: content-deployment - version: '>=0.3.1' - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - alias: bookshop-db - - name: service-instance - version: '>=0.0.1' - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - alias: bookshop-uaa - - name: service-instance - version: '>=0.0.1' - repository: https://int.repositories.cloud.sap/artifactory/virtual-unified-runtime-helm-dmz/ - alias: bookshop-hdi-container \ No newline at end of file diff --git a/helm/values-dev-images.yaml b/helm/values-dev-images.yaml deleted file mode 100644 index 4e00d635..00000000 --- a/helm/values-dev-images.yaml +++ /dev/null @@ -1,12 +0,0 @@ -bookshop-srv: - image: - repository: dhlam/bookshop-srv - tag: 1.0.0 -bookshop-app: - image: - repository: dhlam/bookshop-app - tag: 1.0.0 -bookshop-db: - image: - repository: dhlam/bookshop-db - tag: 1.0.3 \ No newline at end of file diff --git a/helm/values-dev.yaml b/helm/values-dev.yaml deleted file mode 100644 index 6d0ac0a9..00000000 --- a/helm/values-dev.yaml +++ /dev/null @@ -1,24 +0,0 @@ -bookshop-uaa: - parameters: - oauth2-configuration: - redirect-uris: - - https://*.c-81ddb81.stage.kyma.ondemand.com/login/callback - xsappname: bookshop-java-public - tenant-mode: dedicated - scopes: - - name: $XSAPPNAME.admin - description: admin - attributes: - - name: businessPartner - description: S/4 BusinessPartner ID assigned to the user - valueType: string - role-templates: - - name: admin - description: generated - scope-references: - - $XSAPPNAME.admin - attribute-references: - - businessPartner -bookshop-app: - env: - destinations: '[{"forwardAuthToken":true,"name":"backend","strictSSL":true,"url":"https://rel1-bookshop-srv-bookshop.c-81ddb81.stage.kyma.ondemand.com"}]' \ No newline at end of file diff --git a/helm/values.yaml b/helm/values.yaml deleted file mode 100644 index 637cc6c3..00000000 --- a/helm/values.yaml +++ /dev/null @@ -1,52 +0,0 @@ -bookshop-srv: - resources: - requests: - cpu: 1 - memory: 1G - limits: - memory: 1G - env: - SPRING_PROFILES_ACTIVE: cloud - bindings: - bookshop-hdi-container: - serviceInstanceFullname: bookshop-hdi-container - bookshop-uaa: - serviceInstanceFullname: bookshop-uaa - health: - liveness: - path: actuator/health - readiness: - path: actuator/health -bookshop-app: - resources: - limits: - memory: 256M - requests: - cpu: 1 - memory: 256M - bindings: - bookshop-uaa: - serviceInstanceFullname: bookshop-uaa - health: - liveness: - path: / - readiness: - path: / -bookshop-db: - resources: - limits: - memory: 1G - requests: - cpu: 250m - memory: 1G - bindings: - bookshop-hdi-container: - serviceInstanceFullname: bookshop-hdi-container -bookshop-hdi-container: - serviceOfferingName: hana - servicePlanName: hdi-shared - fullnameOverride: bookshop-hdi-container -bookshop-uaa: - serviceOfferingName: xsuaa - servicePlanName: broker - fullnameOverride: bookshop-uaa \ No newline at end of file From 7e4518c36621f9ac208ef862b49790927f83d0ed Mon Sep 17 00:00:00 2001 From: "David H. Lam" Date: Wed, 19 Jun 2024 10:49:30 +0200 Subject: [PATCH 11/11] Remove specific values from local dev --- helm/single-tenant/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm/single-tenant/values.yaml b/helm/single-tenant/values.yaml index fc44d9f3..817f2e35 100644 --- a/helm/single-tenant/values.yaml +++ b/helm/single-tenant/values.yaml @@ -11,8 +11,8 @@ srv: db: serviceInstanceName: bookshop-hdi image: - repository: i541520/bookshop/bookshop-srv # e.g. bookshop/bookshop-srv - tag: latest # e.g. latest + repository: # e.g. bookshop/bookshop-srv + tag: # e.g. latest env: SPRING_PROFILES_ACTIVE: cloud resources: