Merge branch 'main' into harmonize-version-label

caraml-dev · Dec 12, 2023 · 7f8dbbf · 7f8dbbf
2 parents 6ea7d98 + 3832ef9
commit 7f8dbbf
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/chart-bumper.yaml b/.github/workflows/chart-bumper.yaml
@@ -19,7 +19,7 @@ jobs:
         with:
           version: v3.7.2
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.7
 

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -19,7 +19,7 @@ jobs:
       # Python is required because `ct lint` runs Yamale (https://github.com/23andMe/Yamale),
       # yamllint (https://github.com/adrienverge/yamllint) which require Python
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.7
 

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -20,7 +20,7 @@ jobs:
       # yamllint (https://github.com/adrienverge/yamllint) which require Python and
       # generate-creds step below which uses python to parse yaml file.
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.7
 

diff --git a/charts/caraml/Chart.lock b/charts/caraml/Chart.lock
@@ -4,10 +4,10 @@ dependencies:
   version: 0.6.4
 - name: merlin
   repository: https://caraml-dev.github.io/helm-charts
-  version: 0.13.8
+  version: 0.13.9
 - name: turing
   repository: https://caraml-dev.github.io/helm-charts
-  version: 0.3.8
+  version: 0.3.9
 - name: xp-treatment
   repository: https://caraml-dev.github.io/helm-charts
   version: 0.1.27
@@ -44,5 +44,5 @@ dependencies:
 - name: cert-manager
   repository: https://charts.jetstack.io
   version: v1.8.2
-digest: sha256:e059e65c79e7d03b799b9cd0dcb3602d9fbd0344a2ff55107b35b279be689a5d
-generated: "2023-12-11T11:34:05.728145081Z"
+digest: sha256:6af0874b123d5e9c7efcf5627a5de8b5b8ecaea13b144d4df42de3355ca3f5c4
+generated: "2023-12-12T03:44:47.915942929Z"
diff --git a/charts/caraml/Chart.yaml b/charts/caraml/Chart.yaml
@@ -8,11 +8,11 @@ dependencies:
 - condition: merlin.enabled
   name: merlin
   repository: https://caraml-dev.github.io/helm-charts
-  version: 0.13.8
+  version: 0.13.9
 - condition: turing.enabled
   name: turing
   repository: https://caraml-dev.github.io/helm-charts
-  version: 0.3.8
+  version: 0.3.9
 - condition: xp-treatment.enabled
   name: xp-treatment
   repository: https://caraml-dev.github.io/helm-charts
@@ -72,4 +72,4 @@ maintainers:
   name: caraml-dev
 name: caraml
 type: application
-version: 0.8.24
+version: 0.8.26
diff --git a/charts/caraml/README.md b/charts/caraml/README.md
@@ -1,6 +1,6 @@
 # caraml
 
-![Version: 0.8.24](https://img.shields.io/badge/Version-0.8.24-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 0.8.26](https://img.shields.io/badge/Version-0.8.26-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 A Helm chart for deploying CaraML components
 
@@ -21,9 +21,9 @@ A Helm chart for deploying CaraML components
 | https://caraml-dev.github.io/helm-charts | clusterLocalGateway(generic-dep-installer) | 0.2.1 |
 | https://caraml-dev.github.io/helm-charts | istioIngressGateway(generic-dep-installer) | 0.2.1 |
 | https://caraml-dev.github.io/helm-charts | istiod(generic-dep-installer) | 0.2.1 |
-| https://caraml-dev.github.io/helm-charts | merlin | 0.13.8 |
+| https://caraml-dev.github.io/helm-charts | merlin | 0.13.9 |
 | https://caraml-dev.github.io/helm-charts | mlp | 0.6.4 |
-| https://caraml-dev.github.io/helm-charts | turing | 0.3.8 |
+| https://caraml-dev.github.io/helm-charts | turing | 0.3.9 |
 | https://caraml-dev.github.io/helm-charts | xp-management | 0.2.10 |
 | https://caraml-dev.github.io/helm-charts | xp-treatment | 0.1.27 |
 | https://charts.helm.sh/stable | postgresql | 7.0.2 |

diff --git a/charts/merlin/README.md b/charts/merlin/README.md
@@ -228,11 +228,11 @@ The following table lists the configurable parameters of the Merlin chart and th
 | imageBuilder.builderConfig.KanikoImage | string | `"gcr.io/kaniko-project/executor:v1.18.0"` |  |
 | imageBuilder.builderConfig.MaximumRetry | int | `3` |  |
 | imageBuilder.builderConfig.NodeSelectors | object | `{}` |  |
-| imageBuilder.builderConfig.PredictionJobBaseImages.BuildContextSubPath | string | `"python"` |  |
-| imageBuilder.builderConfig.PredictionJobBaseImages.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"` |  |
-| imageBuilder.builderConfig.PredictionJobBaseImages.DockerfilePath | string | `"batch-predictor/docker/app.Dockerfile"` |  |
-| imageBuilder.builderConfig.PredictionJobBaseImages.ImageName | string | `"ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.38.0-rc1"` |  |
-| imageBuilder.builderConfig.PredictionJobBaseImages.MainAppPath | string | `"/home/spark/merlin-spark-app/main.py"` |  |
+| imageBuilder.builderConfig.PredictionJobBaseImage.BuildContextSubPath | string | `"python"` |  |
+| imageBuilder.builderConfig.PredictionJobBaseImage.BuildContextURI | string | `"git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"` |  |
+| imageBuilder.builderConfig.PredictionJobBaseImage.DockerfilePath | string | `"batch-predictor/docker/app.Dockerfile"` |  |
+| imageBuilder.builderConfig.PredictionJobBaseImage.ImageName | string | `"ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.38.0-rc1"` |  |
+| imageBuilder.builderConfig.PredictionJobBaseImage.MainAppPath | string | `"/home/spark/merlin-spark-app/main.py"` |  |
 | imageBuilder.builderConfig.Retention | string | `"48h"` |  |
 | imageBuilder.builderConfig.SafeToEvict | bool | `false` |  |
 | imageBuilder.builderConfig.Tolerations | list | `[]` |  |

diff --git a/charts/merlin/values.yaml b/charts/merlin/values.yaml
@@ -272,7 +272,7 @@ imageBuilder:
       DockerfilePath: "pyfunc-server/docker/Dockerfile"
       BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"
       BuildContextSubPath: "python"
-    PredictionJobBaseImages:
+    PredictionJobBaseImage:
       ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:0.38.0-rc1
       DockerfilePath: "batch-predictor/docker/app.Dockerfile"
       BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/tags/v0.38.0-rc1"

diff --git a/charts/turing/Chart.lock b/charts/turing/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 0.4.20
 - name: merlin
   repository: https://caraml-dev.github.io/helm-charts
-  version: 0.13.8
+  version: 0.13.9
 - name: common
   repository: https://caraml-dev.github.io/helm-charts
   version: 0.2.9
-digest: sha256:9e0eeded731ca04a49f6c12a374fe8d01e780030b6453eedf7529124d5aabab3
-generated: "2023-12-11T11:34:29.530915292Z"
+digest: sha256:405227df7303c3cf91ba2d7005b6f64c1386be1f5debe2c7227d4b73c905a896
+generated: "2023-12-12T03:45:15.767019915Z"
diff --git a/charts/turing/Chart.yaml b/charts/turing/Chart.yaml
@@ -13,7 +13,7 @@ dependencies:
 - condition: merlin.enabled
   name: merlin
   repository: https://caraml-dev.github.io/helm-charts
-  version: 0.13.8
+  version: 0.13.9
 - name: common
   repository: https://caraml-dev.github.io/helm-charts
   version: 0.2.9