v8.1.2.0_iFix2b Release November 2024 (#164)

* v8.1.2.0_iFix2b Release November 2024 * Update CHANGELOG.md update changelog
merative · Nov 5, 2024 · a8fd6ce · a8fd6ce
1 parent dce4a10
commit a8fd6ce
Show file tree

Hide file tree

Showing 27 changed files with 235 additions and 96 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 All notable changes to this project will be documented in this file
 
+## v24.11.0
+
+### Breaking Change
+
+* To enable persistence and the capturing of metrics on the batch pods Batch.Dockerfile has been updated with the following
+  * The Batch.Dockerfile was updated to copy `docker-server.sh` to allow scripts for persistence
+  * Updated `helm-charts/batch/templates/cronjob-program.yaml` command and args to run `docker-server.sh` not updating charts for this Batch.Dockerfile will cause charts to fail
+  * Helm charts updated kubeVersion from `">=1.20"` to `">=1.20 || >=1.30.0-eks-a737599"`
+
+### Added
+
+* Create `helm-charts/batch/templates/configmaps/configmap-jmx-batch-config.yaml` for JMX Exporter
+* Update `config-reference` to allow `batch.jmxExporter.enabled` and `batch.jmxExporter.port` to be configured
+* Support for future releases of OpenShift
+
+### Changed
+
+* Updated `helm-charts/batch/templates/cronjob-program.yaml` to allow batch launcher logs be persistent
+* Updated `helm-charts/batch/templates/_helpers.tpl` for persistence
+* Updated `helm-charts/batch/templates/cronjob-program.yaml` to allow JMX Exporting and persistence
+* Updated `helm-charts/batch/values.yaml` for JMX Exporter
+* Updated `batch` yaml for copyright changes
+* The following helm-charts have been updated to chart version `24.11.0`: `apps`, `batch`, `mqserver`, `spm`, `uawebapp`, `web`, `xmlserver`
+* Updated WebSphere Liberty version to include `24.0.0.6`
+* Updated batch helm chart to read Java max memory from values file
+* `ibmjava8-sdk-ubi8-minimal` updated to `8.0.30.0`
+
 ## v24.2.0
 
 ### Changed

diff --git a/dockerfiles/Liberty/Batch.Dockerfile b/dockerfiles/Liberty/Batch.Dockerfile
@@ -1,5 +1,5 @@
 ###############################################################################
-# © Merative US L.P. 2022
+# © Merative US L.P. 2024
 # Copyright 2020 IBM Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +15,9 @@
 # limitations under the License.
 ###############################################################################
 
-ARG WLP_VERSION=23.0.0.12-full-java8-ibmjava-ubi
+ARG WLP_VERSION=24.0.0.6-full-java8-ibmjava-ubi
 ARG ANT_VERSION=1.10.6
+ARG JMX_EXPORTER_URL=https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.14.0/jmx_prometheus_javaagent-0.14.0.jar
 
 # Intermediate image: extract Ant
 FROM alpine AS PrepStage
@@ -49,8 +50,12 @@ RUN rpm -e --nodeps tzdata \
     && yum install -y tzdata \
     && yum clean all \
     && rm -rf /var/cache/yum
+ARG JMX_EXPORTER_URL
+ADD $JMX_EXPORTER_URL /opt/ibm/Curam/jmx_prometheus_javaagent.jar
+RUN chmod -c +rx /opt/ibm/Curam/jmx_prometheus_javaagent.jar
 USER 1001
 
+COPY --chown=1001:0 content/*.sh /opt/ibm/helpers/runtime/
 COPY --from=PrepStage --chown=1001:0 /opt/apache-ant-${ANT_VERSION} /opt/apache-ant-${ANT_VERSION}
 COPY --from=PrepStage --chown=1001:0 /opt/javamail /opt/javamail
 COPY --from=PrepStage --chown=1001:0 /opt/ibm/Curam /opt/ibm/Curam

diff --git a/dockerfiles/Liberty/ClientEAR.Dockerfile b/dockerfiles/Liberty/ClientEAR.Dockerfile
@@ -17,7 +17,7 @@
 
 ARG EAR_NAME
 ARG SERVERCODE_IMAGE=servercode:latest
-ARG WLP_VERSION=23.0.0.12-full-java8-ibmjava-ubi
+ARG WLP_VERSION=24.0.0.6-full-java8-ibmjava-ubi
 
 # Explode EAR in a disposable environment
 FROM alpine AS ExplodedEAR

diff --git a/dockerfiles/Liberty/ServerEAR.Dockerfile b/dockerfiles/Liberty/ServerEAR.Dockerfile
@@ -1,5 +1,5 @@
 ###############################################################################
-# © Merative US L.P. 2022
+# © Merative US L.P. 2024
 # Copyright 2020,2022 IBM Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +15,7 @@
 # limitations under the License.
 ###############################################################################
 
-ARG WLP_VERSION=23.0.0.12-full-java8-ibmjava-ubi
+ARG WLP_VERSION=24.0.0.6-full-java8-ibmjava-ubi
 ARG MQ_ADAPTER_VERSION=9.2.4.0
 ARG MQ_RA_LICENSE
 ARG JMX_EXPORTER_URL=https://repo1.maven.org/maven2/io/prometheus/jmx/jmx_prometheus_javaagent/0.14.0/jmx_prometheus_javaagent-0.14.0.jar
@@ -74,5 +74,6 @@ COPY --chown=1001:0 content/release-stage/build/CryptoConfig.jar /opt/ibm/java/j
 COPY --from=ExplodedEAR --chown=1001:0 /work /config/apps
 COPY --from=ExplodedEAR --chown=1001:0 /tmp/properties.jar /shared_resources/
 
+# Install defaultServer and wmqJmsClient-2.0 if available
 RUN installUtility install defaultServer \
     && (installUtility install wmqJmsClient-2.0 || true)
diff --git a/dockerfiles/Liberty/Utilities.Dockerfile b/dockerfiles/Liberty/Utilities.Dockerfile
@@ -18,7 +18,7 @@
 # If set, must end with a forward slash, e.g. "registry.connect.redhat.com/"
 ARG BASE_REGISTRY
 
-FROM ${BASE_REGISTRY}ibm/ibmjava8-sdk-ubi8-minimal:8.0.8.11
+FROM ${BASE_REGISTRY}ibm/ibmjava8-sdk-ubi8-minimal:8.0.8.30
 
 USER root
 RUN rpm -e --nodeps tzdata \

diff --git a/dockerfiles/Liberty/XMLServer.Dockerfile b/dockerfiles/Liberty/XMLServer.Dockerfile
@@ -44,7 +44,7 @@ RUN unzip -qo /tmp/apache-ant.zip -d /opt/ \
     && chmod -c +x /opt/ibm/Curam/xmlserver/*.sh
 
 # Final image
-FROM ${BASE_REGISTRY}ibm/ibmjava8-sdk-ubi8-minimal:8.0.8.11
+FROM ${BASE_REGISTRY}ibm/ibmjava8-sdk-ubi8-minimal:8.0.8.30
 
 EXPOSE 1800
 WORKDIR /opt/ibm/Curam/xmlserver

diff --git a/dockerfiles/Liberty/xmlserver-metrics/XMLServer-metrics.Dockerfile b/dockerfiles/Liberty/xmlserver-metrics/XMLServer-metrics.Dockerfile
@@ -21,7 +21,7 @@ ARG XMLSERVER_PROMETHEUS_JAR=xmlserver-metrics/xmlserver_prometheus.jar
 ARG BASE_REGISTRY
 
 # Final image
-FROM ${BASE_REGISTRY}ibm/ibmjava8-sdk-ubi8-minimal:8.0.8.11
+FROM ${BASE_REGISTRY}ibm/ibmjava8-sdk-ubi8-minimal:8.0.8.30
 
 EXPOSE 8080
 WORKDIR /opt/ibm/Curam/xmlserver

diff --git a/helm-charts/apps/Chart.yaml b/helm-charts/apps/Chart.yaml
@@ -16,7 +16,7 @@
 ###############################################################################
 
 apiVersion: v2
-kubeVersion: ">=1.20"
+kubeVersion: ">=1.20 || >=1.30.0-eks-a737599"
 appVersion: "8.1.0.0"
 name: apps
 description: |-
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 24.2.0
+version: 24.11.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team

diff --git a/helm-charts/batch/Chart.yaml b/helm-charts/batch/Chart.yaml
@@ -15,7 +15,7 @@
 # limitations under the License.
 ###############################################################################
 apiVersion: v2
-kubeVersion: ">=1.20"
+kubeVersion: ">=1.20 || >=1.30.0-eks-a737599"
 appVersion: "8.1.0.0"
 name: batch
 description: |-
@@ -30,7 +30,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 24.2.0
+version: 24.11.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team

diff --git a/helm-charts/batch/templates/_helpers.tpl b/helm-charts/batch/templates/_helpers.tpl
@@ -1,5 +1,5 @@
 {{/*
-© Merative US L.P. 2022
+© Merative US L.P. 2022,2024
 Copyright 2019,2020 IBM Corporation
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,11 +35,14 @@ Build up full image path
 Build up Ant Options for general and JMX Stats configuration
 */}}
 {{- define "batch.antOpts" }}
-{{- printf "-Djava.extra.jvmargs=\"-Dcuram.db.username=$SPM_DB_USR -Dcuram.db.password=$SPM_DB_PSW\" " -}}
-{{- default .DefaultOptions .ProgramOptions -}}
+{{- printf "-Djava.extra.jvmargs=\"-Dcuram.db.username=$SPM_DB_USR -Dcuram.db.password=$SPM_DB_PSW -Xverbosegclog:/tmp/gc/verbosegc.log\" " -}}
 {{- if and .PersistenceConfig.enabled .PersistenceConfig.jmxstats.enabled -}}
 {{- printf " -Dcuram.jmx.output_statistics_timer_enabled=true -Dcuram.jmx.output_statistics_timer_folder=/tmp/jmx/ -Dcuram.jmx.output_statistics_timer_period=%d" (default 60000 .PersistenceConfig.jmxstats.timerPeriod | int) -}}
 {{- end }}
+{{- if .MaxMemory -}}
+{{- printf " -Djava.maxmemory=%s" .MaxMemory -}}
+{{- end }}
+{{- default .DefaultOptions .ProgramOptions -}}
 {{- end }}
 
 {{/*
@@ -48,3 +51,14 @@ Create the image pull secret
 {{- define "batch.imagePullSecret" }}
 {{- printf "{\"auths\": {\"%s\": {\"auth\": \"%s\"}}}" .registry (printf "%s:%s" .username (required "Credentials password is required" .password) | b64enc) | b64enc }}
 {{- end }}
+
+{{/*
+Mountpoint for the persistence storage on the application pods (e.g. /tmp/persistence )
+*/}}
+{{- define "persistence.mountPoint" -}}
+{{- if .Values.global.apps.common.persistence.mountPoint -}}
+{{- .Values.global.apps.common.persistence.mountPoint -}}
+{{- else -}}
+{{- "/tmp/persistence" -}}
+{{- end -}}
+{{- end -}}
diff --git a/helm-charts/batch/templates/configmaps/configmap-jmx-batch-config.yaml b/helm-charts/batch/templates/configmaps/configmap-jmx-batch-config.yaml
@@ -0,0 +1,30 @@
+{{- include "sch.config.init" (list . "batch.sch.chart.config.values") -}}
+{{- if .Values.jmxExporter.enabled }}
+---
+###############################################################################
+# © Merative US L.P. 2024
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-jmx-batch-config
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "sch.metadata.labels.standard" (list . "") | nindent 4 }}
+data:
+  config.yaml: |-
+    {{- .Values.jmxExporter.configYaml | default "" | nindent 4 -}}
+{{- end }}
diff --git a/helm-charts/batch/templates/cronjob-program.yaml b/helm-charts/batch/templates/cronjob-program.yaml
@@ -1,10 +1,10 @@
 {{- include "sch.config.init" (list . "batch.sch.chart.config.values") -}}
 {{- range $name, $program := .Values.programs }}
 {{- $filtered_name := ( $name | replace "_" "-" ) }}
-{{- $javaOptions := dict "DefaultOptions" $.Values.javaOptions "ProgramOptions" $program.javaOptions "PersistenceConfig" $.Values.global.apps.common.persistence }}
+{{- $javaOptions := dict "DefaultOptions" $.Values.javaOptions "MaxMemory" $.Values.maxMemory "ProgramOptions" $program.javaOptions "PersistenceConfig" $.Values.global.apps.common.persistence }}
 ---
 ###############################################################################
-# © Merative US L.P. 2022
+# © Merative US L.P. 2022,2024
 # Copyright 2019,2020 IBM Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -53,12 +53,22 @@ spec:
             - name: bootstrap-file
               configMap:
                 name: {{ $.Release.Name }}-bootstrap-cm
-          {{- if and (eq ($.Values.global.database.type | upper) "DB2") $.Values.global.database.ssl.enabled $.Values.global.database.ssl.secretName }}
+            {{- if $.Values.jmxExporter.enabled }}
+            - name: jmx-batch-config
+              configMap:
+                name: {{ $.Release.Name }}-jmx-batch-config
+            {{- end }}
+            {{- if and (eq ($.Values.global.database.type | upper) "DB2") $.Values.global.database.ssl.enabled $.Values.global.database.ssl.secretName }}
             - name: keystore-volume
               emptyDir: {}
             - name: db2-cert
               secret:
                 secretName: {{ $.Values.global.database.ssl.secretName }}
+            {{- if $.Values.global.apps.common.persistence.enabled }}
+            - name: {{ $.Release.Name }}-persistence-volume
+              persistentVolumeClaim:
+                claimName: {{ $.Release.Name }}-persistence-pvc
+            {{- end }}
           initContainers:
           - name: import-db2-cert
             image: {{ include "batch.imageFullName" (dict "ImageConfig" $.Values.global.images "ImageName" "utilities") }}
@@ -70,7 +80,7 @@ spec:
             command:
               - /bin/sh
               - -c
-              - keytool -import -trustcacerts -noprompt -file $certfile -keystore $keystore_jks -storepass changeit -storetype jks
+              - keytool -import -trustcacerts -noprompt -file $certfile -keystore $keystore_jks -storepass changeit -storetype jks  
             volumeMounts:
             - name: keystore-volume
               mountPath: /mnt/keystores
@@ -81,6 +91,11 @@ spec:
           - name: runbatch-{{ $filtered_name | lower }}
             image: {{ include "batch.imageFullName" (dict "ImageConfig" $.Values.global.images "ImageName" "batch") }}
             imagePullPolicy: {{ $.Values.global.images.pullPolicy }}
+            {{- if $.Values.jmxExporter.enabled }}
+            ports:
+              - name: jmxmetrics
+                containerPort: {{ $.Values.jmxExporter.port }}
+            {{- end }}
             envFrom:
               - secretRef:
                   name: {{ default (printf "%s-db-credentials" $.Release.Name) $.Values.global.database.credsSecretName }}
@@ -89,11 +104,15 @@ spec:
                 value: {{ include "batch.antOpts" $javaOptions | quote }}
               - name: TZ
                 value: {{ $.Values.global.timezone }}
-            command:
-              - /opt/ibm/Curam/release/build.sh
-              - runbatch
-            {{- if or $program.className $program.parameters $program.username }}
+              {{- if $.Values.global.apps.common.persistence.enabled }}
+              - name: MOUNT_POINT
+                value: {{ include "persistence.mountPoint" $ }}
+              {{- end }}
+            command: ["/bin/sh", "-c"]
             args:
+            - /opt/ibm/helpers/runtime/docker-server.sh && 
+              /opt/ibm/Curam/release/build.sh runbatch{{ if $.Values.global.apps.common.persistence.enabled }} -Ddir.bld.log=$MOUNT_POINT/$HOSTNAME/logs{{ end }}
+            {{- if or $program.className $program.parameters $program.username }}
             {{- if $program.className }}
               - -Dbatch.program={{ $program.className }}
             {{- end }}
@@ -117,5 +136,14 @@ spec:
               - name: keystore-volume
                 mountPath: /mnt/keystores
               {{- end }}
+              {{- if $.Values.jmxExporter.enabled }}
+              - name: jmx-batch-config
+                mountPath: /config/configDropins/overrides/config.yaml
+                subPath: config.yaml
+              {{- end }}
+              {{- if $.Values.global.apps.common.persistence.enabled }}
+              - name: {{ $.Release.Name }}-persistence-volume
+                mountPath: {{ include "persistence.mountPoint" $ }}
+              {{- end }}
           restartPolicy: Never
-{{- end }}
+{{- end }}
diff --git a/helm-charts/batch/values.yaml b/helm-charts/batch/values.yaml
@@ -1,5 +1,5 @@
 ###############################################################################
-# © Merative US L.P. 2022,2023
+# © Merative US L.P. 2022,2023,2024
 # Copyright 2019,2020 IBM Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -77,7 +77,10 @@ global:
 serviceAccountName: ""
 
 # Default Java Options for batch jobs
-javaOptions: '-Xms1g -Xmx1g'
+javaOptions: ' -Xms728m -Xmx728m'
+
+# Default Max JVM memmory 
+maxMemory: '1024m'
 
 # Resource limits for Batch jobs (can be overridden per job)
 resources:
@@ -135,3 +138,8 @@ streamed: {}
 # weight 100 for nodes labelled as worker-type:application
 affinityKey: worker-type
 affinityValue: application
+# JMX Exporter configuration (Beta Feature)
+jmxExporter:
+  enabled: false
+  port: 8080
+  configYaml: ''
diff --git a/helm-charts/mqserver/Chart.yaml b/helm-charts/mqserver/Chart.yaml
@@ -16,7 +16,7 @@
 ###############################################################################
 
 apiVersion: v2
-kubeVersion: ">=1.20"
+kubeVersion: ">=1.20 || >=1.30.0-eks-a737599"
 appVersion: "8.1.0.0"
 name: mqserver
 description: |-
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 24.2.0
+version: 24.11.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team