diff --git a/charts/tm-forum-api/Chart.yaml b/charts/tm-forum-api/Chart.yaml index 6acd7510..3a5d0f86 100644 --- a/charts/tm-forum-api/Chart.yaml +++ b/charts/tm-forum-api/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: tm-forum-api -version: 0.17.12 -appVersion: 1.15.1 +version: 0.17.14 +appVersion: 1.16.2 kubeVersion: '>= 1.19-0' home: https://github.com/FIWARE/tmforum-api description: A Helm chart for running the FIWARE TMForum-APIs @@ -19,7 +19,7 @@ annotations: # The `common` library chart ships every shared helper # (names, labels, service-account resolution, existing-secret # resolution, service/ingress/route/HPA/secret/serviceaccount -# bodies). +# bodies). dependencies: - name: common repository: "https://fiware.github.io/helm-charts" diff --git a/charts/tm-forum-api/README.md b/charts/tm-forum-api/README.md index 05c74c1a..b1d75d79 100644 --- a/charts/tm-forum-api/README.md +++ b/charts/tm-forum-api/README.md @@ -1,6 +1,6 @@ # tm-forum-api -![Version: 0.17.12](https://img.shields.io/badge/Version-0.17.12-informational?style=flat-square) ![AppVersion: 1.15.1](https://img.shields.io/badge/AppVersion-1.15.1-informational?style=flat-square) +![Version: 0.17.14](https://img.shields.io/badge/Version-0.17.14-informational?style=flat-square) ![AppVersion: 1.16.2](https://img.shields.io/badge/AppVersion-1.16.2-informational?style=flat-square) A Helm chart for running the FIWARE TMForum-APIs ## Maintainers @@ -112,6 +112,7 @@ For all untouched values, the customized deployement will still use the defaults | defaultConfig.cache.subscriptions.expireAfterWrite | string | `"14d"` | how fast should the cache entry expire after it was written? | | defaultConfig.cache.subscriptions.maximumSize | int | `1000` | maximum size of the cache | | defaultConfig.contextUrl | string | `"https://smartdatamodels.org/context.jsonld"` | default context to be used when contacting the context broker | +| defaultConfig.countHeader | string | `nil` | Name of the response header the target NGSI-LD broker uses to report the total number of entities matching a query. Default NGSILD-Results-Count | | defaultConfig.endpointsPort | int | `9090` | metrics and health port | | defaultConfig.image | object | `{"pullPolicy":"IfNotPresent","repository":"quay.io/fiware","tag":""}` | configuration to be used for the image of the container | | defaultConfig.image.pullPolicy | string | `"IfNotPresent"` | pull policy to be used | @@ -139,6 +140,7 @@ For all untouched values, the customized deployement will still use the defaults | defaultConfig.readinessProbe.readinessPath | string | `"/health/readiness"` | path to be used for the health check | | defaultConfig.readinessProbe.successThreshold | int | `1` | | | defaultConfig.readinessProbe.timeoutSeconds | int | `30` | | +| defaultConfig.replaceOnUpdate | string | `nil` | When true, updateDomainEntity uses batchEntityUpsert replace (read-merge-write) instead of PATCH /attrs. Required for Scorpio 6.x which appends to array attributes on PATCH. Default false | | defaultConfig.replicaCount | int | `1` | initial number of target replications, can be different if autoscaling is enabled | | defaultConfig.resources | object | `{}` | tmforum 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. | | defaultConfig.revisionHistoryLimit | int | `3` | number of old replicas to be retained | @@ -178,7 +180,7 @@ For all untouched values, the customized deployement will still use the defaults | service.annotations | object | `{}` | addtional annotations, if required | | service.port | int | `8080` | port to be used by the service | | service.type | string | `"ClusterIP"` | service type | -| serviceAccount | object | `{"create":false}` | if a tmforum specific service account should be used, it can be configured here ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ | +| serviceAccount | object | `{"create":false}` | if a tmforum specific service account should be used, it can be configured here ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ | | serviceAccount.create | bool | `false` | specifies if the account should be created | ---------------------------------------------- diff --git a/charts/tm-forum-api/templates/deploy-all-in-one.yaml b/charts/tm-forum-api/templates/deploy-all-in-one.yaml index ff1a7fb0..9bddaa49 100644 --- a/charts/tm-forum-api/templates/deploy-all-in-one.yaml +++ b/charts/tm-forum-api/templates/deploy-all-in-one.yaml @@ -123,7 +123,14 @@ spec: - name: GENERAL_SERVER_HOST value: {{ $.Values.defaultConfig.serverHost | quote }} {{- end }} - + {{- if $.Values.defaultConfig.countHeader }} + - name: GENERAL_COUNT_HEADER + value: {{ $.Values.defaultConfig.countHeader | quote }} + {{- end }} + {{- if $.Values.defaultConfig.replaceOnUpdate }} + - name: GENERAL_REPLACE_ON_UPDATE + value: {{ $.Values.defaultConfig.replaceOnUpdate | quote }} + {{- end }} {{- if $.Values.redis.enabled }} - name: MICRONAUT_ENVIRONMENTS value: redis diff --git a/charts/tm-forum-api/templates/deployment.yaml b/charts/tm-forum-api/templates/deployment.yaml index 9a30434d..a61f3efb 100644 --- a/charts/tm-forum-api/templates/deployment.yaml +++ b/charts/tm-forum-api/templates/deployment.yaml @@ -224,7 +224,14 @@ spec: - name: GENERAL_SERVER_HOST value: {{ $.Values.defaultConfig.serverHost | quote }} {{- end }} - + {{- if $.Values.defaultConfig.countHeader }} + - name: GENERAL_COUNT_HEADER + value: {{ $.Values.defaultConfig.countHeader | quote }} + {{- end }} + {{- if $.Values.defaultConfig.replaceOnUpdate }} + - name: GENERAL_REPLACE_ON_UPDATE + value: {{ $.Values.defaultConfig.replaceOnUpdate | quote }} + {{- end }} {{- if $.Values.redis.enabled }} - name: MICRONAUT_ENVIRONMENTS value: redis diff --git a/charts/tm-forum-api/values.yaml b/charts/tm-forum-api/values.yaml index f2b20103..213b324e 100644 --- a/charts/tm-forum-api/values.yaml +++ b/charts/tm-forum-api/values.yaml @@ -1,4 +1,4 @@ -## Default values for tmforum. +## Default values for tmforum. ## This is a YAML-formatted file. ## Declare variables to be passed into your templates. @@ -7,7 +7,7 @@ nameOverride: "" # -- option to override the fullname config in the _helpers.tpl fullnameOverride: "" -# -- if a tmforum specific service account should be used, it can be configured here +# -- if a tmforum specific service account should be used, it can be configured here # ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ serviceAccount: # -- specifies if the account should be created @@ -65,7 +65,7 @@ ingress: # kubernetes.io/tls-acme: "true" # ingress.kubernetes.io/ssl-redirect: "true" # -- all hosts to be provided - hosts: + hosts: # -- provide a hosts and the paths that should be available - host: localhost # paths: @@ -137,7 +137,7 @@ defaultConfig: failureThreshold: 3 timeoutSeconds: 30 # -- a list of additional env vars to be set, check the tm-forum api docu for all available options - additionalEnvVars: + additionalEnvVars: - name: API_EXTENSION_ENABLED value: "true" @@ -194,7 +194,10 @@ defaultConfig: # -- address of the broker url: http://context-broker:1026 - + # -- Name of the response header the target NGSI-LD broker uses to report the total number of entities matching a query. Default NGSILD-Results-Count + countHeader: + # -- When true, updateDomainEntity uses batchEntityUpsert replace (read-merge-write) instead of PATCH /attrs. Required for Scorpio 6.x which appends to array attributes on PATCH. Default false + replaceOnUpdate: ## configuration for the k8s service to access tmforum service: # -- service type @@ -205,7 +208,7 @@ service: annotations: {} -## configuration for the api proxy, to serve all apis through one kubernetes service +## configuration for the api proxy, to serve all apis through one kubernetes service apiProxy: # -- should the proxy be deployed? enabled: false @@ -220,7 +223,7 @@ apiProxy: # -- configuration for the proxy service service: # -- name to be used for the proxy service. - nameOverride: + nameOverride: # -- service type type: ClusterIP # -- port to be used by the service