From fb3647fdde85ae367aa48bac1ea0c271b3fd913f Mon Sep 17 00:00:00 2001 From: laurent grateau Date: Wed, 13 Nov 2024 15:50:36 +0100 Subject: [PATCH 1/5] Prepare next release --- .env | 6 +++--- .github/workflows/build-and-test.yml | 8 ++++---- charts/ibm-odm-metering/Chart.yaml | 5 ++--- charts/ibm-odm-metering/values.yaml | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.env b/.env index 8ed1ab9..3a69301 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ # ODM product version -ODMVERSION=9.0.0.0 -ODMIMAGEVERSION=9.0.0.0 +ODMVERSION=9.0.0.1 +ODMIMAGEVERSION=9.0.0.1 # Directory name of the odm-ondocker checkout ODMDOCKERDIR=docker @@ -11,4 +11,4 @@ REPOSITORY=ibmcom PREFIXIMAGE=odm # Liberty Version -FROMLIBERTY=ibmcom/websphere-liberty:24.0.0.3-kernel-java17-openj9-ubi +FROMLIBERTY=ibmcom/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 1ebbfbb..d9a8b70 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,12 +2,12 @@ name: Build and test on: [push] env: DOCKER_COMPOSE_VERSION: 1.29.2 - FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.3-kernel-java11-openj9-ubi + FROMLIBERTY: ibmcom/websphere-liberty:24.0.0.9-kernel-java11-openj9-ubi HELM_VERSION: 3.6.2 - ODM_VERSION: 9.0.0.0 + ODM_VERSION: 9.0.0.1 ODMDOCKERDIR: docker - ODMIMAGEVERSION: 8.12.0.1 - ODMVERSION: 8.12.0.1-amd64 + ODMIMAGEVERSION: 9.0.0.1 + ODMVERSION: 9.0.0.1-amd64 PREFIXIMAGE: odm jobs: diff --git a/charts/ibm-odm-metering/Chart.yaml b/charts/ibm-odm-metering/Chart.yaml index 9c4b64d..4f0bf81 100644 --- a/charts/ibm-odm-metering/Chart.yaml +++ b/charts/ibm-odm-metering/Chart.yaml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: v2 description: IBM Operational Decision Manager metering service name: ibm-odm-metering version: 24.1.0 @@ -18,5 +18,4 @@ keywords: - ICPRHOCP maintainers: - name: ODMDev -tillerVersion: ">=2.9.1" -kubeVersion: ">= 1.24.0-0" +kubeVersion: ">= 1.25.0-0" diff --git a/charts/ibm-odm-metering/values.yaml b/charts/ibm-odm-metering/values.yaml index 1714139..2cb022f 100644 --- a/charts/ibm-odm-metering/values.yaml +++ b/charts/ibm-odm-metering/values.yaml @@ -20,7 +20,7 @@ license: "" # Declare variables to be passed into your templates. image: repository: "icr.io/cpopen/odm-k8s" - tag: 9.0.0.0 + tag: 9.0.0.1 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. From afe2951171d3e0ded9706f7545669cfc8f5b815d Mon Sep 17 00:00:00 2001 From: laurent grateau Date: Wed, 13 Nov 2024 15:55:16 +0100 Subject: [PATCH 2/5] Move to a CV new version --- download-cv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/download-cv.sh b/download-cv.sh index 76145c8..8018065 100755 --- a/download-cv.sh +++ b/download-cv.sh @@ -4,7 +4,7 @@ set -ex GH_API=https://github.ibm.com/api/v3 GH_REPO=${GH_API}/repos/IBMPrivateCloud/content-verification -GH_LATEST=${GH_REPO}/releases/tags/v2.7.0 +GH_LATEST=${GH_REPO}/releases/tags/v4.8.5 AUTH="Authorization: token ${GHE_TOKEN}" response=$(curl --header "${AUTH}" --silent ${GH_LATEST}) From ac212afac9876138abc67c645fc65bf2a315ed76 Mon Sep 17 00:00:00 2001 From: laurent grateau Date: Wed, 13 Nov 2024 18:00:20 +0100 Subject: [PATCH 3/5] Try to fix build. Improve certification level. --- .github/workflows/build-and-test.yml | 2 +- charts/ibm-odm-metering/Chart.yaml | 10 +++++++++- .../ibm-odm-metering/templates/tests/test-pattern.yaml | 1 + charts/ibm-odm-metering/tests/lintOverride.yaml | 8 +++++++- download-cv.sh | 3 ++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index d9a8b70..8bb3ce0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -32,7 +32,7 @@ jobs: run: tar zxfv helm.tar.gz && chmod 755 cv docker-compose linux-amd64/helm hey && sudo mv cv docker-compose linux-amd64/helm hey /usr/local/bin/ - run: docker-compose --version - run: helm version - - run: cv lint helm charts/ibm-odm-metering -o charts/ibm-odm-metering/tests/lintOverride.yaml + - run: cv lint helm charts/ibm-odm-metering -o charts/ibm-odm-metering/tests/lintOverride.yaml --set license=accept - run: bash download-odm.sh env: ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} diff --git a/charts/ibm-odm-metering/Chart.yaml b/charts/ibm-odm-metering/Chart.yaml index 4f0bf81..de09ae1 100644 --- a/charts/ibm-odm-metering/Chart.yaml +++ b/charts/ibm-odm-metering/Chart.yaml @@ -3,6 +3,11 @@ description: IBM Operational Decision Manager metering service name: ibm-odm-metering version: 24.1.0 appVersion: 9.0.0.1 +description: |- + IBM Operational Decision Manager for Developers + + License + By installing this product you accept the following license terms: https://www14.software.ibm.com/cgi-bin/weblap/lap.pl?li_formnum=L-RBPW-WQTC4A home: https://www.ibm.com/docs/en/odm/9.0.0 icon: https://raw.githubusercontent.com/ODMDev/ruledesigner/master/icons/automation-decision.png sources: @@ -11,11 +16,14 @@ keywords: - OperationalDecisionManager - businessrules - Limited -- ICP +- RHOCP +- ROKS - amd64 - s390x - ppc64le - ICPRHOCP +- ocpCatalog maintainers: - name: ODMDev +- name: IBM kubeVersion: ">= 1.25.0-0" diff --git a/charts/ibm-odm-metering/templates/tests/test-pattern.yaml b/charts/ibm-odm-metering/templates/tests/test-pattern.yaml index fac987a..5358910 100644 --- a/charts/ibm-odm-metering/templates/tests/test-pattern.yaml +++ b/charts/ibm-odm-metering/templates/tests/test-pattern.yaml @@ -10,6 +10,7 @@ metadata: {{ include "odm-additional-labels" . | indent 4 }} annotations: helm.sh/hook: test-success + productMetric: "FREE" spec: {{ include "odm-serviceAccountName" . | indent 2 }} hostNetwork: false diff --git a/charts/ibm-odm-metering/tests/lintOverride.yaml b/charts/ibm-odm-metering/tests/lintOverride.yaml index e50129f..140f82b 100644 --- a/charts/ibm-odm-metering/tests/lintOverride.yaml +++ b/charts/ibm-odm-metering/tests/lintOverride.yaml @@ -14,4 +14,10 @@ overrides: - 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." \ No newline at end of file + reason: "Needs to work on it. Too late for the 22.0.1 Release." +- rule: NoReadWriteMany + reason: "Needs to work on it. Too late for the 22.0.1 Release." +- rule: ContainerLivenessOverLongInitialDelaySeconds + reason: "Metering service take time to start" +- rule: SCCRunAsArbitraryUserID + reason: "Needs to work on it. Too late for the 24.0.1 Release." \ No newline at end of file diff --git a/download-cv.sh b/download-cv.sh index 8018065..038acc9 100755 --- a/download-cv.sh +++ b/download-cv.sh @@ -4,7 +4,8 @@ set -ex GH_API=https://github.ibm.com/api/v3 GH_REPO=${GH_API}/repos/IBMPrivateCloud/content-verification -GH_LATEST=${GH_REPO}/releases/tags/v4.8.5 +# GH_LATEST=${GH_REPO}/releases/tags/v4.8.1 +GH_LATEST=${GH_REPO}/releases/tags/v2.7.0 AUTH="Authorization: token ${GHE_TOKEN}" response=$(curl --header "${AUTH}" --silent ${GH_LATEST}) From ff069f2b4e87a377f83c27ca182051330580d9c4 Mon Sep 17 00:00:00 2001 From: laurent grateau Date: Wed, 13 Nov 2024 18:07:54 +0100 Subject: [PATCH 4/5] Fix remaining linter issues --- charts/ibm-odm-metering/Chart.yaml | 3 +-- charts/ibm-odm-metering/README.md | 4 ++-- charts/ibm-odm-metering/tests/lintOverride.yaml | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/charts/ibm-odm-metering/Chart.yaml b/charts/ibm-odm-metering/Chart.yaml index de09ae1..640de3c 100644 --- a/charts/ibm-odm-metering/Chart.yaml +++ b/charts/ibm-odm-metering/Chart.yaml @@ -21,8 +21,7 @@ keywords: - amd64 - s390x - ppc64le -- ICPRHOCP -- ocpCatalog +- Middleware maintainers: - name: ODMDev - name: IBM diff --git a/charts/ibm-odm-metering/README.md b/charts/ibm-odm-metering/README.md index df342fa..88d03b0 100644 --- a/charts/ibm-odm-metering/README.md +++ b/charts/ibm-odm-metering/README.md @@ -343,11 +343,11 @@ readOnlyRootFilesystem: false requiredDropCapabilities: - ALL runAsUser: - type: MustRunAsNonRoot + type: MustRunAsRange seccompProfiles: - docker/default seLinuxContext: - type: RunAsAny + type: MustRunAs supplementalGroups: type: MustRunAs ranges: diff --git a/charts/ibm-odm-metering/tests/lintOverride.yaml b/charts/ibm-odm-metering/tests/lintOverride.yaml index 140f82b..0a00c00 100644 --- a/charts/ibm-odm-metering/tests/lintOverride.yaml +++ b/charts/ibm-odm-metering/tests/lintOverride.yaml @@ -19,5 +19,3 @@ overrides: reason: "Needs to work on it. Too late for the 22.0.1 Release." - rule: ContainerLivenessOverLongInitialDelaySeconds reason: "Metering service take time to start" -- rule: SCCRunAsArbitraryUserID - reason: "Needs to work on it. Too late for the 24.0.1 Release." \ No newline at end of file From b8ddb600e99c1c221ab2e2269a9986924126e61c Mon Sep 17 00:00:00 2001 From: laurent grateau Date: Thu, 14 Nov 2024 09:39:32 +0100 Subject: [PATCH 5/5] Fix ODM version to be able to test --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 8bb3ce0..18d147f 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -6,7 +6,7 @@ env: HELM_VERSION: 3.6.2 ODM_VERSION: 9.0.0.1 ODMDOCKERDIR: docker - ODMIMAGEVERSION: 9.0.0.1 + ODMIMAGEVERSION: 9.0.0.0 ODMVERSION: 9.0.0.1-amd64 PREFIXIMAGE: odm