v8.1 Release September 2023

merative · Sep 13, 2023 · abf15f2 · abf15f2
1 parent 11ff3fe
commit abf15f2
Show file tree

Hide file tree

Showing 39 changed files with 343 additions and 336 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,43 @@
 
 All notable changes to this project will be documented in this file
 
+## v23.9.0
+
+### Fixed
+
+* Replaced the CI badge icon in the contributing documentation to point the correct Github Actions
+* Corrected the XML Server probe parameter names and values in the Runbook [XML Server](https://merative.github.io/spm-kubernetes/deployment/config-reference/#xml-server) Configuration Reference section.
+
+### Changed
+
+* The following helm-charts have been updated to chart version `23.9.0`: `apps`, `batch`, `mqserver`, `spm`, `uawebapp`, `web`, `xmlserver`
+* The `mqserver` chart was amended to enable MQ metric monitoring
+* Changed product name and version in shared configurable helpers and in README
+* Amended sample tuning values
+* Increased the required version of node_js to `v18` in the contributing documentation
+* AppServer password updated to plain text
+* Updated WebSphere Liberty version to include `23.0.0.6`
+
+### Added
+
+* Added the Persistent Storage documentation page
+
+### Removed
+
+* Removed the Object Storage and Cloud Object Storage documentation pages
+
+### Breaking Change
+
+* The values in `global.apps.common.persistence` have been modified to be more flexible with various persistent storage options available
+  * This is a breaking change without migration path possible, please refer to the Configuration Reference documentation for more details on how to integrate with the new values
+  * Added `global.apps.common.persistence.properties` which includes multi-lines as specified during the deployment to create the Persistent Volume
+  * Removed `global.apps.common.persistence.storageAccessModes`, `global.apps.common.persistence.persistentVolumeReclaimPolicy`, `global.apps.common.persistence.persistentVolumeCsiDriver`, `global.apps.common.persistence.persistentVolumeContainer`, `global.apps.common.persistence.persistentVolumeHandle`, `global.apps.common.persistence.mountPoint`
+
 ## v23.7.0
 
 ### Fixed
 
-* Updated all SPM IBM's links to reference Merative SPM PDF's
+* Updated all SPM IBM link to referece Merative SPM PDF's
 
 ### Changed
 

diff --git a/dockerfiles/Liberty/Batch.Dockerfile b/dockerfiles/Liberty/Batch.Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 ###############################################################################
 
-ARG WLP_VERSION=22.0.0.6-full-java8-ibmjava-ubi
+ARG WLP_VERSION=23.0.0.6-full-java8-ibmjava-ubi
 ARG ANT_VERSION=1.10.6
 
 # Intermediate image: extract Ant

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=22.0.0.6-full-java8-ibmjava-ubi
+ARG WLP_VERSION=23.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
@@ -15,7 +15,7 @@
 # limitations under the License.
 ###############################################################################
 
-ARG WLP_VERSION=22.0.0.6-full-java8-ibmjava-ubi
+ARG WLP_VERSION=23.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

diff --git a/dockerfiles/Liberty/content/AppServer.properties b/dockerfiles/Liberty/content/AppServer.properties
@@ -25,8 +25,7 @@ as.vendor=WLP
 # The username and password for admin server.
 security.username=websphere
 # Encrypt the plain-text password using 'build encrypt -Dpassword=<password>'
-# Below is the encryption for the default password ("websphere")
-security.password=XOVRjjVTebM8gV953LGMLQ==
+security.password=websphere
 
 # The name of the WebSphere Node or WebLogic Domain Name.
 node.name=liberty

diff --git a/helm-charts/apps/Chart.yaml b/helm-charts/apps/Chart.yaml
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 23.7.0
+version: 23.9.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team

diff --git a/helm-charts/apps/templates/_sch-chart-config.tpl b/helm-charts/apps/templates/_sch-chart-config.tpl
@@ -18,8 +18,8 @@ sch:
           weight: 100
     labelType: "prefixed"
     metering:
-      productName: "IBM Curam Social Program Management Platform"
-      productVersion: "8.0"
+      productName: "Merative Curam Social Program Management"
+      productVersion: "8.1"
       productID: "1bba719a1b4744a9901f85563744c0d1"
     podSecurityContext:
       hostIPC: false

diff --git a/helm-charts/apps/values.yaml b/helm-charts/apps/values.yaml
@@ -59,20 +59,19 @@ global:
   apps:
     common:
       persistence:
-        # ## Persistence volume to store data (such as non-log files)
-        # enabled: false
-        # ## If enabled, creates a PV and PVC to connect to Azure Blob Storage container
+        ## Persistence volume to store data (such as non-log files)
+        enabled: false
+        ## If enabled, connects to a persistence storage service
         # credentials:
-        #   azurestorageaccountname: "<AccountName-Base64>"
-        #   azurestorageaccountkey: "<AccountKey-Base64>"
+        #   azurestorageaccountname: "AccountName (encoded in Base64)"
+        #   azurestorageaccountkey: "AccountKey (encoded in Base64)"
         # storageClassName: "azureblob-fuse-premium"
         # storageCapacity: "10Gi"
-        # storageAccessModes: "ReadWriteMany"
-        # persistentVolumeReclaimPolicy: "Delete"
-        # persistentVolumeCsiDriver: "blob.csi.azure.com"
-        # persistentVolumeContainer: "blob-container"
-        # ## persistentVolumeHandle required to be unique for every identical storage blob container in the cluster
-        # persistentVolumeHandle: "blob-volume-id"
+        # properties:
+        #   azureFile:
+        #     secretName: "spm-persistence-secret"
+        #     shareName: "file-share-smb"
+        #     readOnly: false
         mountPoint: ''
         jmxstats:
           ## Parameters of the JMX Stats to be persisted on the PVC

diff --git a/helm-charts/batch/Chart.yaml b/helm-charts/batch/Chart.yaml
@@ -30,7 +30,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 23.7.0
+version: 23.9.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team

diff --git a/helm-charts/batch/values.yaml b/helm-charts/batch/values.yaml
@@ -56,20 +56,19 @@ global:
   apps:
     common:
       persistence:
-        # ## Persistence volume to store data (such as non-log files)
-        # enabled: false
-        # ## If enabled, creates a PV and PVC to connect to Azure Blob Storage container
+        ## Persistence volume to store data (such as non-log files)
+        enabled: false
+        ## If enabled, connects to a persistence storage service
         # credentials:
-        #   azurestorageaccountname: "<AccountName-Base64>"
-        #   azurestorageaccountkey: "<AccountKey-Base64>"
+        #   azurestorageaccountname: "AccountName (encoded in Base64)"
+        #   azurestorageaccountkey: "AccountKey (encoded in Base64)"
         # storageClassName: "azureblob-fuse-premium"
         # storageCapacity: "10Gi"
-        # storageAccessModes: "ReadWriteMany"
-        # persistentVolumeReclaimPolicy: "Delete"
-        # persistentVolumeCsiDriver: "blob.csi.azure.com"
-        # persistentVolumeContainer: "blob-container"
-        # ## persistentVolumeHandle required to be unique for every identical storage blob container in the cluster
-        # persistentVolumeHandle: "blob-volume-id"
+        # properties:
+        #   azureFile:
+        #     secretName: "spm-persistence-secret"
+        #     shareName: "file-share-smb"
+        #     readOnly: false
         mountPoint: ''
         jmxstats:
           enabled: false

diff --git a/helm-charts/mqserver/Chart.yaml b/helm-charts/mqserver/Chart.yaml
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 23.7.0
+version: 23.9.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team

diff --git a/helm-charts/mqserver/templates/configmap-metrics.yaml b/helm-charts/mqserver/templates/configmap-metrics.yaml
@@ -31,8 +31,8 @@ data:
   IBMMQ_GLOBAL_CONFIGURATIONFILE: ""
   IBMMQ_GLOBAL_LOGLEVEL: DEBUG
   IBMMQ_GLOBAL_USEOBJECTSTATUS: "true"
-  IBMMQ_GLOBAL_USEPUBLICATIONS: "false"
+  IBMMQ_GLOBAL_USEPUBLICATIONS: "true"
   IBMMQ_OBJECTS_QUEUES: '*,!SYSTEM.*,!AMQ.*'
   IBMMQ_OBJECTS_SUBSCRIPTIONS: '!$SYS*'
-  IBMMQ_OBJECTS_TOPICS: '!*'
+  IBMMQ_OBJECTS_TOPICS: '*,!SYSTEM.*'
 {{- end }}
diff --git a/helm-charts/mqserver/templates/configmap-mqsc.yaml b/helm-charts/mqserver/templates/configmap-mqsc.yaml
@@ -45,6 +45,7 @@ data:
     SET AUTHREC OBJTYPE(QUEUE) PROFILE('QN.WORKFLOWENACTMENT') PRINCIPAL('app') AUTHADD(ALL)
     SET AUTHREC OBJTYPE(QUEUE) PROFILE('QN.WORKFLOWERROR') PRINCIPAL('app') AUTHADD(ALL)
     SET AUTHREC OBJTYPE(QUEUE) PROFILE('QN.CURAMDEADMESSAGEQUEUE') PRINCIPAL('app') AUTHADD(ALL)
+    SET AUTHREC OBJTYPE(TOPIC) PROFILE('**') PRINCIPAL('admin') AUTHADD(ALL)
 
     SET AUTHREC OBJTYPE(CHANNEL) PROFILE('MQ_CHN_PROD') PRINCIPAL('app') AUTHADD(ALL)
     SET AUTHREC OBJTYPE(CHANNEL) PROFILE('MQ_CHN_CONS') PRINCIPAL('app') AUTHADD(ALL)

diff --git a/helm-charts/spm/Chart.yaml b/helm-charts/spm/Chart.yaml
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 23.7.0
+version: 23.9.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team
@@ -57,22 +57,22 @@ icon: https://avatars2.githubusercontent.com/u/1459110
 
 dependencies:
   - name: apps
-    version: "~23.7.0"
+    version: "~23.9.0"
     repository: "@local-development"
   - name: batch
-    version: "~23.7.0"
+    version: "~23.9.0"
     repository: "@local-development"
   - name: uawebapp
-    version: "~23.7.0"
+    version: "~23.9.0"
     repository: "@local-development"
   - name: web
-    version: "~23.7.0"
+    version: "~23.9.0"
     repository: "@local-development"
   - name: mqserver
-    version: "~23.7.0"
+    version: "~23.9.0"
     repository: "@local-development"
   - name: xmlserver
-    version: "~23.7.0"
+    version: "~23.9.0"
     repository: "@local-development"
   - name: ibm-sch
     repository: "@sch"

diff --git a/helm-charts/spm/charts/.gitkeep b/helm-charts/spm/charts/.gitkeep
diff --git a/helm-charts/spm/templates/_helpers.tpl b/helm-charts/spm/templates/_helpers.tpl
@@ -32,6 +32,15 @@ Create the persistence credentials
 {{- end -}}
 {{- end -}}
 
+{{/*
+Create the persistence properties
+*/}}
+{{- define "spm.persistenceProperties" -}}
+{{- if $.Values.global.apps.common.persistence.properties -}}
+{{- toYaml $.Values.global.apps.common.persistence.properties }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Build up ssl-services value
 */}}

diff --git a/helm-charts/spm/templates/persistence-pv.yaml b/helm-charts/spm/templates/persistence-pv.yaml
@@ -17,33 +17,16 @@
 # limitations under the License.
 ###############################################################################
 apiVersion: v1
-# TODO Confirm we have to create the PV statistically, maybe it could be created dynamically using a stateful set: https://learn.microsoft.com/en-us/azure/aks/azure-blob-csi?tabs=Blobfuse#using-a-statefulset
 kind: PersistentVolume
 metadata:
   name: {{ .Release.Namespace }}-{{ .Release.Name }}-persistence-pv
   labels:
     {{- include "sch.metadata.labels.standard" (list . "") | nindent 4 }}
 spec:
-  capacity:
-    storage: {{ required "storageCapacity is required" .Values.global.apps.common.persistence.storageCapacity | quote }}
+  storageClassName: {{ required "storageClassName is required" .Values.global.apps.common.persistence.storageClassName | quote }}
   accessModes:
     - ReadWriteMany
-  persistentVolumeReclaimPolicy: {{ required "persistentVolumeReclaimPolicy is required" .Values.global.apps.common.persistence.persistentVolumeReclaimPolicy | quote }}
-  storageClassName: {{ required "storageClassName is required" .Values.global.apps.common.persistence.storageClassName | quote }}
-  mountOptions:
-    - -o allow_other
-    - --file-cache-timeout-in-seconds=120
-  csi:
-    driver: {{ required "persistentVolumeCsiDriver is required" .Values.global.apps.common.persistence.persistentVolumeCsiDriver | quote }}
-    readOnly: false
-    volumeHandle: {{ required "persistentVolumeHandle is required" .Values.global.apps.common.persistence.persistentVolumeHandle | quote }}
-    volumeAttributes:
-      containerName: {{ required "persistentVolumeContainer is required" .Values.global.apps.common.persistence.persistentVolumeContainer | quote }}
-      # TODO Document isHnsEnabled: "true" is required since Kubernetes 1.25
-      # https://learn.microsoft.com/en-us/dotnet/api/microsoft.azure.management.storage.models.storageaccountcreateparameters.ishnsenabled?view=azure-dotnet
-      isHnsEnabled: "true"
-      protocol: fuse2
-    nodeStageSecretRef:
-      name: "{{ .Release.Name }}-persistence-secret"
-      namespace: {{ .Release.Namespace }}
-{{- end }}
+  capacity:
+    storage: {{ required "storageCapacity is required" .Values.global.apps.common.persistence.storageCapacity | quote }}
+  {{- include "spm.persistenceProperties" $ | nindent 2 }}
+{{- end }}
diff --git a/helm-charts/spm/templates/persistence-pvc.yaml b/helm-charts/spm/templates/persistence-pvc.yaml
@@ -25,11 +25,11 @@ metadata:
   labels:
     {{- include "sch.metadata.labels.standard" (list . "") | nindent 4 }}
 spec:
+  storageClassName: {{ required "storageClassName is required" .Values.global.apps.common.persistence.storageClassName | quote }}
   accessModes:
     - ReadWriteMany
   resources:
     requests:
       storage: {{ required "storageCapacity is required" .Values.global.apps.common.persistence.storageCapacity | quote }}
   volumeName: {{ .Release.Namespace }}-{{ .Release.Name }}-persistence-pv
-  storageClassName: {{ required "storageClassName is required" .Values.global.apps.common.persistence.storageClassName | quote }}
 {{- end }}
diff --git a/helm-charts/spm/values.yaml b/helm-charts/spm/values.yaml
@@ -58,20 +58,19 @@ global:
   apps:
     common:
       persistence:
-        # ## Persistence volume to store data (such as non-log files)
-        # enabled: false
-        # ## If enabled, creates a PV and PVC to connect to Azure Blob Storage container
+        ## Persistence volume to store data (such as non-log files)
+        enabled: false
+        ## If enabled, connects to a persistence storage service
         # credentials:
-        #   azurestorageaccountname: "<AccountName-Base64>"
-        #   azurestorageaccountkey: "<AccountKey-Base64>"
+        #   azurestorageaccountname: "AccountName (encoded in Base64)"
+        #   azurestorageaccountkey: "AccountKey (encoded in Base64)"
         # storageClassName: "azureblob-fuse-premium"
         # storageCapacity: "10Gi"
-        # storageAccessModes: "ReadWriteMany"
-        # persistentVolumeReclaimPolicy: "Delete"
-        # persistentVolumeCsiDriver: "blob.csi.azure.com"
-        # persistentVolumeContainer: "blob-container"
-        # ## persistentVolumeHandle required to be unique for every identical storage blob container in the cluster
-        # persistentVolumeHandle: "blob-volume-id"
+        # properties:
+        #   azureFile:
+        #     secretName: "spm-persistence-secret"
+        #     shareName: "file-share-smb"
+        #     readOnly: false
         mountPoint: ''
         jmxstats:
           ## Parameters of the JMX Stats to be persisted on the PVC

diff --git a/helm-charts/uawebapp/Chart.yaml b/helm-charts/uawebapp/Chart.yaml
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 23.7.0
+version: 23.9.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team

diff --git a/helm-charts/uawebapp/values.yaml b/helm-charts/uawebapp/values.yaml
@@ -28,20 +28,19 @@ global:
   apps:
     common:
       persistence:
-        # ## Persistence volume to store data (such as non-log files)
-        # enabled: false
-        # ## If enabled, creates a PV and PVC to connect to Azure Blob Storage container
+        ## Persistence volume to store data (such as non-log files)
+        enabled: false
+        ## If enabled, connects to a persistence storage service
         # credentials:
-        #   azurestorageaccountname: "<AccountName-Base64>"
-        #   azurestorageaccountkey: "<AccountKey-Base64>"
+        #   azurestorageaccountname: "AccountName (encoded in Base64)"
+        #   azurestorageaccountkey: "AccountKey (encoded in Base64)"
         # storageClassName: "azureblob-fuse-premium"
         # storageCapacity: "10Gi"
-        # storageAccessModes: "ReadWriteMany"
-        # persistentVolumeReclaimPolicy: "Delete"
-        # persistentVolumeCsiDriver: "blob.csi.azure.com"
-        # persistentVolumeContainer: "blob-container"
-        # ## persistentVolumeHandle required to be unique for every identical storage blob container in the cluster
-        # persistentVolumeHandle: "blob-volume-id"
+        # properties:
+        #   azureFile:
+        #     secretName: "spm-persistence-secret"
+        #     shareName: "file-share-smb"
+        #     readOnly: false
         mountPoint: ''
 
 imageConfig:

diff --git a/helm-charts/web/Chart.yaml b/helm-charts/web/Chart.yaml
@@ -31,7 +31,7 @@ description: |-
   You may obtain a copy of the License at
 
   http://www.apache.org/licenses/LICENSE-2.0
-version: 23.7.0
+version: 23.9.0
 maintainers:
   - name: IBM
   - name: Cúram SPM Dev Team