Merge pull request #106 from SoftwareAG/dev-thr

Developer Portal: Support of wM 11.0
SoftwareAG · Aug 23, 2024 · 576e282 · 576e282
2 parents acd49fd + 1177a99
commit 576e282
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/developerportal/helm/Chart.yaml b/developerportal/helm/Chart.yaml
@@ -33,7 +33,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/developerportal/helm/README.md b/developerportal/helm/README.md
@@ -41,6 +41,13 @@ kubectl create secret docker-registry regcred --docker-server=sagcr.azurecr.io -
 helm install webmethods/developerportal devportal
 ```
 
+## Version History
+
+| Version | Changes and Description |
+|-----|------|
+| `1.0.0` | Initial release |
+| `1.0.1` | Supports wM version 11.0. Validate `devportal.port` value in `values.yaml` if you want to use wM image version 11.0. |
+
 ## Values
 
 | Key | Type | Default | Description |
@@ -54,7 +61,7 @@ helm install webmethods/developerportal devportal
 | 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.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` |  |
+| 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. |
 | elasticsearch.certificateSecretName | string | `"{{ include \"common.names.fullname\" .}}-es-tls-secret"` | The name of the secret holding the tls secret By default the name will be fullname of release + "es-tls-secret" |
 | elasticsearch.defaultNodeSet | object | `{"count":1,"extraConfig":{},"extraInitContainers":{},"installPlugins":["mapper-size"],"memoryMapping":false,"setMaxMapCount":true}` | Default Node Set |

diff --git a/developerportal/helm/README.md.gotmpl b/developerportal/helm/README.md.gotmpl
@@ -41,5 +41,11 @@ kubectl create secret docker-registry regcred --docker-server=sagcr.azurecr.io -
 helm install webmethods/developerportal devportal
 ```
 
+## Version History
+
+| Version | Changes and Description |
+|-----|------|
+| `1.0.0` | Initial release |
+| `1.0.1` | Supports wM version 11.0. Validate `devportal.port` value in `values.yaml` if you want to use wM image version 11.0. |
 
 {{ template "chart.valuesSection" . }}
diff --git a/developerportal/helm/templates/service.yaml b/developerportal/helm/templates/service.yaml
@@ -37,7 +37,7 @@ spec:
     - name: http
       port: 80
       protocol: TCP
-      targetPort: 8083
+      targetPort: {{ .Values.devportal.port }}
     - name: https
       port: 443
       protocol: TCP

diff --git a/developerportal/helm/templates/statefulset.yaml b/developerportal/helm/templates/statefulset.yaml
@@ -69,7 +69,9 @@ spec:
           ports:
             - containerPort: {{ .Values.devportal.port }}
           env:
-            - name: SPRING_ELASTICSEARCH_REST_URIS            
+            - name: SPRING_ELASTICSEARCH_REST_URIS            # supports version 10.15 
+              value: {{ include "developerportal.elasticservice" . }}:9200
+            - name: SPRING_ELASTICSEARCH_URIS                 # supports version 11.0
               value: {{ include "developerportal.elasticservice" . }}:9200
             - name: PORTAL_SERVER_CACHE_DISTRIBUTED_CLUSTER_PEERS_0
               value: {{ include "common.names.fullname" . }}-svc:{{ .Values.devportal.clusterPorts.start }}..{{ .Values.devportal.clusterPorts.end }}              

diff --git a/developerportal/helm/values.yaml b/developerportal/helm/values.yaml
@@ -151,7 +151,8 @@ lifecycle: {}
 #   exec:
 #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
 
-devportal: 
+devportal:
+  # -- HTTP listening port. Use on wM version 10.15 (default): `8083`, 11.0: `8080` 
   port: 8083
   # -- Deploy Elasticsearch. Depends on Elasic Search Helm Charts. See https://github.com/elastic/helm-charts/blob/main/elasticsearch  
   elasticSearchDeployment: true