diff --git a/instance-applications/100-ibm-sls/README.md b/instance-applications/100-ibm-sls/README.md index 78ae3fbec..8653c49e0 100644 --- a/instance-applications/100-ibm-sls/README.md +++ b/instance-applications/100-ibm-sls/README.md @@ -1,10 +1,12 @@ IBM Suite License Service =============================================================================== + +## Overview + Installs the `ibm-sls` operator and creates an instance of the `LicenseService`. - Contains a job that runs last (`07-postsync-update-sm_Job.yaml`). This registers the `${ACCOUNT_ID}/${CLUSTER_ID}/${INSTANCE_ID}/sls` secret in the **Secrets Vault** used to share some information that is generated at runtime with other ArgoCD Applications. ## Resources Created @@ -69,6 +71,10 @@ ibm_sls: - alias: string crt: string (multiline) + # Pod Templates (optional) + sls_pod_templates: + key: value + # Certificate Authority (optional) internal_certificate_authority: string ``` diff --git a/instance-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml b/instance-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml index b5b8b3aa8..2277794be 100644 --- a/instance-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml +++ b/instance-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml @@ -17,6 +17,10 @@ spec: {{ .Values.mongo_spec | toYaml | indent 4 }} license: accept: true +{{- if not (empty .Values.sls_pod_templates) }} + podTemplates: +{{ .Values.sls_pod_templates | toYaml | indent 4 }} +{{- end }} settings: auth: enforce: true diff --git a/instance-applications/100-ibm-sls/values.yaml b/instance-applications/100-ibm-sls/values.yaml index b6d010fe5..e6da8e1fd 100644 --- a/instance-applications/100-ibm-sls/values.yaml +++ b/instance-applications/100-ibm-sls/values.yaml @@ -6,3 +6,4 @@ sls_mongo_secret_name: xxx mongo_spec: {} sls_entitlement_file: xxx sls_channel: 3.x +sls_pod_templates: {} diff --git a/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml index e1d364f59..8b462269a 100644 --- a/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml @@ -71,6 +71,10 @@ spec: mongo_spec: {{ .Values.ibm_sls.mongo_spec | toYaml | nindent 14}} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + {{- if .Values.ibm_sls.sls_pod_templates }} + sls_pod_templates: +{{ .Values.ibm_sls.sls_pod_templates | toYaml | indent 14 }} {{- end }} junitreporter: reporter_name: "ibm-sls-{{ .Values.instance.id }}" diff --git a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml index 71c353c2b..adda0eeec 100644 --- a/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml +++ b/root-applications/ibm-mas-sls-root/templates/100-ibm-sls-app.yaml @@ -69,6 +69,10 @@ spec: mongo_spec: {{ .Values.ibm_sls_standalone.mongo_spec | toYaml | nindent 14}} {{- if .Values.custom_labels }} custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} + {{- end }} + {{- if .Values.ibm_sls_standalone.sls_pod_templates }} + sls_pod_templates: +{{ .Values.ibm_sls_standalone.sls_pod_templates | toYaml | indent 14 }} {{- end }} junitreporter: reporter_name: "ibm-sls-{{ .Values.ibm_sls_standalone.ibm_customer_number | lower }}-{{ .Values.ibm_sls_standalone.subscription_id}}" diff --git a/sls-applications/100-ibm-sls/README.md b/sls-applications/100-ibm-sls/README.md index 9db482584..bec850ba4 100644 --- a/sls-applications/100-ibm-sls/README.md +++ b/sls-applications/100-ibm-sls/README.md @@ -1,5 +1,8 @@ IBM Suite License Service =============================================================================== + +## Overview + Installs the `ibm-sls` operator and creates an instance of the `LicenseService`. Contains a job that runs last (`07-postsync-update-sm_Job.yaml`). This registers the `${ACCOUNT_ID}/${ICN}/${SAAS_SUB_ID}/sls` secret in the **Secrets Vault** used to share some information that is generated at runtime with other ArgoCD Applications. diff --git a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml index 276cbc3f1..3914dc7d8 100644 --- a/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml +++ b/sls-applications/100-ibm-sls/templates/06-ibm-sls_LicenseService.yaml @@ -18,6 +18,10 @@ spec: {{ .Values.mongo_spec | toYaml | indent 4 }} license: accept: true +{{- if not (empty .Values.sls_pod_templates) }} + podTemplates: +{{ .Values.sls_pod_templates | toYaml | indent 4 }} +{{- end }} settings: auth: enforce: true diff --git a/sls-applications/100-ibm-sls/values.yaml b/sls-applications/100-ibm-sls/values.yaml index 8e62fce05..9045aac84 100644 --- a/sls-applications/100-ibm-sls/values.yaml +++ b/sls-applications/100-ibm-sls/values.yaml @@ -6,3 +6,4 @@ sls_mongo_secret_name: sls-mongo-credentials mongo_spec: {} sls_entitlement_file: xxx sls_channel: 3.x +sls_pod_templates: {}