Prep delivery - First pass fix linter

.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

.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.0
+  ODMVERSION: 9.0.0.1-amd64
   PREFIXIMAGE: odm
 
 jobs:
@@ -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 }}

charts/ibm-odm-metering/Chart.yaml

@@ -1,8 +1,13 @@
-apiVersion: v1
+apiVersion: v2
 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,12 +16,13 @@ keywords:
 - OperationalDecisionManager
 - businessrules
 - Limited
-- ICP
+- RHOCP
+- ROKS
 - amd64
 - s390x
 - ppc64le
-- ICPRHOCP
+- Middleware
 maintainers:
 - name: ODMDev
-tillerVersion: ">=2.9.1"
-kubeVersion: ">= 1.24.0-0"
+- name: IBM
+kubeVersion: ">= 1.25.0-0"

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:

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

charts/ibm-odm-metering/tests/lintOverride.yaml

@@ -14,4 +14,8 @@ 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."
+  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"

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.

download-cv.sh

@@ -4,6 +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/v4.8.1
 GH_LATEST=${GH_REPO}/releases/tags/v2.7.0
 AUTH="Authorization: token ${GHE_TOKEN}"