Prepare next release (#51)

* Decisions convergence (#48)

* Implement support for both Decisions products and refactoring

- Made service compatible with ODM and ADS
- Integrated metering model for simplified dependencies
- Renamed packages, options, produced jar file
- Adapted, refactored and reviewed documentation accordingly

* Update copyright notices

* Deliver next release - 8.12.0 (#45)

* Switch to the next version

* Change copyright year: DBACLD-90119

* Pre delivery 812 (#44)

* Prepare new release.

* increase time to run test

* Change liberty version for the next release

* Use a pre-deploy ruleset

* Adapt test after moving to the new rule set

* Prepare next delivery

* Update Chart.yaml - Fix bad odm version

* fix bad version

* Update test.sh

* Update docker-compose.yml Try to add network

* Update docker-compose.yml - Remove network

* Update build-and-test.yml

* Update build-and-test.yml debug

* Update test.sh

* Update test.sh

* Take the new jar file name into account

* Trigger new action build

---------

Co-authored-by: Anthony Acremann <[email protected]>

* Prepare next release

* Update Liberty version

* Update build-and-test.yml

* Update build-and-test.yml

* Update build-and-test.yml - Revert

* Bad reference url

* Update build-and-test.yml - Change Liberty version

* Change for the next release

* Update build-and-test.yml

* Try to workaround issue DBACLD-118818

* Fix location

* Update Chart.yaml

* Update values.yaml

* Update values.yaml

* Move to the new release name 9.0.0

* Linter failed

* DBACLD-125217 Metering service does not store correctly the metrics

* Override delivery to fix issue

* New description for the dockerjub

* DBACLD-125376 Change copyright

* Dbacld 125217 (#50)

* Fix configuration of the service

* DBACLD-125217

* Try to fix Github action

* Fix initVariable syntax

* Fix shell syntax.

* no message

* Debug

* Fix metrics check

* Move to JDK 17

* improve logging

* DBACLD-134790 Change License for the next release

* Prepare next release

* Preprare next release

* Prepare next release

* Update README_ODM.md

* Update Chart.yaml

* Update kuberentes version

* Fix Kubernetes requirement

* Change home url + Kubernetes version

---------

Co-authored-by: Anthony Acremann <[email protected]>

Author: lgrateau

.env

@@ -1,6 +1,6 @@
 # ODM product version
-ODMVERSION=8.12.0.0
-ODMIMAGEVERSION=8.12.0.0
+ODMVERSION=9.0.0.0
+ODMIMAGEVERSION=9.0.0.0
 # Directory name of the odm-ondocker checkout
 ODMDOCKERDIR=docker
 
@@ -11,4 +11,4 @@ REPOSITORY=ibmcom
 PREFIXIMAGE=odm
 
 # Liberty Version
-FROMLIBERTY=ibmcom/websphere-liberty:23.0.0.9-kernel-java11-openj9-ubi
+FROMLIBERTY=ibmcom/websphere-liberty:24.0.0.3-kernel-java17-openj9-ubi

.github/workflows/build-and-test.yml

@@ -2,9 +2,9 @@ name: Build and test
 on: [push]
 env:
   DOCKER_COMPOSE_VERSION: 1.29.2
-  FROMLIBERTY: ibmcom/websphere-liberty:23.0.0.9-kernel-java11-openj9-ubi
+  FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.3-kernel-java11-openj9-ubi
   HELM_VERSION: 3.6.2
-  ODM_VERSION: 8.12.0.1
+  ODM_VERSION: 9.0.0.0
   ODMDOCKERDIR: docker
   ODMIMAGEVERSION: 8.12.0.1
   ODMVERSION: 8.12.0.1-amd64
@@ -48,7 +48,7 @@ jobs:
       - run: sudo --preserve-env docker-compose -f docker/testing/docker-compose-metering.yml up -d
         env:
           REPOSITORY: ${{ secrets.ARTIFACTORY_URL }}
-      - run: echo "Waiting 100 seconds for ODM to start..." && sleep 300
+      - run: echo "Waiting 100 seconds for ODM to start..." && sleep 100
       - run: sudo --preserve-env docker-compose -f docker/testing/docker-compose-metering.yml logs
         env:
           REPOSITORY: ${{ secrets.ARTIFACTORY_URL }}

README_ODM.md

@@ -25,13 +25,13 @@ You can deploy the IBM Operational Decision Manager usage metering service:
 ## Prerequisites
 
 #### For compilation
-- IBM Operational Decision Manager 8.10.2 or later version
-- Java SDK 1.8
+- IBM Operational Decision Manager 9.0.0 or later version
+- Java SDK 17
 - Maven 3.6.3 or later version
 
 #### For use
-- JRE 1.8
-- IBM Operational Decision Manager 8.10.2 or later version
+- JRE 17
+- IBM Operational Decision Manager 9.0.0 or later version
 (with configuration set for metering - please see the <i>Configuring the clients</i> section)
 
 ## Compiling the service

charts/ibm-odm-metering/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v1
 description: IBM Operational Decision Manager metering service
 name: ibm-odm-metering
-version: 23.2.0
-appVersion: 8.12.0.1
-home: https://developer.ibm.com/odm/
+version: 24.0.0
+appVersion: 9.0.0
+home: https://www.ibm.com/docs/en/odm/9.0.0
 icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png
 sources:
   - https://github.com/ODMDev/decisions-metering
@@ -19,4 +19,4 @@ keywords:
 maintainers:
 - name: ODMDev
 tillerVersion: ">=2.9.1"
-kubeVersion: ">=1.11.0-0"
+kubeVersion: ">= 1.24.0-0"

charts/ibm-odm-metering/LICENSES/LICENSE-LI

@@ -6,7 +6,7 @@ The [IBM Operational Decision Manager metering service](https://github.com/ODMDe
 
 The IBM License Metering Tool (ILMT) provides information about the usage of decision artifacts and executed decisions. Users of subscription services can obtain details about these billable artifacts. The license covers consumption in the form of traffic between RuleApps and client applications.
 
-For more information, see the [Operational Decision Manager documentation](https://www.ibm.com/docs/en/odm/8.12.0?topic=kubernetes-licensing-metering).
+For more information, see the [Operational Decision Manager documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering).
 
 ## Chart Details
 
@@ -22,7 +22,7 @@ When an  `ibm-odm-metering` instance is running, the endpoint URL of the service
 
 ## Prerequisites
 
-- Kubernetes 1.11+
+- Kubernetes 1.24+
 - Helm 3.2 and later versions
 - One PersistentVolume needs to be created prior to installing the chart if the parameters `persistence.enabled=true` and `persistence.dynamicProvisioning=false`. By default, dynamic provisionning is enabled.
 - Review  and accept the product license:
@@ -370,5 +370,5 @@ Only one pod can be instanciated for the metering service.
 
 ## Documentation
 
-For more information, see [ODM documentation](https://www.ibm.com/docs/en/odm/8.12.0?topic=kubernetes-licensing-metering).
+For more information, see [ODM documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering).
 

charts/ibm-odm-metering/README.md

@@ -1,12 +1,12 @@
-# What's new in Helm chart 23.0.1
-The version 23.0.1 of the Helm chart installs version 8.12.0.0 of the IBM Operational Decision Manager metering service.
+# What's new in Helm chart 24.0.0
+The version 24.0.0 of the Helm chart installs version 9.0.0 of the IBM Operational Decision Manager metering service.
 
 # Prerequisites
-1. Kubernetes 1.23 or higher, with Helm 3.2 or higher.
+1. Kubernetes 1.25 or higher, with Helm 3.2 or higher.
 2. For the internal database, create a persistent volume or use dynamic provisioning.
 
 # Documentation
-For more information go to [Operational Decision Manager Documentation](https://www.ibm.com/docs/en/odm/8.12.0?topic=kubernetes-licensing-metering) and [Github](https://github.com/ODMDev/decisions-metering).
+For more information go to [Operational Decision Manager Documentation](https://www.ibm.com/docs/en/odm/9.0.0?topic=kubernetes-licensing-metering) and [Github](https://github.com/ODMDev/decisions-metering).
 
 # Breaking Changes
 * None
@@ -20,6 +20,8 @@ None
 # Version History
 | Chart | Date     | Details                           |
 | ----- | -------- | --------------------------------- |
+| 24.0.0 | June 2024 | ODM 9.0.0 release - Support Kubernetes 1.25 or higher |
+| 23.0.2 | Dec 2023 | ODM 8.12.0.1 release - Support Kubernetes 1.23 or higher |
 | 23.0.1 | June 2023 | ODM 8.12.0.0 release - Support Kubernetes 1.23 or higher |
 | 22.0.2 | Dec 2022 | ODM 8.11.1.0 release |
 | 22.0.1 | June 2022 | ODM 8.11.0.1 release |

charts/ibm-odm-metering/RELEASENOTES.md

@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2023
+# © Copyright IBM Corporation 2024
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ license: ""
 # Declare variables to be passed into your templates.
 image:
   repository: "icr.io/cpopen/odm-k8s"
-  tag: 8.12.0.1
+  tag: 9.0.0.0
   pullPolicy: IfNotPresent
 ## Optionally specify an array of imagePullSecrets.
 ## Secrets must be manually created in the namespace.