From 538c9659bac67afbbee755fea518255574758487 Mon Sep 17 00:00:00 2001 From: Francisco de la Vega Date: Fri, 17 May 2024 09:33:05 +0200 Subject: [PATCH 1/7] BAE New configuration params (#251) * Add configuration for service and resource inventories * Add new inventory APIs to BAE values file * Allow to configure BAE charging backend service and resource endpoints * Allow to configure the BAE theme URL param * Check if theme url var is defined --- charts/business-api-ecosystem/Chart.yaml | 4 +-- .../deployment.yaml | 28 +++++++++++++++++++ .../statefulset.yaml | 4 +++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/charts/business-api-ecosystem/Chart.yaml b/charts/business-api-ecosystem/Chart.yaml index 516ef696..1120ca52 100644 --- a/charts/business-api-ecosystem/Chart.yaml +++ b/charts/business-api-ecosystem/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: business-api-ecosystem description: A Helm chart for running the FIWARE business API ecosystem (FIWARE Marketplace) on Kubernetes icon: https://fiware.github.io/catalogue/img/fiware.png -version: 0.10.0 -appVersion: 8.0.0 +version: 0.11.0 +appVersion: 9.0.1 home: https://business-api-ecosystem.readthedocs.io/en/latest/ keywords: - fiware diff --git a/charts/business-api-ecosystem/templates/biz-ecosystem-charging-backend/deployment.yaml b/charts/business-api-ecosystem/templates/biz-ecosystem-charging-backend/deployment.yaml index 5a37661a..ab489509 100644 --- a/charts/business-api-ecosystem/templates/biz-ecosystem-charging-backend/deployment.yaml +++ b/charts/business-api-ecosystem/templates/biz-ecosystem-charging-backend/deployment.yaml @@ -194,6 +194,20 @@ spec: - name: BAE_CB_CATALOG value: http://{{ include "bizEcosystemApis.fullhostname" . }}/DSProductCatalog {{- end }} + {{- if .Values.bizEcosystemApis.tmForum.services }} + - name: BAE_CB_SERVICE_CATALOG + value: http://{{ .Values.bizEcosystemApis.tmForum.services.host }}:{{ .Values.bizEcosystemApis.tmForum.services.port }}{{ .Values.bizEcosystemApis.tmForum.services.path }} + {{- else }} + - name: BAE_CB_SERVICE_CATALOG + value: http://{{ include "bizEcosystemApis.fullhostname" . }} + {{- end }} + {{- if .Values.bizEcosystemApis.tmForum.resources }} + - name: BAE_CB_RESOURCE_CATALOG + value: http://{{ .Values.bizEcosystemApis.tmForum.resources.host }}:{{ .Values.bizEcosystemApis.tmForum.resources.port }}{{ .Values.bizEcosystemApis.tmForum.resources.path }} + {{- else }} + - name: BAE_CB_RESOURCE_CATALOG + value: http://{{ include "bizEcosystemApis.fullhostname" . }} + {{- end }} {{- if .Values.bizEcosystemApis.tmForum.inventory }} - name: BAE_CB_INVENTORY value: http://{{ .Values.bizEcosystemApis.tmForum.inventory.host }}:{{ .Values.bizEcosystemApis.tmForum.inventory.port }}{{ .Values.bizEcosystemApis.tmForum.inventory.path }} @@ -201,6 +215,20 @@ spec: - name: BAE_CB_INVENTORY value: http://{{ include "bizEcosystemApis.fullhostname" . }}/DSProductInventory {{- end }} + {{- if .Values.bizEcosystemApis.tmForum.serviceInventory }} + - name: BAE_CB_SERVICE_INVENTORY + value: http://{{ .Values.bizEcosystemApis.tmForum.serviceInventory.host }}:{{ .Values.bizEcosystemApis.tmForum.serviceInventory.port }}{{ .Values.bizEcosystemApis.tmForum.serviceInventory.path }} + {{- else }} + - name: BAE_CB_SERVICE_INVENTORY + value: http://{{ include "bizEcosystemApis.fullhostname" . }} + {{- end }} + {{- if .Values.bizEcosystemApis.tmForum.resourceInventory }} + - name: BAE_CB_RESOURCE_INVENTORY + value: http://{{ .Values.bizEcosystemApis.tmForum.resourceInventory.host }}:{{ .Values.bizEcosystemApis.tmForum.resourceInventory.port }}{{ .Values.bizEcosystemApis.tmForum.resourceInventory.path }} + {{- else }} + - name: BAE_CB_RESOURCE_INVENTORY + value: http://{{ include "bizEcosystemApis.fullhostname" . }} + {{- end }} {{- if .Values.bizEcosystemApis.tmForum.ordering }} - name: BAE_CB_ORDERING value: http://{{ .Values.bizEcosystemApis.tmForum.ordering.host }}:{{ .Values.bizEcosystemApis.tmForum.ordering.port }}{{ .Values.bizEcosystemApis.tmForum.ordering.path }} diff --git a/charts/business-api-ecosystem/templates/biz-ecosystem-logic-proxy/statefulset.yaml b/charts/business-api-ecosystem/templates/biz-ecosystem-logic-proxy/statefulset.yaml index d8f7f3d5..f241f171 100644 --- a/charts/business-api-ecosystem/templates/biz-ecosystem-logic-proxy/statefulset.yaml +++ b/charts/business-api-ecosystem/templates/biz-ecosystem-logic-proxy/statefulset.yaml @@ -178,6 +178,10 @@ spec: {{- if .Values.bizEcosystemLogicProxy.theme.enabled }} - name: BAE_LP_THEME value: {{ .Values.bizEcosystemLogicProxy.theme.name | quote }} + {{- if .Values.bizEcosystemLogicProxy.theme.url }} + - name: BAE_LP_THEME_URL + value: {{ .Values.bizEcosystemLogicProxy.theme.url | quote }} + {{- end }} {{- end }} - name: BAE_LP_REVENUE_MODEL value: {{ .Values.bizEcosystemLogicProxy.revenueModel | quote }} From 637dd97a6198f2047e0de01daf40257ca4245c20 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 17 May 2024 09:35:24 +0200 Subject: [PATCH 2/7] add initcontainers, additonal env, volumes and mounts (#252) * add initcontainers, additonal env, volumes and mounts * Update helm documentation * Update helm documentation * Update helm documentation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/business-api-ecosystem/README.md | 2 +- charts/scorpio-broker-aaio/Chart.yaml | 2 +- charts/scorpio-broker-aaio/README.md | 2 +- .../templates/deployment.yaml | 23 +++++++++++++++++++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/charts/business-api-ecosystem/README.md b/charts/business-api-ecosystem/README.md index 6c540044..c41e1008 100644 --- a/charts/business-api-ecosystem/README.md +++ b/charts/business-api-ecosystem/README.md @@ -1,6 +1,6 @@ # business-api-ecosystem -![Version: 0.10.0](https://img.shields.io/badge/Version-0.10.0-informational?style=flat-square) ![AppVersion: 8.0.0](https://img.shields.io/badge/AppVersion-8.0.0-informational?style=flat-square) +![Version: 0.11.0](https://img.shields.io/badge/Version-0.11.0-informational?style=flat-square) ![AppVersion: 9.0.1](https://img.shields.io/badge/AppVersion-9.0.1-informational?style=flat-square) A Helm chart for running the FIWARE business API ecosystem (FIWARE Marketplace) on Kubernetes diff --git a/charts/scorpio-broker-aaio/Chart.yaml b/charts/scorpio-broker-aaio/Chart.yaml index 4767bb4e..c9e4df77 100644 --- a/charts/scorpio-broker-aaio/Chart.yaml +++ b/charts/scorpio-broker-aaio/Chart.yaml @@ -14,7 +14,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.4.3 # 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/scorpio-broker-aaio/README.md b/charts/scorpio-broker-aaio/README.md index ce42bdff..5deb4ddc 100644 --- a/charts/scorpio-broker-aaio/README.md +++ b/charts/scorpio-broker-aaio/README.md @@ -1,6 +1,6 @@ # scorpio-broker-aaio -![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) +![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.0](https://img.shields.io/badge/AppVersion-2.1.0-informational?style=flat-square) A Helm chart for Kubernetes in which all the microservices are deployed under a single container and thus less effective for production environment but serves well in testing and dev environment. diff --git a/charts/scorpio-broker-aaio/templates/deployment.yaml b/charts/scorpio-broker-aaio/templates/deployment.yaml index 2549866b..c8b8c9c2 100644 --- a/charts/scorpio-broker-aaio/templates/deployment.yaml +++ b/charts/scorpio-broker-aaio/templates/deployment.yaml @@ -28,6 +28,12 @@ spec: serviceAccountName: {{ include "scorpioBroker-aaio.serviceAccountName" . }} securityContext: {{- toYaml .Values.podSecurityContext | nindent 8 }} + {{- if .Values.initContainers }} + initContainers: + {{- with .Values.initContainers }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} securityContext: @@ -85,8 +91,25 @@ spec: value: {{ .Values.kafka.busport | quote }} - name: QUARKUS_LOG_LEVEL value: {{ .Values.logging.level | quote }} + {{- if .Values.additionalEnvVars }} + {{- with .Values.additionalEnvVars }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }} + {{- if .Values.additionalVolumeMounts }} + volumeMounts: + {{- with .Values.additionalVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} + {{- end }} resources: {{- toYaml .Values.resources | nindent 12 }} + {{- if .Values.additionalVolumes }} + volumes: + {{- with .Values.additionalVolumes }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} From 7c327a8f00f5abc338c923ad191225c0cf728e3a Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 17 May 2024 12:39:31 +0200 Subject: [PATCH 3/7] update (#253) * add initcontainers, additonal env, volumes and mounts * update ccs * Update helm documentation * Update helm documentation * Update helm documentation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/credentials-config-service/Chart.yaml | 2 +- charts/credentials-config-service/README.md | 4 ++-- charts/credentials-config-service/values.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/credentials-config-service/Chart.yaml b/charts/credentials-config-service/Chart.yaml index 7b085856..0fd04199 100644 --- a/charts/credentials-config-service/Chart.yaml +++ b/charts/credentials-config-service/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: credentials-config-service -version: 0.1.2 +version: 0.1.5 appVersion: 0.0.1 description: A Helm chart for running the credentials-config-service on kubernetes. icon: https://fiware.github.io/catalogue/img/fiware.png diff --git a/charts/credentials-config-service/README.md b/charts/credentials-config-service/README.md index 049efc93..c1e7136d 100644 --- a/charts/credentials-config-service/README.md +++ b/charts/credentials-config-service/README.md @@ -1,6 +1,6 @@ # credentials-config-service -![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) A Helm chart for running the credentials-config-service on kubernetes. @@ -39,7 +39,7 @@ A Helm chart for running the credentials-config-service on kubernetes. | deployment.healthPort | int | `9090` | port to request health information at | | deployment.image.pullPolicy | string | `"IfNotPresent"` | specification of the image pull policy | | deployment.image.repository | string | `"quay.io/fiware/credentials-config-service"` | til image name ref: https://quay.io/repository/fiware/credentials-config-service | -| deployment.image.tag | string | `"0.0.1"` | tag of the image to be used | +| deployment.image.tag | string | `"1.0.1"` | tag of the image to be used | | deployment.livenessProbe.initialDelaySeconds | int | `30` | | | deployment.livenessProbe.periodSeconds | int | `10` | | | deployment.livenessProbe.successThreshold | int | `1` | | diff --git a/charts/credentials-config-service/values.yaml b/charts/credentials-config-service/values.yaml index 1466f00e..3e7165a4 100644 --- a/charts/credentials-config-service/values.yaml +++ b/charts/credentials-config-service/values.yaml @@ -44,7 +44,7 @@ deployment: # ref: https://quay.io/repository/fiware/credentials-config-service repository: quay.io/fiware/credentials-config-service # -- tag of the image to be used - tag: 0.0.1 + tag: 1.0.1 # -- specification of the image pull policy pullPolicy: IfNotPresent # -- additional labels for the deployment, if required From 4137f0cd64fd232a33447ee7dc2b176481c18791 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Fri, 24 May 2024 08:09:50 +0200 Subject: [PATCH 4/7] Update image (#255) * Update image * Update helm documentation * Update helm documentation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/vcverifier/Chart.yaml | 2 +- charts/vcverifier/values.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/vcverifier/Chart.yaml b/charts/vcverifier/Chart.yaml index bb16062e..96ff9fcf 100644 --- a/charts/vcverifier/Chart.yaml +++ b/charts/vcverifier/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: vcverifier -version: 2.5.0 +version: 2.5.2 appVersion: 2.0.1 home: https://github.com/fiware/vcverifier description: A Helm chart for running the FIWARE VCVerifier. diff --git a/charts/vcverifier/values.yaml b/charts/vcverifier/values.yaml index e13cc2ca..3b1aa50f 100644 --- a/charts/vcverifier/values.yaml +++ b/charts/vcverifier/values.yaml @@ -34,7 +34,7 @@ deployment: # -- image name repository: quay.io/fiware/vcverifier # -- tag of the image to be used - tag: 4.0.1 + tag: 4.1.0 # -- specification of the image pull policy pullPolicy: IfNotPresent # -- port to run the container at @@ -194,4 +194,4 @@ templates: # static: - enabled: false \ No newline at end of file + enabled: false From 444909147bf65b85a87fbbca799efbfef3728117 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Tue, 28 May 2024 13:48:02 +0200 Subject: [PATCH 5/7] Add args cmd (#256) * add initcontainers, additonal env, volumes and mounts * update ccs * args and ocmmand * Update helm documentation * Update helm documentation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/odrl-pap/Chart.yaml | 2 +- charts/odrl-pap/README.md | 4 +++- charts/odrl-pap/templates/deployment.yaml | 6 ++++++ charts/odrl-pap/values.yaml | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/charts/odrl-pap/Chart.yaml b/charts/odrl-pap/Chart.yaml index e11b1fb5..feaf6242 100644 --- a/charts/odrl-pap/Chart.yaml +++ b/charts/odrl-pap/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odrl-pap -version: 0.0.12 +version: 0.0.14 appVersion: 0.0.1 description: A Helm chart for running the odrl-pap on kubernetes. icon: https://fiware.github.io/catalogue/img/fiware.png diff --git a/charts/odrl-pap/README.md b/charts/odrl-pap/README.md index d853b63d..25183693 100644 --- a/charts/odrl-pap/README.md +++ b/charts/odrl-pap/README.md @@ -1,6 +1,6 @@ # odrl-pap -![Version: 0.0.12](https://img.shields.io/badge/Version-0.0.12-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) A Helm chart for running the odrl-pap on kubernetes. @@ -37,6 +37,8 @@ A Helm chart for running the odrl-pap on kubernetes. | deployment.additionalAnnotations | object | `{}` | additional annotations for the deployment, if required | | deployment.additionalLabels | object | `{}` | additional labels for the deployment, if required | | deployment.affinity | object | `{}` | affinity template ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity | +| deployment.args | string | `nil` | arguments to be set for the container | +| deployment.command | string | `nil` | command to be used for starting the container | | deployment.image.pullPolicy | string | `"IfNotPresent"` | specification of the image pull policy | | deployment.image.repository | string | `"quay.io/wi_stefan/odrl-pap"` | til image name ref: https://quay.io/repository/wistefan/odrl-pap | | deployment.image.tag | string | `"0.0.1"` | tag of the image to be used | diff --git a/charts/odrl-pap/templates/deployment.yaml b/charts/odrl-pap/templates/deployment.yaml index 5f89b0a6..8a28ce05 100644 --- a/charts/odrl-pap/templates/deployment.yaml +++ b/charts/odrl-pap/templates/deployment.yaml @@ -40,6 +40,12 @@ spec: - name: {{ .Chart.Name }} imagePullPolicy: {{ .Values.deployment.image.pullPolicy }} image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}" + {{- if .Values.deployment.command }} + command: {{ .Values.deployment.command }} + {{- end }} + {{- if .Values.deployment.args }} + command: {{ .Values.deployment.args }} + {{- end }} ports: - name: http containerPort: {{ .Values.deployment.port}} diff --git a/charts/odrl-pap/values.yaml b/charts/odrl-pap/values.yaml index e0a42fd8..61f7889c 100644 --- a/charts/odrl-pap/values.yaml +++ b/charts/odrl-pap/values.yaml @@ -85,6 +85,10 @@ deployment: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 30 + # -- arguments to be set for the container + args: + # -- command to be used for starting the container + command: ## pod autoscaling configuration, use for automatic scaling of the broker pods autoscaling: From c99934c96b10d0c0e01b36ad78f5b61e0f5cf785 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Tue, 28 May 2024 14:11:21 +0200 Subject: [PATCH 6/7] Add init containers (#257) * add initcontainers, additonal env, volumes and mounts * update ccs * args and ocmmand * additional volumes * Update helm documentation * Update helm documentation * Update helm documentation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/odrl-pap/Chart.yaml | 2 +- charts/odrl-pap/README.md | 4 +++- charts/odrl-pap/templates/deployment.yaml | 15 +++++++++++++++ charts/odrl-pap/values.yaml | 4 ++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/charts/odrl-pap/Chart.yaml b/charts/odrl-pap/Chart.yaml index feaf6242..82302578 100644 --- a/charts/odrl-pap/Chart.yaml +++ b/charts/odrl-pap/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odrl-pap -version: 0.0.14 +version: 0.0.17 appVersion: 0.0.1 description: A Helm chart for running the odrl-pap on kubernetes. icon: https://fiware.github.io/catalogue/img/fiware.png diff --git a/charts/odrl-pap/README.md b/charts/odrl-pap/README.md index 25183693..890659c7 100644 --- a/charts/odrl-pap/README.md +++ b/charts/odrl-pap/README.md @@ -1,6 +1,6 @@ # odrl-pap -![Version: 0.0.14](https://img.shields.io/badge/Version-0.0.14-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +![Version: 0.0.17](https://img.shields.io/badge/Version-0.0.17-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) A Helm chart for running the odrl-pap on kubernetes. @@ -36,6 +36,8 @@ A Helm chart for running the odrl-pap on kubernetes. | database.username | string | `"user"` | username to conncet the db - ignored if existing secret is configured | | deployment.additionalAnnotations | object | `{}` | additional annotations for the deployment, if required | | deployment.additionalLabels | object | `{}` | additional labels for the deployment, if required | +| deployment.additionalVolumeMounts | object | `{}` | additional volume mounts | +| deployment.additionalVolumes | object | `{}` | additional volumes to be added for the containers | | deployment.affinity | object | `{}` | affinity template ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity | | deployment.args | string | `nil` | arguments to be set for the container | | deployment.command | string | `nil` | command to be used for starting the container | diff --git a/charts/odrl-pap/templates/deployment.yaml b/charts/odrl-pap/templates/deployment.yaml index 8a28ce05..181dfdf5 100644 --- a/charts/odrl-pap/templates/deployment.yaml +++ b/charts/odrl-pap/templates/deployment.yaml @@ -36,6 +36,12 @@ spec: {{- end }} spec: serviceAccountName: {{ include "pap.serviceAccountName" . }} + {{- if .Values.deployment.initContainers }} + initContainers: + {{- with .Values.deployment.initContainers }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- end }} containers: - name: {{ .Chart.Name }} imagePullPolicy: {{ .Values.deployment.image.pullPolicy }} @@ -107,6 +113,10 @@ spec: - name: rego mountPath: /rego-packages {{- end }} + {{- if .Values.deployment.additionalVolumeMounts }} + {{- with .Values.deployment.additionalVolumeMounts }} + {{- toYaml . | nindent 12 }} + {{- end }} resources: {{- toYaml .Values.deployment.resources | nindent 12 }} volumes: @@ -120,6 +130,11 @@ spec: configMap: name: {{ include "pap.fullname" . }}-rego {{- end }} + {{- if .Values.deployment.additionalVolumes }} + {{- with .Values.deployment.additionalVolumes }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- end }} {{- with .Values.deployment.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/odrl-pap/values.yaml b/charts/odrl-pap/values.yaml index 61f7889c..345d255d 100644 --- a/charts/odrl-pap/values.yaml +++ b/charts/odrl-pap/values.yaml @@ -55,6 +55,10 @@ deployment: additionalLabels: {} # -- additional annotations for the deployment, if required additionalAnnotations: {} + # -- additional volume mounts + additionalVolumeMounts: {} + # -- additional volumes to be added for the containers + additionalVolumes: {} ## pap resource requests and limits, we leave the default empty to make that a concious choice by the user. ## for the autoscaling to make sense, you should configure this. # resources: From e7a163e06ab853a5ae739040695960046bf894d9 Mon Sep 17 00:00:00 2001 From: Stefan Wiedemann Date: Tue, 28 May 2024 14:21:24 +0200 Subject: [PATCH 7/7] Add init containers (#258) * add initcontainers, additonal env, volumes and mounts * update ccs * args and ocmmand * additional volumes * fix * Update helm documentation --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- charts/odrl-pap/Chart.yaml | 2 +- charts/odrl-pap/README.md | 6 +++--- charts/odrl-pap/values.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/charts/odrl-pap/Chart.yaml b/charts/odrl-pap/Chart.yaml index 82302578..6d1dad15 100644 --- a/charts/odrl-pap/Chart.yaml +++ b/charts/odrl-pap/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odrl-pap -version: 0.0.17 +version: 0.0.18 appVersion: 0.0.1 description: A Helm chart for running the odrl-pap on kubernetes. icon: https://fiware.github.io/catalogue/img/fiware.png diff --git a/charts/odrl-pap/README.md b/charts/odrl-pap/README.md index 890659c7..43cee205 100644 --- a/charts/odrl-pap/README.md +++ b/charts/odrl-pap/README.md @@ -1,6 +1,6 @@ # odrl-pap -![Version: 0.0.17](https://img.shields.io/badge/Version-0.0.17-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) +![Version: 0.0.18](https://img.shields.io/badge/Version-0.0.18-informational?style=flat-square) ![AppVersion: 0.0.1](https://img.shields.io/badge/AppVersion-0.0.1-informational?style=flat-square) A Helm chart for running the odrl-pap on kubernetes. @@ -36,8 +36,8 @@ A Helm chart for running the odrl-pap on kubernetes. | database.username | string | `"user"` | username to conncet the db - ignored if existing secret is configured | | deployment.additionalAnnotations | object | `{}` | additional annotations for the deployment, if required | | deployment.additionalLabels | object | `{}` | additional labels for the deployment, if required | -| deployment.additionalVolumeMounts | object | `{}` | additional volume mounts | -| deployment.additionalVolumes | object | `{}` | additional volumes to be added for the containers | +| deployment.additionalVolumeMounts | list | `[]` | additional volume mounts | +| deployment.additionalVolumes | list | `[]` | additional volumes to be added for the containers | | deployment.affinity | object | `{}` | affinity template ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity | | deployment.args | string | `nil` | arguments to be set for the container | | deployment.command | string | `nil` | command to be used for starting the container | diff --git a/charts/odrl-pap/values.yaml b/charts/odrl-pap/values.yaml index 345d255d..094c3b4e 100644 --- a/charts/odrl-pap/values.yaml +++ b/charts/odrl-pap/values.yaml @@ -56,9 +56,9 @@ deployment: # -- additional annotations for the deployment, if required additionalAnnotations: {} # -- additional volume mounts - additionalVolumeMounts: {} + additionalVolumeMounts: [] # -- additional volumes to be added for the containers - additionalVolumes: {} + additionalVolumes: [] ## pap resource requests and limits, we leave the default empty to make that a concious choice by the user. ## for the autoscaling to make sense, you should configure this. # resources: