From b091e25eebbd93879c4114dc5f3361e5814d6747 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 28 Oct 2024 16:29:34 +0100 Subject: [PATCH 1/4] Merge pull request #114 from cospeedster/patch-1 feat: Allow setting `revisionHistoryLimit` and updating helm/README.me from values.yaml --- apigateway/helm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apigateway/helm/README.md b/apigateway/helm/README.md index 79b4782..5aae370 100644 --- a/apigateway/helm/README.md +++ b/apigateway/helm/README.md @@ -262,7 +262,7 @@ Sub-folder `examples` contains some *values* examples for more use-cases. To use | grpcService.hostname | string | `""` | | | grpcService.type | string | `"LoadBalancer"` | | | hostAliases | list | `[]` | Value to add extra host aliases to APIGW container. | -| image.pullPolicy | string | `"IfNotPresent"` | | +| image | object | `{"pullPolicy":"IfNotPresent","repository":"sagcr.azurecr.io/apigateway-minimal","tag":"10.15"}` | The number of old ReplicaSets to retain to allow rollback. revisionHistoryLimit: 10 | | image.repository | string | `"sagcr.azurecr.io/apigateway-minimal"` | The repository for the image. By default, this points to the Software AG container repository. Change this for air-gapped installations or custom images. For the Software AG container repository you need to have a valid access token stored as registry credentials | | image.tag | string | `"10.15"` | The image tag of the apigateway image default this will be the latest version. For realworld scenarios SAG recommends to use a specific version to not accidently change production versions with newer images. | | imagePullSecrets | list | `[{"name":"regcred"}]` | Image pull secret reference. By default looks for `regcred`. | From 30eb0b7754d9176c65d7a0b31b9c8e468241db73 Mon Sep 17 00:00:00 2001 From: thr Date: Fri, 22 Nov 2024 08:27:58 +0100 Subject: [PATCH 2/4] information regarding CSP added --- developerportal/helm/values.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/developerportal/helm/values.yaml b/developerportal/helm/values.yaml index e0fd7ef..19cb8c2 100644 --- a/developerportal/helm/values.yaml +++ b/developerportal/helm/values.yaml @@ -167,8 +167,9 @@ devportal: clusterPorts: start: 47500 end: 47509 - # -- csp domains for SSO usage with external Identity providers. This should point to your identity provider domains. - # Controls the PORTAL_SERVER_CONFIG_HEADERS_CONTENT_SECURITY_POLICY environment variable for developer portal + # -- csp domains for SSO usage with external Identity providers. This should point to your identity provider domains. + # Controls the PORTAL_SERVER_CONFIG_HEADERS_CONTENT_SECURITY_POLICY environment variable for developer portal. + # More CSP information on https://tech.forums.softwareag.com/t/webmethods-developer-portal-csp-content-security-policy-troubleshooting/263736 cspDomains: "" # -- Use the default anti pod affinity. # Specifies a Pod Anti-Affinity rule for Kubernetes pods. From 4c4c81b0de2503190c78c81586f4fb614b0bf64b Mon Sep 17 00:00:00 2001 From: thr Date: Fri, 22 Nov 2024 08:28:42 +0100 Subject: [PATCH 3/4] print out debug installation log --- utils/image-builder-using-azure-devops/lagacy/Dockerfile | 1 + utils/image-builder-using-azure-devops/own-entrypoint/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/utils/image-builder-using-azure-devops/lagacy/Dockerfile b/utils/image-builder-using-azure-devops/lagacy/Dockerfile index 389f49d..e2c5d26 100644 --- a/utils/image-builder-using-azure-devops/lagacy/Dockerfile +++ b/utils/image-builder-using-azure-devops/lagacy/Dockerfile @@ -47,6 +47,7 @@ RUN echo 'Debug Installer script: ' && echo && cat installer.script # and Change user context to ... USER sagadmin RUN sh installer.bin -readScript installer.script -console +RUN echo 'Debug installation log ...' && echo && find . -name "installLog.txt" | xargs cat # Cleanup ... USER root diff --git a/utils/image-builder-using-azure-devops/own-entrypoint/Dockerfile b/utils/image-builder-using-azure-devops/own-entrypoint/Dockerfile index 3aeabfd..973d1e2 100644 --- a/utils/image-builder-using-azure-devops/own-entrypoint/Dockerfile +++ b/utils/image-builder-using-azure-devops/own-entrypoint/Dockerfile @@ -48,6 +48,7 @@ RUN echo 'Debug Installer script: ' && echo && cat installer.script # and Change user context to ... USER sagadmin RUN sh installer.bin -readScript installer.script -console +RUN echo 'Debug installation log ...' && echo && find . -name "installLog.txt" | xargs cat # Cleanup ... USER root From a354f33b6f868add105c8af0a754b88d9d20e9b7 Mon Sep 17 00:00:00 2001 From: thr Date: Fri, 22 Nov 2024 08:29:17 +0100 Subject: [PATCH 4/4] print out debug installation log and updating helm/README.me from values.yaml --- developerportal/helm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/developerportal/helm/README.md b/developerportal/helm/README.md index 82e37f5..16a2cdf 100644 --- a/developerportal/helm/README.md +++ b/developerportal/helm/README.md @@ -61,7 +61,7 @@ helm install webmethods/developerportal devportal | autoscaling.targetCPUUtilizationPercentage | int | `80` | | | devportal.clusterPorts.end | int | `47509` | | | devportal.clusterPorts.start | int | `47500` | | -| devportal.cspDomains | string | `""` | csp domains for SSO usage with external Identity providers. This should point to your identity provider domains. Controls the PORTAL_SERVER_CONFIG_HEADERS_CONTENT_SECURITY_POLICY environment variable for developer portal | +| devportal.cspDomains | string | `""` | csp domains for SSO usage with external Identity providers. This should point to your identity provider domains. Controls the PORTAL_SERVER_CONFIG_HEADERS_CONTENT_SECURITY_POLICY environment variable for developer portal. More CSP information on https://tech.forums.softwareag.com/t/webmethods-developer-portal-csp-content-security-policy-troubleshooting/263736 | | devportal.elasticSearchDeployment | bool | `true` | Deploy Elasticsearch. Depends on Elasic Search Helm Charts. See https://github.com/elastic/helm-charts/blob/main/elasticsearch | | devportal.port | int | `8083` | HTTP listening port. Use on wM version 10.15 (default): `8083`, 11.0: `8080` | | devportal.useDefaultAffinityRule | bool | `true` | Use the default anti pod affinity. Specifies a Pod Anti-Affinity rule for Kubernetes pods. The default Pod Anti-Affinity is a scheduling preference that indicates how Kubernetes should distribute pods across nodes to avoid having multiple pods of the same application or with specific labels running on the same node. If you want to use your on rules, refer to affinity value and provide your own configuration. |