From fee280f37ecac3e7ca8028acb779d4bde9e17dfa Mon Sep 17 00:00:00 2001 From: Vlada Anicic Date: Mon, 21 Aug 2023 13:36:32 +0200 Subject: [PATCH 1/9] Enable configuring hostAliases in rasa components --- charts/rasa-action-server/Chart.yaml | 2 +- charts/rasa-action-server/templates/deployment.yaml | 4 ++++ charts/rasa-action-server/values.yaml | 6 ++++++ charts/rasa/Chart.yaml | 2 +- charts/rasa/templates/deployment.yaml | 4 ++++ charts/rasa/values.yaml | 6 ++++++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/charts/rasa-action-server/Chart.yaml b/charts/rasa-action-server/Chart.yaml index 241bd62..3f79481 100644 --- a/charts/rasa-action-server/Chart.yaml +++ b/charts/rasa-action-server/Chart.yaml @@ -14,7 +14,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.0.7 +version: 1.0.8 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/charts/rasa-action-server/templates/deployment.yaml b/charts/rasa-action-server/templates/deployment.yaml index 1a413e1..0ee5466 100644 --- a/charts/rasa-action-server/templates/deployment.yaml +++ b/charts/rasa-action-server/templates/deployment.yaml @@ -12,6 +12,10 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- with .Values.hostAliases }} + hostAliases: + {{- toYaml . | nindent 4 }} + {{- end }} {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} diff --git a/charts/rasa-action-server/values.yaml b/charts/rasa-action-server/values.yaml index 94547bf..85e9286 100644 --- a/charts/rasa-action-server/values.yaml +++ b/charts/rasa-action-server/values.yaml @@ -21,6 +21,12 @@ applicationSettings: # -- Specify the number of Action Server replicas replicaCount: 1 +# -- Specify the hostAliases of the Action Server pods +hostAliases: [] +# - ip: 127.0.0.1 +# hostnames: +# - "localhost" + # -- Override the default arguments for the container args: [] diff --git a/charts/rasa/Chart.yaml b/charts/rasa/Chart.yaml index 13d24a8..fdadbbb 100644 --- a/charts/rasa/Chart.yaml +++ b/charts/rasa/Chart.yaml @@ -13,7 +13,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.17.6 +version: 1.17.7 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/charts/rasa/templates/deployment.yaml b/charts/rasa/templates/deployment.yaml index b4983f2..9666aba 100644 --- a/charts/rasa/templates/deployment.yaml +++ b/charts/rasa/templates/deployment.yaml @@ -12,6 +12,10 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- with .Values.hostAliases }} + hostAliases: + {{- toYaml . | nindent 4 }} + {{- end }} {{- if not .Values.autoscaling.enabled }} replicas: {{ .Values.replicaCount }} {{- end }} diff --git a/charts/rasa/values.yaml b/charts/rasa/values.yaml index 58f09b4..d821377 100644 --- a/charts/rasa/values.yaml +++ b/charts/rasa/values.yaml @@ -189,6 +189,12 @@ applicationSettings: # -- Specify the number of Rasa Open Source replicas replicaCount: 1 +# -- Specify the hostAliases of Rasa Open Source pods +hostAliases: [] +# - ip: 127.0.0.1 +# hostnames: +# - "localhost" + networkPolicy: # -- Enable Kubernetes Network Policy enabled: false From 492abae651c839ceaaf8d07bb30103e091ee6dc2 Mon Sep 17 00:00:00 2001 From: Vlada Anicic Date: Mon, 21 Aug 2023 13:45:30 +0200 Subject: [PATCH 2/9] Update github token --- .github/workflows/chart-readme.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/chart-readme.yml b/.github/workflows/chart-readme.yml index 22008ff..5daa43d 100644 --- a/.github/workflows/chart-readme.yml +++ b/.github/workflows/chart-readme.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.RASABOT_GITHUB_TOKEN }} - name: Update README.md working-directory: charts/${{ matrix.chart }} From cea2577f264821974d40bd769c04a45d4a0308bb Mon Sep 17 00:00:00 2001 From: Vlada Anicic Date: Mon, 21 Aug 2023 13:48:36 +0200 Subject: [PATCH 3/9] Update github token --- .github/workflows/chart-readme.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/chart-readme.yml b/.github/workflows/chart-readme.yml index 5daa43d..6f242f8 100644 --- a/.github/workflows/chart-readme.yml +++ b/.github/workflows/chart-readme.yml @@ -45,3 +45,4 @@ jobs: default_author: github_actor add: 'charts/${{ matrix.chart }}/README.md' message: '[helm-docs] Update README.md' + github_token: ${{ secrets.RASABOT_GITHUB_TOKEN }} From 5a2d443a5a616953d033f72142f630ef1d7732eb Mon Sep 17 00:00:00 2001 From: Vlada Anicic Date: Mon, 21 Aug 2023 13:53:12 +0200 Subject: [PATCH 4/9] Fix token permissions --- .github/workflows/chart-readme.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/chart-readme.yml b/.github/workflows/chart-readme.yml index 6f242f8..847015c 100644 --- a/.github/workflows/chart-readme.yml +++ b/.github/workflows/chart-readme.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - token: ${{ secrets.RASABOT_GITHUB_TOKEN }} + token: ${{ secrets.RASABOT_HELM_TOKEN }} - name: Update README.md working-directory: charts/${{ matrix.chart }} @@ -45,4 +45,4 @@ jobs: default_author: github_actor add: 'charts/${{ matrix.chart }}/README.md' message: '[helm-docs] Update README.md' - github_token: ${{ secrets.RASABOT_GITHUB_TOKEN }} + github_token: ${{ secrets.RASABOT_HELM_TOKEN }} From c13b605685e24fe9f347423251b797dbd41fdb25 Mon Sep 17 00:00:00 2001 From: Roberto <43567378+rasabot@users.noreply.github.com> Date: Mon, 21 Aug 2023 11:55:33 +0000 Subject: [PATCH 5/9] [helm-docs] Update README.md --- charts/rasa/README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/charts/rasa/README.md b/charts/rasa/README.md index 765b907..196f7d7 100644 --- a/charts/rasa/README.md +++ b/charts/rasa/README.md @@ -1,6 +1,6 @@ # rasa -![Version: 1.17.3](https://img.shields.io/badge/Version-1.17.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.6](https://img.shields.io/badge/AppVersion-3.2.6-informational?style=flat-square) +![Version: 1.17.7](https://img.shields.io/badge/Version-1.17.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.2.6](https://img.shields.io/badge/AppVersion-3.2.6-informational?style=flat-square) The Rasa Helm chart deploy a Rasa Open Source Server. Rasa is an open source machine learning framework for automated text and voice-based conversations. @@ -19,12 +19,12 @@ helm repo update | Repository | Name | Version | |------------|------|---------| -| https://charts.bitnami.com/bitnami | postgresql | ~10.16.2 | -| https://charts.bitnami.com/bitnami | rabbitmq | ~8.32.2 | -| https://charts.bitnami.com/bitnami | redis | ~15.7.6 | -| https://helm.rasa.com | duckling | ~1.0.0 | -| https://helm.rasa.com | rasa-action-server | ~1.0.0 | +| https://helm.rasa.com | duckling | ~1.1.4 | +| https://helm.rasa.com | rasa-action-server | ~1.0.4 | | https://helm.rasa.com | rasa-common | ~1.0.2 | +| oci://europe-west3-docker.pkg.dev/rasa-releases/rasa-x-helm | postgresql | 10.16.2 | +| oci://europe-west3-docker.pkg.dev/rasa-releases/rasa-x-helm | rabbitmq | 8.32.2 | +| oci://europe-west3-docker.pkg.dev/rasa-releases/rasa-x-helm | redis | 15.7.6 | ## Quick start @@ -303,6 +303,7 @@ In the [`examples/rasa`](../../examples) directory you can find more detailed ex | global.postgresql.servicePort | int | `5432` | servicePort which is used to expose postgres to the other components | | global.redis | object | `{"password":"redis-password"}` | global settings of the redis subchart | | global.redis.password | string | `"redis-password"` | password to use in case there no external secret was provided | +| hostAliases | list | `[]` | Specify the hostAliases of Rasa Open Source pods | | image.name | string | `"rasa"` | Rasa Open Source image name to use (relative to `registry`) | | image.pullPolicy | string | `"IfNotPresent"` | Rasa Open Source image pullPolicy | | image.pullSecrets | list | `[]` | Rasa Open Source repository pullSecret # See https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod | From ee7a9f933a9144ba2f65c4c8aa83aab026bc353d Mon Sep 17 00:00:00 2001 From: Roberto <43567378+rasabot@users.noreply.github.com> Date: Mon, 21 Aug 2023 11:55:52 +0000 Subject: [PATCH 6/9] [helm-docs] Update README.md --- charts/rasa-action-server/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/rasa-action-server/README.md b/charts/rasa-action-server/README.md index b08e4f6..185183c 100644 --- a/charts/rasa-action-server/README.md +++ b/charts/rasa-action-server/README.md @@ -1,6 +1,6 @@ # rasa-action-server -![Version: 1.0.3](https://img.shields.io/badge/Version-1.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) +![Version: 1.0.8](https://img.shields.io/badge/Version-1.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) Rasa Action Server Helm chart for Kubernetes @@ -37,6 +37,7 @@ Rasa Action Server Helm chart for Kubernetes | deploymentLabels | object | `{}` | Labels to add to the action-server deployment | | extraEnv | list | `[]` | Add extra environment variables | | fullnameOverride | string | `""` | Override the full qualified app name | +| hostAliases | list | `[]` | Specify the hostAliases of the Action Server pods | | image.name | string | `"rasa-x-demo"` | Action Server image name to use (relative to `registry`) | | image.pullPolicy | string | `"IfNotPresent"` | Action Server image pullPolicy | | image.pullSecrets | list | `[]` | Action Server repository pullSecret # See https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod | From 11a87b190e963a7da78b0e5d8dab77fb172b0459 Mon Sep 17 00:00:00 2001 From: Roberto <43567378+rasabot@users.noreply.github.com> Date: Mon, 21 Aug 2023 11:56:09 +0000 Subject: [PATCH 7/9] [helm-docs] Update README.md --- charts/duckling/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/duckling/README.md b/charts/duckling/README.md index 44e3fe4..c412492 100644 --- a/charts/duckling/README.md +++ b/charts/duckling/README.md @@ -1,6 +1,6 @@ # duckling -![Version: 1.1.4](https://img.shields.io/badge/Version-1.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0.2-r0](https://img.shields.io/badge/AppVersion-0.2.0.2--r0-informational?style=flat-square) +![Version: 1.1.5](https://img.shields.io/badge/Version-1.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0.2-r0](https://img.shields.io/badge/AppVersion-0.2.0.2--r0-informational?style=flat-square) Duckling is a Haskell library that parses text into structured data. From 1814beabcb7ebceb3f05eaa944fc3584751e234c Mon Sep 17 00:00:00 2001 From: Vlada Anicic Date: Mon, 21 Aug 2023 14:01:33 +0200 Subject: [PATCH 8/9] Bump duckling version --- charts/duckling/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/duckling/Chart.yaml b/charts/duckling/Chart.yaml index bd022b8..676dff1 100644 --- a/charts/duckling/Chart.yaml +++ b/charts/duckling/Chart.yaml @@ -13,7 +13,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.1.5 +version: 1.1.6 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. From ed06f28d5a50d25b36de0d9adf779a38b7865eb2 Mon Sep 17 00:00:00 2001 From: Roberto <43567378+rasabot@users.noreply.github.com> Date: Mon, 21 Aug 2023 12:02:45 +0000 Subject: [PATCH 9/9] [helm-docs] Update README.md --- charts/duckling/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/duckling/README.md b/charts/duckling/README.md index c412492..9e9c54e 100644 --- a/charts/duckling/README.md +++ b/charts/duckling/README.md @@ -1,6 +1,6 @@ # duckling -![Version: 1.1.5](https://img.shields.io/badge/Version-1.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0.2-r0](https://img.shields.io/badge/AppVersion-0.2.0.2--r0-informational?style=flat-square) +![Version: 1.1.6](https://img.shields.io/badge/Version-1.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.2.0.2-r0](https://img.shields.io/badge/AppVersion-0.2.0.2--r0-informational?style=flat-square) Duckling is a Haskell library that parses text into structured data.