Skip to content

Commit

Permalink
Merge branch 'main' into add-init-containers
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Wiedemann authored May 28, 2024
2 parents 04c1a66 + e7a163e commit 5713e2a
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 13 deletions.
4 changes: 2 additions & 2 deletions charts/business-api-ecosystem/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/business-api-ecosystem/README.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,13 +194,41 @@ 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 }}
{{- else }}
- 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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/credentials-config-service/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/credentials-config-service/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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` | |
Expand Down
2 changes: 1 addition & 1 deletion charts/odrl-pap/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: odrl-pap
version: 0.0.12
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
Expand Down
6 changes: 5 additions & 1 deletion charts/odrl-pap/README.md
Original file line number Diff line number Diff line change
@@ -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.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.

Expand Down Expand Up @@ -36,7 +36,11 @@ 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 | 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 |
| 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 |
Expand Down
2 changes: 1 addition & 1 deletion charts/scorpio-broker-aaio/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion charts/scorpio-broker-aaio/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion charts/vcverifier/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions charts/vcverifier/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -194,4 +194,4 @@ templates:
# </main>

static:
enabled: false
enabled: false

0 comments on commit 5713e2a

Please sign in to comment.