New update for 8.11.0.1 Release (#35)

* updated documentation links * added link to IBM Docs documentation * added link to IBM Docs documentation * Update Chart.yaml * Update values.yaml * Update default repository to icr.io/odm-k8s (#28) * issue helm/helm#3810 workaround issue helm/helm#3810 on fyre Error: chart requires kubeVersion: >=1.11.0 which is incompatible with Kubernetes v1.22.0-rc.0+a44d0f0 * Add 21.3.0 release * Update doc links for 8.11.0.0 * Change License * Fix License * Fix helm chart version to be align to the image name. * Fix version for 21.3.0 Version * Update docker pull instruction * Prepare source code for the 22.0.1 RElease DBACLD-33052 * Change copyright Year to 2022: DBACLD-33274 * Revert brth date to 2020 * Pyl ghactions (#32) * Test id * Try to pass an option to the container * Check rights * Removed working-directory * Download cv and lint Helm chart * Add debug * Add GHE_TOKEN from secret * Test older version of cv * Fix or ignore errors for cv 2.6.0 * Added ephemeral-storage limits for ConfigMap and removed useless lint overrides * Added Helm packaging * Fixed index file name * Download ODM dist * Make sure ${HOME}/.cache exists * Full chain--first try (it won't work) * Add ODMIMAGEVERSION to job's env * Moved env declaration * How to get env variables? * Try to be less verbose * Try to keep env variables * Log into Docker * Debug * Forgot to re-add env vars * No need for this env var * Test login without sudo * Preserve env for sudo Co-authored-by: Pierre-Yves Lochou <pylochou@fr.ibm.com> * Update build-and-test.yml * Update Chart.yaml * Update values.yaml * Deliver 22.0.1 Release * Release 22.0.1 * Fix travis (#36) * Update download-cv.sh * Fix linter * update to CV 2.7.0 Co-authored-by: cmosbach <c.mosbach@fr.ibm.com> Co-authored-by: Julie Garrone <47252804+julie-garrone@users.noreply.github.com> Co-authored-by: Mathias Mouly <mathias.mouly@fr.ibm.com> Co-authored-by: julie-garrone <julie.garrone@fr.ibm.om> Co-authored-by: anthonyacremann <30266609+anthonyacremann@users.noreply.github.com> Co-authored-by: Pierre-Yves Lochou <pylochou@fr.ibm.com>
DecisionsDev · Jun 13, 2022 · 41129f6 · 41129f6
1 parent c4860a0
commit 41129f6
Show file tree

Hide file tree

Showing 71 changed files with 107 additions and 75 deletions.
diff --git a/charts/ibm-odm-metering/Chart.yaml b/charts/ibm-odm-metering/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: IBM Operational Decision Manager metering service
 name: ibm-odm-metering
-version: 21.3.0
-appVersion: 8.11.0.0
+version: 22.1.0
+appVersion: 8.11.0.1
 home: https://developer.ibm.com/odm/
 icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png
 sources:

diff --git a/charts/ibm-odm-metering/RELEASENOTES.md b/charts/ibm-odm-metering/RELEASENOTES.md
@@ -1,5 +1,5 @@
-# What's new in Helm chart 21.0.1
-The version 21.0.1 of the Helm chart installs version 8.11.0.0 of the IBM Operational Decision Manager metering service.
+# What's new in Helm chart 22.0.1
+The version 22.0.1 of the Helm chart installs version 8.11.0.1 of the IBM Operational Decision Manager metering service.
 
 # Prerequisites
 1. Kubernetes 1.17 or higher, with Helm 3.2 or higher.
@@ -20,4 +20,7 @@ None
 # Version History
 | Chart | Date     | Details                           |
 | ----- | -------- | --------------------------------- |
+| 22.0.1 | June 2022 | ODM 8.11.0.1 release |
+| 21.0.3 | Dec 2021 | ODM 8.11.0 release |
+| 21.0.2 | June 2021 | ODM 8.10.5.1 release |
 | 21.0.1 |  2021 | First release |
diff --git a/charts/ibm-odm-metering/tests/lintOverride.yaml b/charts/ibm-odm-metering/tests/lintOverride.yaml
@@ -13,3 +13,5 @@ overrides:
   reason: "Not part of the IBM Certification process."
 - rule: ReadmeHasRequiredSections
   reason: "Prefer to have cutomization section than configuration."
+- rule: NoReadWriteMany
+  reason: "Needs to work on it. Too late for the 22.0.1 Release."
diff --git a/charts/ibm-odm-metering/values.yaml b/charts/ibm-odm-metering/values.yaml
@@ -1,4 +1,4 @@
-# © Copyright IBM Corporation 2020
+# © Copyright IBM Corporation 2022
 #
 # 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/odm-k8s"
-  tag: 8.11.0.0
+  tag: 8.11.0-SNAPSHOT
   pullPolicy: IfNotPresent
 ## Optionally specify an array of imagePullSecrets.
 ## Secrets must be manually created in the namespace.

diff --git a/charts/stable/ibm-odm-metering-22.1.0.tgz b/charts/stable/ibm-odm-metering-22.1.0.tgz
diff --git a/charts/stable/index.yaml b/charts/stable/index.yaml
@@ -1,9 +1,34 @@
 apiVersion: v1
 entries:
   ibm-odm-metering:
+  - apiVersion: v1
+    appVersion: 8.11.0.1
+    created: "2022-06-13T08:48:17.685545+02:00"
+    description: IBM Operational Decision Manager metering service
+    digest: 2c33beb49aab6f029a07189eb8df9b21cc654a54f0d93a06aed92c89c0ebfe4b
+    home: https://developer.ibm.com/odm/
+    icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png
+    keywords:
+    - OperationalDecisionManager
+    - businessrules
+    - Limited
+    - ICP
+    - amd64
+    - s390x
+    - ppc64le
+    - ICPRHOCP
+    kubeVersion: '>=1.11.0-0'
+    maintainers:
+    - name: ODMDev
+    name: ibm-odm-metering
+    sources:
+    - https://github.com/ODMDev/decisions-metering
+    urls:
+    - https://odmdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-22.1.0.tgz
+    version: 22.1.0
   - apiVersion: v1
     appVersion: 8.11.0.0
-    created: "2022-04-25T11:58:38.567737025+02:00"
+    created: "2022-06-13T08:48:17.682534+02:00"
     description: IBM Operational Decision Manager metering service
     digest: c201c12f38caeee07efb38c37a06ed4d3cae3568b2ca2ed8cdf4533aa9e084a7
     home: https://developer.ibm.com/odm/
@@ -28,7 +53,7 @@ entries:
     version: 21.3.0
   - apiVersion: v1
     appVersion: 8.10.5.1
-    created: "2022-04-25T11:58:38.566431872+02:00"
+    created: "2022-06-13T08:48:17.679583+02:00"
     description: IBM Operational Decision Manager metering service
     digest: 9c46e4f530627859510695a5174bc5bbd4cee617d0b77e2ff672ac95e7d67b00
     home: https://developer.ibm.com/odm/
@@ -53,7 +78,7 @@ entries:
     version: 21.2.0
   - apiVersion: v1
     appVersion: 8.10.5.0
-    created: "2022-04-25T11:58:38.565050081+02:00"
+    created: "2022-06-13T08:48:17.676926+02:00"
     description: IBM Operational Decision Manager metering service
     digest: 1b05aadbc86ba87d653a7d750a5243891039dbf876088a91b5d961a4ec524186
     home: https://developer.ibm.com/odm/
@@ -76,4 +101,5 @@ entries:
     urls:
     - https://decisionsdev.github.io/decisions-metering/charts/stable/ibm-odm-metering-21.1.0.tgz
     version: 21.1.0
-generated: "2022-04-25T11:58:38.563632203+02:00"
+generated: "2022-06-13T08:48:17.670481+02:00"
+
diff --git a/docker/dockerhub/full-description.md b/docker/dockerhub/full-description.md
@@ -4,14 +4,15 @@
 IBM® is now hosting product images on the IBM Container Registry, *icr.io*. You can obtain the IBM Operational Decision Manager for Developers image without authenticating by using this IBM-controlled source: *icr.io/odm-k8s*.
 
 ```console
-docker pull icr.io/odm-k8s/odm-metering-service
+docker pull icr.io/odm-k8s/odm-metering-service:8.11-amd64
 ```
 
 # Quick Reference
 
 -	**Where to get help**:
 
     [ODM developer community](https://developer.ibm.com/odm/)
+
     [ODM Licensing and metering documentation](https://www.ibm.com/docs/en/odm/8.11.0?topic=kubernetes-licensing-metering)
 
 

diff --git a/download-odm.sh b/download-odm.sh
@@ -11,7 +11,7 @@ ODM_FILE_NAME=odm-distrib-${ODM_VERSION}.zip
 echo "ODM distribution: Starting download..."
 if [ ! -f "$HOME/.cache/$ODM_FILE_NAME" ]; then
     ODM_ZIP_URL=${ODM_URL}/${ODM_VERSION}/icp-docker-compose-build-images-${ODM_VERSION}.zip
-    curl ${ODM_ZIP_URL} --output ${ODM_FILE_NAME} --user "${ARTIFACTORY_USER}:${ARTIFACTORY_PASSWORD}"
+    curl ${ODM_ZIP_URL} --output ${ODM_FILE_NAME} --silent --user "${ARTIFACTORY_USER}:${ARTIFACTORY_PASSWORD}"
     mv ${ODM_FILE_NAME} ${HOME}/.cache/
     echo "ODM distribution: Download finished."
 else

diff --git a/src/main/java/com/ibm/rules/metering/Response.java b/src/main/java/com/ibm/rules/metering/Response.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/application/CustomErrorController.java b/src/main/java/com/ibm/rules/metering/application/CustomErrorController.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/application/ExceptionController.java b/src/main/java/com/ibm/rules/metering/application/ExceptionController.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/application/GlobalErrorHandler.java b/src/main/java/com/ibm/rules/metering/application/GlobalErrorHandler.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/application/HomeController.java b/src/main/java/com/ibm/rules/metering/application/HomeController.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/application/ILMTBackupController.java b/src/main/java/com/ibm/rules/metering/application/ILMTBackupController.java
@@ -1,6 +1,6 @@
  /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/application/MeteringServiceApplication.java b/src/main/java/com/ibm/rules/metering/application/MeteringServiceApplication.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/metric/repository/MetricEntity.java b/src/main/java/com/ibm/rules/metering/metric/repository/MetricEntity.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/metric/repository/MetricRepository.java b/src/main/java/com/ibm/rules/metering/metric/repository/MetricRepository.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/metric/repository/RemainderStatus.java b/src/main/java/com/ibm/rules/metering/metric/repository/RemainderStatus.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/registration/controller/RegistrationController.java b/src/main/java/com/ibm/rules/metering/registration/controller/RegistrationController.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/registration/repository/RegistrationEntity.java b/src/main/java/com/ibm/rules/metering/registration/repository/RegistrationEntity.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/registration/repository/RegistrationRepository.java b/src/main/java/com/ibm/rules/metering/registration/repository/RegistrationRepository.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/registration/repository/RegistrationService.java b/src/main/java/com/ibm/rules/metering/registration/repository/RegistrationService.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/DecisionMeteringReport.java b/src/main/java/com/ibm/rules/metering/reporting/DecisionMeteringReport.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/FixedMetricFormatter.java b/src/main/java/com/ibm/rules/metering/reporting/FixedMetricFormatter.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricAggregationMethod.java b/src/main/java/com/ibm/rules/metering/reporting/MetricAggregationMethod.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricAggregator.java b/src/main/java/com/ibm/rules/metering/reporting/MetricAggregator.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricConfiguration.java b/src/main/java/com/ibm/rules/metering/reporting/MetricConfiguration.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricDefinition.java b/src/main/java/com/ibm/rules/metering/reporting/MetricDefinition.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricFormatter.java b/src/main/java/com/ibm/rules/metering/reporting/MetricFormatter.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricIdentification.java b/src/main/java/com/ibm/rules/metering/reporting/MetricIdentification.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricProductCategory.java b/src/main/java/com/ibm/rules/metering/reporting/MetricProductCategory.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/MetricValue.java b/src/main/java/com/ibm/rules/metering/reporting/MetricValue.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/ReportHandler.java b/src/main/java/com/ibm/rules/metering/reporting/ReportHandler.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/ThresholdMetricFormatter.java b/src/main/java/com/ibm/rules/metering/reporting/ThresholdMetricFormatter.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/ValueApproximation.java b/src/main/java/com/ibm/rules/metering/reporting/ValueApproximation.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/repository/ReportEntity.java b/src/main/java/com/ibm/rules/metering/reporting/repository/ReportEntity.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/repository/ReportRepository.java b/src/main/java/com/ibm/rules/metering/reporting/repository/ReportRepository.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/reporting/repository/ReportStatus.java b/src/main/java/com/ibm/rules/metering/reporting/repository/ReportStatus.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/usage/controller/UsageController.java b/src/main/java/com/ibm/rules/metering/usage/controller/UsageController.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/usage/repository/UsageEntity.java b/src/main/java/com/ibm/rules/metering/usage/repository/UsageEntity.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.

diff --git a/src/main/java/com/ibm/rules/metering/usage/repository/UsageRepository.java b/src/main/java/com/ibm/rules/metering/usage/repository/UsageRepository.java
@@ -1,6 +1,6 @@
 /*
  *
- *   Copyright IBM Corp. 2020
+ *   Copyright IBM Corp. 2022
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");
  *   you may not use this file except in compliance with the License.