From 30e31d5e1a9ba501b7006ee9697f51a87989cc47 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 10:43:54 +0200 Subject: [PATCH 01/13] Added ocf-open-discover-service-api to helm --- helm/00_capif_monitoring/README.md | 21 --- helm/01_capif_db/README.md | 32 ----- helm/02_capif_db_express/README.md | 30 ----- helm/03_capif_commons/README.md | 33 +---- helm/04_capif_services/README.md | 23 +--- .../ocf-open-discover-service-api/.helmignore | 23 ++++ .../ocf-open-discover-service-api/Chart.yaml | 24 ++++ .../ocf-open-discover-service-api/README.md | 63 +++++++++ .../templates/NOTES.txt | 22 ++++ .../templates/_helpers.tpl | 62 +++++++++ .../templates/configmap.yaml | 28 ++++ .../templates/deployment.yaml | 80 ++++++++++++ .../templates/hpa.yaml | 32 +++++ .../templates/ingress.yaml | 61 +++++++++ .../templates/service.yaml | 15 +++ .../templates/serviceaccount.yaml | 13 ++ .../templates/tests/test-connection.yaml | 15 +++ .../ocf-open-discover-service-api/values.yaml | 122 ++++++++++++++++++ helm/05_capif_register/README.md | 34 +---- helm/scripts/04_install_capif_services.sh | 10 +- 20 files changed, 573 insertions(+), 170 deletions(-) create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/README.md create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml create mode 100644 helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml diff --git a/helm/00_capif_monitoring/README.md b/helm/00_capif_monitoring/README.md index 04814b5..4b0d293 100644 --- a/helm/00_capif_monitoring/README.md +++ b/helm/00_capif_monitoring/README.md @@ -11,26 +11,8 @@ A Helm chart to CAPIF in Kubernetes | | fluentbit | * | | | grafana | * | | | loki | * | -| | mock-server | * | -| | mongo | * | -| | mongo-express | * | -| | mongo-register | * | -| | mongo-register-express | * | | | nginx | * | -| | ocf-access-control-policy | * | -| | ocf-api-invocation-logs | * | -| | ocf-api-invoker-management | * | -| | ocf-api-provider-management | * | -| | ocf-auditing-api-logs | * | -| | ocf-discover-service-api | * | -| | ocf-events | * | -| | ocf-helper | * | -| | ocf-publish-service-api | * | -| | ocf-register | * | -| | ocf-routing-info | * | -| | ocf-security | * | | | otelcollector | * | -| | redis | * | | | renderer | * | | https://grafana.github.io/helm-charts | tempo | ^1.3.1 | @@ -41,9 +23,6 @@ A Helm chart to CAPIF in Kubernetes | fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed | | grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed | | loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed | -| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed | -| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed | -| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed | | otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed | | renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed | | tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed | diff --git a/helm/01_capif_db/README.md b/helm/01_capif_db/README.md index 04814b5..224578d 100644 --- a/helm/01_capif_db/README.md +++ b/helm/01_capif_db/README.md @@ -8,45 +8,13 @@ A Helm chart to CAPIF in Kubernetes | Repository | Name | Version | |------------|------|---------| -| | fluentbit | * | -| | grafana | * | -| | loki | * | -| | mock-server | * | | | mongo | * | -| | mongo-express | * | | | mongo-register | * | -| | mongo-register-express | * | -| | nginx | * | -| | ocf-access-control-policy | * | -| | ocf-api-invocation-logs | * | -| | ocf-api-invoker-management | * | -| | ocf-api-provider-management | * | -| | ocf-auditing-api-logs | * | -| | ocf-discover-service-api | * | -| | ocf-events | * | -| | ocf-helper | * | -| | ocf-publish-service-api | * | -| | ocf-register | * | -| | ocf-routing-info | * | -| | ocf-security | * | -| | otelcollector | * | -| | redis | * | -| | renderer | * | -| https://grafana.github.io/helm-charts | tempo | ^1.3.1 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed | -| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed | -| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed | -| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed | -| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed | -| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed | -| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed | -| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed | -| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/helm/02_capif_db_express/README.md b/helm/02_capif_db_express/README.md index 04814b5..d87ced2 100644 --- a/helm/02_capif_db_express/README.md +++ b/helm/02_capif_db_express/README.md @@ -8,45 +8,15 @@ A Helm chart to CAPIF in Kubernetes | Repository | Name | Version | |------------|------|---------| -| | fluentbit | * | -| | grafana | * | -| | loki | * | -| | mock-server | * | -| | mongo | * | | | mongo-express | * | -| | mongo-register | * | | | mongo-register-express | * | -| | nginx | * | -| | ocf-access-control-policy | * | -| | ocf-api-invocation-logs | * | -| | ocf-api-invoker-management | * | -| | ocf-api-provider-management | * | -| | ocf-auditing-api-logs | * | -| | ocf-discover-service-api | * | -| | ocf-events | * | -| | ocf-helper | * | -| | ocf-publish-service-api | * | -| | ocf-register | * | -| | ocf-routing-info | * | -| | ocf-security | * | -| | otelcollector | * | -| | redis | * | -| | renderer | * | -| https://grafana.github.io/helm-charts | tempo | ^1.3.1 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed | -| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed | -| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed | -| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed | | mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed | | mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed | -| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed | -| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed | -| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/helm/03_capif_commons/README.md b/helm/03_capif_commons/README.md index 04814b5..85514dd 100644 --- a/helm/03_capif_commons/README.md +++ b/helm/03_capif_commons/README.md @@ -8,45 +8,16 @@ A Helm chart to CAPIF in Kubernetes | Repository | Name | Version | |------------|------|---------| -| | fluentbit | * | -| | grafana | * | -| | loki | * | +| | celery-beat | * | +| | celery-worker | * | | | mock-server | * | -| | mongo | * | -| | mongo-express | * | -| | mongo-register | * | -| | mongo-register-express | * | -| | nginx | * | -| | ocf-access-control-policy | * | -| | ocf-api-invocation-logs | * | -| | ocf-api-invoker-management | * | -| | ocf-api-provider-management | * | -| | ocf-auditing-api-logs | * | -| | ocf-discover-service-api | * | -| | ocf-events | * | -| | ocf-helper | * | -| | ocf-publish-service-api | * | -| | ocf-register | * | -| | ocf-routing-info | * | -| | ocf-security | * | -| | otelcollector | * | | | redis | * | -| | renderer | * | -| https://grafana.github.io/helm-charts | tempo | ^1.3.1 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed | -| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed | -| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed | | mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed | -| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed | -| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed | -| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed | -| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed | -| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/helm/04_capif_services/README.md b/helm/04_capif_services/README.md index 04814b5..b6172cb 100644 --- a/helm/04_capif_services/README.md +++ b/helm/04_capif_services/README.md @@ -8,14 +8,6 @@ A Helm chart to CAPIF in Kubernetes | Repository | Name | Version | |------------|------|---------| -| | fluentbit | * | -| | grafana | * | -| | loki | * | -| | mock-server | * | -| | mongo | * | -| | mongo-express | * | -| | mongo-register | * | -| | mongo-register-express | * | | | nginx | * | | | ocf-access-control-policy | * | | | ocf-api-invocation-logs | * | @@ -23,30 +15,17 @@ A Helm chart to CAPIF in Kubernetes | | ocf-api-provider-management | * | | | ocf-auditing-api-logs | * | | | ocf-discover-service-api | * | +| | ocf-open-discover-service-api | * | | | ocf-events | * | | | ocf-helper | * | | | ocf-publish-service-api | * | -| | ocf-register | * | | | ocf-routing-info | * | | | ocf-security | * | -| | otelcollector | * | -| | redis | * | -| | renderer | * | -| https://grafana.github.io/helm-charts | tempo | ^1.3.1 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed | -| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed | -| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed | -| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed | -| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed | -| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed | -| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed | -| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed | -| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed | ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore b/helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore new file mode 100644 index 0000000..0e8a0eb --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml new file mode 100644 index 0000000..3d42681 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: ocf-open-discover-service-api +description: A Helm chart for Kubernetes of ocf-open-discover-service-api + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +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: 0.1.0 + +# 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. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/README.md b/helm/04_capif_services/charts/ocf-open-discover-service-api/README.md new file mode 100644 index 0000000..edef689 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/README.md @@ -0,0 +1,63 @@ +# ocf-open-discover-service-api + +![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.16.0](https://img.shields.io/badge/AppVersion-1.16.0-informational?style=flat-square) + +A Helm chart for Kubernetes of ocf-open-discover-service-api + +## Values + +| Key | Type | Default | Description | +|-----|------|---------|-------------| +| affinity | object | `{}` | | +| autoscaling.enabled | bool | `false` | | +| autoscaling.maxReplicas | int | `100` | | +| autoscaling.minReplicas | int | `1` | | +| autoscaling.targetCPUUtilizationPercentage | int | `80` | | +| env.logLevel | string | `"INFO"` | | +| env.mongoInitdbRootPassword | string | `"example"` | | +| env.mongoInitdbRootUsername | string | `"root"` | | +| env.monitoring | string | `"true"` | | +| fullnameOverride | string | `""` | | +| image.pullPolicy | string | `"Always"` | | +| image.repository | string | `"ocf-open-discover-service-api"` | | +| image.tag | string | `""` | | +| imagePullSecrets | list | `[]` | | +| ingress.annotations | object | `{}` | | +| ingress.className | string | `""` | | +| ingress.enabled | bool | `false` | | +| ingress.hosts[0].host | string | `"chart-example.local"` | | +| ingress.hosts[0].paths[0].path | string | `"/"` | | +| ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` | | +| ingress.tls | list | `[]` | | +| livenessProbe | string | `nil` | | +| nameOverride | string | `""` | | +| nodeSelector | object | `{}` | | +| podAnnotations | object | `{}` | | +| podLabels | object | `{}` | | +| podSecurityContext | object | `{}` | | +| readinessProbe.initialDelaySeconds | int | `5` | | +| readinessProbe.periodSeconds | int | `5` | | +| readinessProbe.tcpSocket.port | int | `8080` | | +| replicaCount | int | `1` | | +| resources.limits.cpu | string | `"100m"` | | +| resources.limits.memory | string | `"128Mi"` | | +| resources.requests.cpu | string | `"100m"` | | +| resources.requests.memory | string | `"128Mi"` | | +| securityContext | object | `{}` | | +| service.port | int | `8080` | | +| service.type | string | `"ClusterIP"` | | +| serviceAccount.annotations | object | `{}` | | +| serviceAccount.automount | bool | `true` | | +| serviceAccount.create | bool | `true` | | +| serviceAccount.name | string | `""` | | +| tolerations | list | `[]` | | +| volumeMounts[0].mountPath | string | `"/usr/src/app/config.yaml"` | | +| volumeMounts[0].name | string | `"capif-opendiscover-service-config"` | | +| volumeMounts[0].subPath | string | `"config.yaml"` | | +| volumes[0].configMap.items[0].key | string | `"config.yaml"` | | +| volumes[0].configMap.items[0].path | string | `"config.yaml"` | | +| volumes[0].configMap.name | string | `"capif-opendiscover-service-configmap"` | | +| volumes[0].name | string | `"capif-opendiscover-service-config"` | | + +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt new file mode 100644 index 0000000..c14d572 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "ocf-open-discover-service-api.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "ocf-open-discover-service-api.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "ocf-open-discover-service-api.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "ocf-open-discover-service-api.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl new file mode 100644 index 0000000..08b567f --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "ocf-open-discover-service-api.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "ocf-open-discover-service-api.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "ocf-open-discover-service-api.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "ocf-open-discover-service-api.labels" -}} +helm.sh/chart: {{ include "ocf-open-discover-service-api.chart" . }} +{{ include "ocf-open-discover-service-api.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "ocf-open-discover-service-api.selectorLabels" -}} +app.kubernetes.io/name: {{ include "ocf-open-discover-service-api.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "ocf-open-discover-service-api.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "ocf-open-discover-service-api.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml new file mode 100644 index 0000000..a68e053 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/configmap.yaml @@ -0,0 +1,28 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: capif-opendiscover-service-configmap +data: + config.yaml: | + mongo: { + 'user': '{{ .Values.env.mongoInitdbRootUsername }}', + 'password': '{{ .Values.env.mongoInitdbRootPassword }}', + 'db': 'capif', + 'col': 'serviceapidescriptions', + 'invokers_col': 'invokerdetails', + 'capif_users_col': 'user', + 'certs_col': 'certs', + 'host': 'mongo', + 'port': "27017" + } + + monitoring: { + "fluent_bit_host": fluent-bit, + "fluent_bit_port": 24224, + "opentelemetry_url": "otel-collector", + "opentelemetry_port": "55680", + "opentelemetry_max_queue_size": 8192, + "opentelemetry_schedule_delay_millis": 20000, + "opentelemetry_max_export_batch_size": 2048, + "opentelemetry_export_timeout_millis": 60000 + } \ No newline at end of file diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml new file mode 100644 index 0000000..22b810d --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/deployment.yaml @@ -0,0 +1,80 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "ocf-open-discover-service-api.fullname" . }} + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "ocf-open-discover-service-api.selectorLabels" . | nindent 6 }} + template: + metadata: + annotations: + date: "{{ now | unixEpoch }}" + checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 8 }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "ocf-open-discover-service-api.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP + env: + - name: CAPIF_HOSTNAME + value: {{ quote .Values.env.capifHostname }} + - name: MONITORING + value: {{ quote .Values.env.monitoring }} + - name: VAULT_HOSTNAME + value: {{ quote .Values.env.vaultHostname }} + - name: VAULT_PORT + value: {{ quote .Values.env.vaultPort }} + - name: VAULT_ACCESS_TOKEN + value: {{ quote .Values.env.vaultAccessToken }} + - name: LOG_LEVEL + value: {{ quote .Values.env.logLevel }} + livenessProbe: + {{- toYaml .Values.livenessProbe | nindent 12 }} + readinessProbe: + {{- toYaml .Values.readinessProbe | nindent 12 }} + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.volumeMounts }} + volumeMounts: + {{- toYaml . | nindent 12 }} + {{- end }} + {{- with .Values.volumes }} + volumes: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml new file mode 100644 index 0000000..ea87ab2 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/hpa.yaml @@ -0,0 +1,32 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "ocf-open-discover-service-api.fullname" . }} + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "ocf-open-discover-service-api.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml new file mode 100644 index 0000000..1715fcf --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "ocf-open-discover-service-api.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml new file mode 100644 index 0000000..9d98ea7 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: open-discover-service-apis + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "ocf-open-discover-service-api.selectorLabels" . | nindent 4 }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml new file mode 100644 index 0000000..7afa97c --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/serviceaccount.yaml @@ -0,0 +1,13 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "ocf-open-discover-service-api.serviceAccountName" . }} + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +automountServiceAccountToken: {{ .Values.serviceAccount.automount }} +{{- end }} diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml new file mode 100644 index 0000000..c76a8c3 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "ocf-open-discover-service-api.fullname" . }}-test-connection" + labels: + {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['open-discover-service-apis:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml new file mode 100644 index 0000000..e479015 --- /dev/null +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/values.yaml @@ -0,0 +1,122 @@ +# Default values for ocf-open-discover-service-api. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: ocf-open-discover-service-api + pullPolicy: Always + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +env: + monitoring: "true" + capifHostname: capif + vaultHostname: vault + vaultPort: 8200 + vaultAccessToken: dev-only-token + mongoInitdbRootUsername: root + mongoInitdbRootPassword: example + logLevel: "INFO" + + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Automatically mount a ServiceAccount's API credentials? + automount: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} +podLabels: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + limits: + cpu: 200m + memory: 256Mi + requests: + cpu: 1m + memory: 1Mi + +livenessProbe: +# httpGet: +# path: / +# port: http +readinessProbe: + tcpSocket: + port: 8080 + initialDelaySeconds: 5 + periodSeconds: 5 + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +# Additional volumes on the output Deployment definition. +volumes: + - name: capif-opendiscover-service-config + configMap: + name: capif-opendiscover-service-configmap + items: + - key: "config.yaml" + path: "config.yaml" + + +# Additional volumeMounts on the output Deployment definition. +volumeMounts: + - name: capif-opendiscover-service-config + mountPath: /usr/src/app/config.yaml + subPath: config.yaml + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/helm/05_capif_register/README.md b/helm/05_capif_register/README.md index 04814b5..af3a192 100644 --- a/helm/05_capif_register/README.md +++ b/helm/05_capif_register/README.md @@ -8,45 +8,13 @@ A Helm chart to CAPIF in Kubernetes | Repository | Name | Version | |------------|------|---------| -| | fluentbit | * | -| | grafana | * | -| | loki | * | -| | mock-server | * | -| | mongo | * | -| | mongo-express | * | -| | mongo-register | * | -| | mongo-register-express | * | -| | nginx | * | -| | ocf-access-control-policy | * | -| | ocf-api-invocation-logs | * | -| | ocf-api-invoker-management | * | -| | ocf-api-provider-management | * | -| | ocf-auditing-api-logs | * | -| | ocf-discover-service-api | * | -| | ocf-events | * | -| | ocf-helper | * | -| | ocf-publish-service-api | * | | | ocf-register | * | -| | ocf-routing-info | * | -| | ocf-security | * | -| | otelcollector | * | -| | redis | * | -| | renderer | * | -| https://grafana.github.io/helm-charts | tempo | ^1.3.1 | ## Values | Key | Type | Default | Description | |-----|------|---------|-------------| -| fluentbit | object | `{"enabled":false}` | With fluentbit.enabled: false. It won't be deployed | -| grafana | object | `{"enabled":false}` | With grafana.enabled: false. It won't be deployed | -| loki | object | `{"enabled":false}` | With loki.enabled: false. It won't be deployed | -| mock-server | object | `{"enabled":false}` | With mock-server.enabled: false. It won't be deployed | -| mongo-express | object | `{"enabled":false}` | With mongo-express.enabled: false. It won't be deployed | -| mongo-register-express | object | `{"enabled":false}` | With mongo-register-express.enabled: false. It won't be deployed | -| otelcollector | object | `{"enabled":false}` | With otelcollector.enabled: false. It won't be deployed | -| renderer | object | `{"enabled":false}` | With renderer.enabled: false. It won't be deployed | -| tempo | object | `{"enabled":true,"persistence":{"enabled":true,"size":"3Gi"},"tempo":{"metricsGenerator":{"enabled":true,"remoteWriteUrl":"http://prometheus.mon.svc.cluster.local:9090/api/v1/write"}}}` | With tempo.enabled: false. It won't be deployed | + ---------------------------------------------- Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/helm/scripts/04_install_capif_services.sh b/helm/scripts/04_install_capif_services.sh index b9bf4c2..2f53e5e 100755 --- a/helm/scripts/04_install_capif_services.sh +++ b/helm/scripts/04_install_capif_services.sh @@ -18,7 +18,7 @@ HELM_STEP_DIR="$HELM_DIR/04_capif_services" cat "$HELM_STEP_DIR/Chart.yaml" yq e -i ".appVersion = \"$CAPIF_IMAGE_TAG\"" "$HELM_STEP_DIR/Chart.yaml" cat "$HELM_STEP_DIR/Chart.yaml" -charts_04=("nginx" "ocf-access-control-policy" "ocf-api-invocation-logs" "ocf-api-invoker-management" "ocf-api-provider-management" "ocf-auditing-api-logs" "ocf-discover-service-api" "ocf-events" "ocf-helper" "ocf-publish-service-api" "ocf-routing-info" "ocf-security") +charts_04=("nginx" "ocf-access-control-policy" "ocf-api-invocation-logs" "ocf-api-invoker-management" "ocf-api-provider-management" "ocf-auditing-api-logs" "ocf-discover-service-api" "ocf-events" "ocf-helper" "ocf-publish-service-api" "ocf-routing-info" "ocf-security" "ocf-open-discover-service-api") for chart in "${charts_04[@]}"; do yq e -i ".appVersion = \"$CAPIF_IMAGE_TAG\"" "$HELM_STEP_DIR/charts/$chart/Chart.yaml" done @@ -93,6 +93,14 @@ install_capif_helm() { --set ocf-discover-service-api.image.tag=$CAPIF_IMAGE_TAG \ --set ocf-discover-service-api.env.monitoring="true" \ --set ocf-discover-service-api.env.logLevel="$LOG_LEVEL" \ + --set ocf-open-discover-service-api.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-open-discover-service-api \ + --set ocf-open-discover-service-api.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-open-discover-service-api.env.monitoring="true" \ + --set ocf-open-discover-service-api.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-open-discover-service-api.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --set ocf-open-discover-service-api.env.vaultPort=$VAULT_PORT \ + --set ocf-open-discover-service-api.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-open-discover-service-api.env.logLevel="$LOG_LEVEL" \ --set ocf-helper.image.repository=$CAPIF_DOCKER_REGISTRY/helper \ --set ocf-helper.image.tag=$CAPIF_IMAGE_TAG \ --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ -- GitLab From abaebf106c84f2be9327ae31cba2cd3a4183d0ad Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 11:04:19 +0200 Subject: [PATCH 02/13] pushed minor change --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8043aca..0c432af 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ - [FAQ Documentation](#faq-documentation) - # 3GPP Common API Framework OpenCAPIF implementation This repository includes all services developed using Python Flask servers, created with openapi-generator with swagger definitions on [Open API Descriptions of 3GPP 5G APIs] for release 18 of Technical Specifications. -- GitLab From 7ef85691a368271a437b8845fcf58755f3a0376a Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 11:42:34 +0200 Subject: [PATCH 03/13] No change --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 0c432af..8d4445b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,6 @@ - [Install and Run](#install-and-run) - [FAQ Documentation](#faq-documentation) - # 3GPP Common API Framework OpenCAPIF implementation This repository includes all services developed using Python Flask servers, created with openapi-generator with swagger definitions on [Open API Descriptions of 3GPP 5G APIs] for release 18 of Technical Specifications. -- GitLab From fa3b41c7648b4d82e37f96b99cd21b852adc1d7f Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 12:11:49 +0200 Subject: [PATCH 04/13] No change --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8d4445b..0c432af 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ - [Install and Run](#install-and-run) - [FAQ Documentation](#faq-documentation) + # 3GPP Common API Framework OpenCAPIF implementation This repository includes all services developed using Python Flask servers, created with openapi-generator with swagger definitions on [Open API Descriptions of 3GPP 5G APIs] for release 18 of Technical Specifications. -- GitLab From cadabb42639a3264e2484437772be1c924e96094 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 13:00:12 +0200 Subject: [PATCH 05/13] Setup complete cluster name for mongodb url --- helm/scripts/02_install_capif_db_express.sh | 6 ++++++ helm/scripts/variables.sh | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/helm/scripts/02_install_capif_db_express.sh b/helm/scripts/02_install_capif_db_express.sh index a11a4ad..792e026 100755 --- a/helm/scripts/02_install_capif_db_express.sh +++ b/helm/scripts/02_install_capif_db_express.sh @@ -39,11 +39,17 @@ install_capif_helm() { --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \ --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set mongo-register-express.meConfigMongodbAdminusername="$MONGO_DB_REGISTER_USER" \ + --set mongo-register-express.meConfigMongodbAdminpassword="$MONGO_DB_REGISTER_PASSWORD" \ + --set mongo-register-express.meConfigMongodbUrl="$MONGO_DB_REGISTER_INTERNAL_URL" \ --set mongo-express.enabled=true \ --set mongo-express.ingress.enabled=true \ --set mongo-express.ingress.hosts[0].host="mongo-express-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ --set mongo-express.ingress.hosts[0].paths[0].path="/" \ --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set mongo-express.meConfigMongodbAdminusername="$MONGO_DB_ADMIN_USER" \ + --set mongo-express.meConfigMongodbAdminpassword="$MONGO_DB_ADMIN_PASSWORD" \ + --set mongo-express.meConfigMongodbUrl="$MONGO_DB_INTERNAL_URL" \ --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}" } diff --git a/helm/scripts/variables.sh b/helm/scripts/variables.sh index 746719d..b0f137c 100755 --- a/helm/scripts/variables.sh +++ b/helm/scripts/variables.sh @@ -136,6 +136,14 @@ export CAPIF_OTELCOLLECTOR_ENABLED=true # special configuration for capif deployment +## Mongo DBs +export MONGO_DB_ADMIN_USER="root" +export MONGO_DB_ADMIN_PASSWORD="example" +export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo.$CAPIF_NAMESPACE.svc.cluster.local:27017/" +export MONGO_DB_REGISTER_ADMIN_USER="root" +export MONGO_DB_REGISTER_ADMIN_PASSWORD="example" +export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register.$CAPIF_NAMESPACE.svc.cluster.local:27017/" + ## Setup KUBECONFIG export KUBECONFIG=$CUSTOM_KUBECONFIG -- GitLab From 0ba38c874d28353393264f515943177b94351fc6 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 13:08:02 +0200 Subject: [PATCH 06/13] Setup complete cluster name for mongodb url --- helm/scripts/02_install_capif_db_express.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/helm/scripts/02_install_capif_db_express.sh b/helm/scripts/02_install_capif_db_express.sh index 792e026..6063beb 100755 --- a/helm/scripts/02_install_capif_db_express.sh +++ b/helm/scripts/02_install_capif_db_express.sh @@ -39,17 +39,17 @@ install_capif_helm() { --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \ --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \ - --set mongo-register-express.meConfigMongodbAdminusername="$MONGO_DB_REGISTER_USER" \ - --set mongo-register-express.meConfigMongodbAdminpassword="$MONGO_DB_REGISTER_PASSWORD" \ - --set mongo-register-express.meConfigMongodbUrl="$MONGO_DB_REGISTER_INTERNAL_URL" \ + --set mongo-register-express.env.meConfigMongodbAdminusername="$MONGO_DB_REGISTER_ADMIN_USER" \ + --set mongo-register-express.env.meConfigMongodbAdminpassword="$MONGO_DB_REGISTER_ADMIN_PASSWORD" \ + --set mongo-register-express.env.meConfigMongodbUrl="$MONGO_DB_REGISTER_INTERNAL_URL" \ --set mongo-express.enabled=true \ --set mongo-express.ingress.enabled=true \ --set mongo-express.ingress.hosts[0].host="mongo-express-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ --set mongo-express.ingress.hosts[0].paths[0].path="/" \ --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \ - --set mongo-express.meConfigMongodbAdminusername="$MONGO_DB_ADMIN_USER" \ - --set mongo-express.meConfigMongodbAdminpassword="$MONGO_DB_ADMIN_PASSWORD" \ - --set mongo-express.meConfigMongodbUrl="$MONGO_DB_INTERNAL_URL" \ + --set mongo-express.env.meConfigMongodbAdminusername="$MONGO_DB_ADMIN_USER" \ + --set mongo-express.env.meConfigMongodbAdminpassword="$MONGO_DB_ADMIN_PASSWORD" \ + --set mongo-express.env.meConfigMongodbUrl="$MONGO_DB_INTERNAL_URL" \ --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}" } -- GitLab From 65c539d04b6f15471268ec303441d02ff341896d Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 16:53:44 +0200 Subject: [PATCH 07/13] Setup post process db variables for mongo express --- helm/scripts/variables.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/helm/scripts/variables.sh b/helm/scripts/variables.sh index b0f137c..1fa3bfb 100755 --- a/helm/scripts/variables.sh +++ b/helm/scripts/variables.sh @@ -139,10 +139,8 @@ export CAPIF_OTELCOLLECTOR_ENABLED=true ## Mongo DBs export MONGO_DB_ADMIN_USER="root" export MONGO_DB_ADMIN_PASSWORD="example" -export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo.$CAPIF_NAMESPACE.svc.cluster.local:27017/" export MONGO_DB_REGISTER_ADMIN_USER="root" export MONGO_DB_REGISTER_ADMIN_PASSWORD="example" -export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register.$CAPIF_NAMESPACE.svc.cluster.local:27017/" ## Setup KUBECONFIG export KUBECONFIG=$CUSTOM_KUBECONFIG @@ -276,4 +274,8 @@ wait_chart() { echo " → Waiting rollout of $deploy ..." kubectl rollout status deployment/"$deploy" -n "$NAMESPACE" --timeout=300s done -} \ No newline at end of file +} + +# DB URLs +export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register.$CAPIF_NAMESPACE.svc.cluster.local:27017/" +export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo.$CAPIF_NAMESPACE.svc.cluster.local:27017/" -- GitLab From 95a8648e657cc3ce5ef300f1067a14362cb66dd8 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 17:29:09 +0200 Subject: [PATCH 08/13] Improve helm scripts related with mongo and mongo-express --- .../charts/mongo-register/templates/deployment.yaml | 7 ++++++- helm/01_capif_db/charts/mongo-register/values.yaml | 2 ++ helm/01_capif_db/charts/mongo/templates/deployment.yaml | 7 ++++++- helm/01_capif_db/charts/mongo/values.yaml | 2 +- .../charts/mongo-express/templates/deployment.yaml | 4 ++++ .../mongo-register-express/templates/deployment.yaml | 4 ++++ helm/scripts/01_install_capif_db.sh | 4 ++++ helm/scripts/variables.sh | 6 ++++-- 8 files changed, 31 insertions(+), 5 deletions(-) diff --git a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml index 442eee6..03fca38 100644 --- a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: http + - name: mongo containerPort: {{ .Values.service.port }} protocol: TCP env: @@ -45,6 +45,11 @@ spec: value: {{ quote .Values.env.mongoInitdbRootPassword }} - name: MONGO_INITDB_ROOT_USERNAME value: {{ quote .Values.env.mongoInitdbRootUsername }} + command: ["mongod"] + args: + - "--bind_ip_all" + - "--auth" + - "--fork=false" livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/01_capif_db/charts/mongo-register/values.yaml b/helm/01_capif_db/charts/mongo-register/values.yaml index d52301d..f331cdd 100644 --- a/helm/01_capif_db/charts/mongo-register/values.yaml +++ b/helm/01_capif_db/charts/mongo-register/values.yaml @@ -79,9 +79,11 @@ livenessProbe: # httpGet: # path: / # port: http + readinessProbe: tcpSocket: port: 27017 + initialDelaySeconds: 20 periodSeconds: 5 autoscaling: diff --git a/helm/01_capif_db/charts/mongo/templates/deployment.yaml b/helm/01_capif_db/charts/mongo/templates/deployment.yaml index 244693c..7e04939 100644 --- a/helm/01_capif_db/charts/mongo/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo/templates/deployment.yaml @@ -37,7 +37,7 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: http + - name: mongo containerPort: {{ .Values.service.port }} protocol: TCP env: @@ -45,6 +45,11 @@ spec: value: {{ quote .Values.env.mongoInitdbRootPassword }} - name: MONGO_INITDB_ROOT_USERNAME value: {{ quote .Values.env.mongoInitdbRootUsername }} + command: ["mongod"] + args: + - "--bind_ip_all" + - "--auth" + - "--fork=false" livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/01_capif_db/charts/mongo/values.yaml b/helm/01_capif_db/charts/mongo/values.yaml index 0ba34e9..bf8da3a 100644 --- a/helm/01_capif_db/charts/mongo/values.yaml +++ b/helm/01_capif_db/charts/mongo/values.yaml @@ -90,7 +90,7 @@ livenessProbe: readinessProbe: tcpSocket: port: 27017 -# initialDelaySeconds: 5 + initialDelaySeconds: 20 periodSeconds: 5 autoscaling: diff --git a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml index 32bda44..ad1e700 100644 --- a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml +++ b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml @@ -46,6 +46,10 @@ spec: value: {{ quote .Values.env.meConfigMongodbAdminpassword }} - name: ME_CONFIG_MONGODB_URL value: {{ quote .Values.env.meConfigMongodbUrl }} + - name: ME_CONFIG_CONNECT_RETRIES + value: "10" + - name: ME_CONFIG_CONNECT_RETRY_INTERVAL + value: "5000" livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml index d77c8bc..c743dd3 100644 --- a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml +++ b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml @@ -46,6 +46,10 @@ spec: value: {{ quote .Values.env.meConfigMongodbAdminusername }} - name: ME_CONFIG_MONGODB_URL value: {{ quote .Values.env.meConfigMongodbUrl }} + - name: ME_CONFIG_CONNECT_RETRIES + value: "10" + - name: ME_CONFIG_CONNECT_RETRY_INTERVAL + value: "5000" livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/scripts/01_install_capif_db.sh b/helm/scripts/01_install_capif_db.sh index addeee5..4b1aa66 100755 --- a/helm/scripts/01_install_capif_db.sh +++ b/helm/scripts/01_install_capif_db.sh @@ -39,6 +39,8 @@ install_capif_helm() { --set mongo-register.persistence.storageClass=$CAPIF_STORAGE_CLASS \ --set mongo-register.persistence.storage=$CAPIF_MONGO_REGISTER_STORAGE_SIZE \ --set mongo-register.extraFlags[0]="--repair" \ + --set mongo-register.env.mongoInitdbRootPassword="$MONGO_DB_REGISTER_ADMIN_PASSWORD" \ + --set mongo-register.env.mongoInitdbRootUsername="$MONGO_DB_REGISTER_ADMIN_USER" \ --set mongo.persistence.storageClass=$CAPIF_STORAGE_CLASS \ --set mongo.persistence.storage=$CAPIF_MONGO_STORAGE_SIZE \ --set mongo.extraFlags[0]="--repair" \ @@ -46,6 +48,8 @@ install_capif_helm() { --set mongo.image.tag=6.0.2 \ --set mongo.busybox.repository=$BASE_DOCKER_REGISTRY/busybox \ --set mongo.busybox.tag=1.37.0 \ + --set mongo.env.mongoInitdbRootPassword="$MONGO_DB_ADMIN_PASSWORD" \ + --set mongo.env.mongoInitdbRootUsername="$MONGO_DB_ADMIN_USER" \ --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}" } diff --git a/helm/scripts/variables.sh b/helm/scripts/variables.sh index 1fa3bfb..f87c6af 100755 --- a/helm/scripts/variables.sh +++ b/helm/scripts/variables.sh @@ -277,5 +277,7 @@ wait_chart() { } # DB URLs -export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register.$CAPIF_NAMESPACE.svc.cluster.local:27017/" -export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo.$CAPIF_NAMESPACE.svc.cluster.local:27017/" +# export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register.$CAPIF_NAMESPACE.svc.cluster.local:27017/" +# export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo.$CAPIF_NAMESPACE.svc.cluster.local:27017/" +export MONGO_DB_REGISTER_INTERNAL_URL="mongodb://$MONGO_DB_REGISTER_ADMIN_USER:$MONGO_DB_REGISTER_ADMIN_PASSWORD@mongo-register:27017/" +export MONGO_DB_INTERNAL_URL="mongodb://$MONGO_DB_ADMIN_USER:$MONGO_DB_ADMIN_PASSWORD@mongo:27017/" -- GitLab From c1684fe5599a246d17f8fd2efbfb6fc019be5b73 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 17:40:08 +0200 Subject: [PATCH 09/13] Add new args on deployment for mongo --- .../charts/mongo-register/templates/deployment.yaml | 10 +++++----- .../01_capif_db/charts/mongo/templates/deployment.yaml | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml index 03fca38..7aeece5 100644 --- a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml @@ -45,11 +45,11 @@ spec: value: {{ quote .Values.env.mongoInitdbRootPassword }} - name: MONGO_INITDB_ROOT_USERNAME value: {{ quote .Values.env.mongoInitdbRootUsername }} - command: ["mongod"] - args: - - "--bind_ip_all" - - "--auth" - - "--fork=false" + command: + - mongod + args: + - --bind_ip_all + - --auth livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/01_capif_db/charts/mongo/templates/deployment.yaml b/helm/01_capif_db/charts/mongo/templates/deployment.yaml index 7e04939..5da0d76 100644 --- a/helm/01_capif_db/charts/mongo/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo/templates/deployment.yaml @@ -45,11 +45,11 @@ spec: value: {{ quote .Values.env.mongoInitdbRootPassword }} - name: MONGO_INITDB_ROOT_USERNAME value: {{ quote .Values.env.mongoInitdbRootUsername }} - command: ["mongod"] - args: - - "--bind_ip_all" - - "--auth" - - "--fork=false" + command: + - mongod + args: + - --bind_ip_all + - --auth livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: -- GitLab From 8e2e6fdc848aaf1bf24334cc90f14e10bc14d1ea Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 11 May 2026 18:37:16 +0200 Subject: [PATCH 10/13] added new variables --- .../charts/mongo-register/templates/deployment.yaml | 8 ++++---- helm/01_capif_db/charts/mongo/templates/deployment.yaml | 8 ++++---- .../charts/mongo-express/templates/deployment.yaml | 6 ++++++ .../02_capif_db_express/charts/mongo-express/values.yaml | 4 ++++ .../mongo-register-express/templates/deployment.yaml | 6 ++++++ .../charts/mongo-register-express/values.yaml | 9 ++++++--- 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml index 7aeece5..6e8403e 100644 --- a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml @@ -41,10 +41,10 @@ spec: containerPort: {{ .Values.service.port }} protocol: TCP env: - - name: MONGO_INITDB_ROOT_PASSWORD - value: {{ quote .Values.env.mongoInitdbRootPassword }} - - name: MONGO_INITDB_ROOT_USERNAME - value: {{ quote .Values.env.mongoInitdbRootUsername }} + - name: MONGO_INITDB_ROOT_PASSWORD + value: {{ quote .Values.env.mongoInitdbRootPassword }} + - name: MONGO_INITDB_ROOT_USERNAME + value: {{ quote .Values.env.mongoInitdbRootUsername }} command: - mongod args: diff --git a/helm/01_capif_db/charts/mongo/templates/deployment.yaml b/helm/01_capif_db/charts/mongo/templates/deployment.yaml index 5da0d76..cc27bc5 100644 --- a/helm/01_capif_db/charts/mongo/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo/templates/deployment.yaml @@ -41,10 +41,10 @@ spec: containerPort: {{ .Values.service.port }} protocol: TCP env: - - name: MONGO_INITDB_ROOT_PASSWORD - value: {{ quote .Values.env.mongoInitdbRootPassword }} - - name: MONGO_INITDB_ROOT_USERNAME - value: {{ quote .Values.env.mongoInitdbRootUsername }} + - name: MONGO_INITDB_ROOT_PASSWORD + value: {{ quote .Values.env.mongoInitdbRootPassword }} + - name: MONGO_INITDB_ROOT_USERNAME + value: {{ quote .Values.env.mongoInitdbRootUsername }} command: - mongod args: diff --git a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml index ad1e700..82a1a4b 100644 --- a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml +++ b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml @@ -40,6 +40,12 @@ spec: containerPort: {{ .Values.service.targetPort }} protocol: TCP env: + - name: ME_CONFIG_MONGODB_ENABLE_ADMIN + value: {{ .Values.env.meConfigMongodbEnableAdmin }} + - name: ME_CONFIG_BASICAUTH_USERNAME + value: {{ quote .Values.env.meConfigBasicauthUsername }} + - name: ME_CONFIG_BASICAUTH_PASSWORD + value: {{ quote .Values.env.meConfigBasicauthPassword }} - name: ME_CONFIG_MONGODB_ADMINUSERNAME value: {{ quote .Values.env.meConfigMongodbAdminusername }} - name: ME_CONFIG_MONGODB_ADMINPASSWORD diff --git a/helm/02_capif_db_express/charts/mongo-express/values.yaml b/helm/02_capif_db_express/charts/mongo-express/values.yaml index 76ce47e..a6a6f45 100644 --- a/helm/02_capif_db_express/charts/mongo-express/values.yaml +++ b/helm/02_capif_db_express/charts/mongo-express/values.yaml @@ -17,9 +17,13 @@ nameOverride: "" fullnameOverride: "" env: + meConfigMongodbEnableAdmin: true + meConfigBasicauthUsername: admin + meConfigBasicauthPassword: admin meConfigMongodbAdminusername: root meConfigMongodbAdminpassword: example meConfigMongodbUrl: mongodb://root:example@mongo:27017/ + serviceAccount: # Specifies whether a service account should be created create: true diff --git a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml index c743dd3..2cd65e3 100644 --- a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml +++ b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml @@ -40,6 +40,12 @@ spec: containerPort: {{ .Values.service.targetPort }} protocol: TCP env: + - name: ME_CONFIG_MONGODB_ENABLE_ADMIN + value: {{ .Values.env.meConfigMongodbEnableAdmin }} + - name: ME_CONFIG_BASICAUTH_USERNAME + value: {{ quote .Values.env.meConfigBasicauthUsername }} + - name: ME_CONFIG_BASICAUTH_PASSWORD + value: {{ quote .Values.env.meConfigBasicauthPassword }} - name: ME_CONFIG_MONGODB_ADMINPASSWORD value: {{ quote .Values.env.meConfigMongodbAdminpassword }} - name: ME_CONFIG_MONGODB_ADMINUSERNAME diff --git a/helm/02_capif_db_express/charts/mongo-register-express/values.yaml b/helm/02_capif_db_express/charts/mongo-register-express/values.yaml index f174fbd..3178063 100644 --- a/helm/02_capif_db_express/charts/mongo-register-express/values.yaml +++ b/helm/02_capif_db_express/charts/mongo-register-express/values.yaml @@ -17,9 +17,12 @@ nameOverride: "" fullnameOverride: "" env: - meConfigMongodbAdminusername: root - meConfigMongodbAdminpassword: example - meConfigMongodbUrl: mongodb://root:example@mongo-register:27017/ + meConfigMongodbEnableAdmin: true + meConfigBasicauthUsername: admin + meConfigBasicauthPassword: admin + meConfigMongodbAdminusername: root + meConfigMongodbAdminpassword: example + meConfigMongodbUrl: mongodb://root:example@mongo-register:27017/ serviceAccount: # Specifies whether a service account should be created -- GitLab From febd598496f19449c9df950ce7e75cc8e1ba4c65 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 13 May 2026 10:59:49 +0200 Subject: [PATCH 11/13] Minor fixes --- .../mongo-register/templates/deployment.yaml | 15 +++++---------- .../01_capif_db/charts/mongo-register/values.yaml | 1 - .../charts/mongo/templates/deployment.yaml | 15 +++++---------- helm/01_capif_db/charts/mongo/values.yaml | 1 - .../mongo-express/templates/deployment.yaml | 2 +- .../templates/deployment.yaml | 2 +- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml index 6e8403e..442eee6 100644 --- a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml @@ -37,19 +37,14 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: mongo + - name: http containerPort: {{ .Values.service.port }} protocol: TCP env: - - name: MONGO_INITDB_ROOT_PASSWORD - value: {{ quote .Values.env.mongoInitdbRootPassword }} - - name: MONGO_INITDB_ROOT_USERNAME - value: {{ quote .Values.env.mongoInitdbRootUsername }} - command: - - mongod - args: - - --bind_ip_all - - --auth + - name: MONGO_INITDB_ROOT_PASSWORD + value: {{ quote .Values.env.mongoInitdbRootPassword }} + - name: MONGO_INITDB_ROOT_USERNAME + value: {{ quote .Values.env.mongoInitdbRootUsername }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/01_capif_db/charts/mongo-register/values.yaml b/helm/01_capif_db/charts/mongo-register/values.yaml index f331cdd..02a9181 100644 --- a/helm/01_capif_db/charts/mongo-register/values.yaml +++ b/helm/01_capif_db/charts/mongo-register/values.yaml @@ -83,7 +83,6 @@ livenessProbe: readinessProbe: tcpSocket: port: 27017 - initialDelaySeconds: 20 periodSeconds: 5 autoscaling: diff --git a/helm/01_capif_db/charts/mongo/templates/deployment.yaml b/helm/01_capif_db/charts/mongo/templates/deployment.yaml index cc27bc5..244693c 100644 --- a/helm/01_capif_db/charts/mongo/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo/templates/deployment.yaml @@ -37,19 +37,14 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - - name: mongo + - name: http containerPort: {{ .Values.service.port }} protocol: TCP env: - - name: MONGO_INITDB_ROOT_PASSWORD - value: {{ quote .Values.env.mongoInitdbRootPassword }} - - name: MONGO_INITDB_ROOT_USERNAME - value: {{ quote .Values.env.mongoInitdbRootUsername }} - command: - - mongod - args: - - --bind_ip_all - - --auth + - name: MONGO_INITDB_ROOT_PASSWORD + value: {{ quote .Values.env.mongoInitdbRootPassword }} + - name: MONGO_INITDB_ROOT_USERNAME + value: {{ quote .Values.env.mongoInitdbRootUsername }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/01_capif_db/charts/mongo/values.yaml b/helm/01_capif_db/charts/mongo/values.yaml index bf8da3a..c170b1e 100644 --- a/helm/01_capif_db/charts/mongo/values.yaml +++ b/helm/01_capif_db/charts/mongo/values.yaml @@ -90,7 +90,6 @@ livenessProbe: readinessProbe: tcpSocket: port: 27017 - initialDelaySeconds: 20 periodSeconds: 5 autoscaling: diff --git a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml index 82a1a4b..13bba03 100644 --- a/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml +++ b/helm/02_capif_db_express/charts/mongo-express/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: protocol: TCP env: - name: ME_CONFIG_MONGODB_ENABLE_ADMIN - value: {{ .Values.env.meConfigMongodbEnableAdmin }} + value: {{ quote .Values.env.meConfigMongodbEnableAdmin }} - name: ME_CONFIG_BASICAUTH_USERNAME value: {{ quote .Values.env.meConfigBasicauthUsername }} - name: ME_CONFIG_BASICAUTH_PASSWORD diff --git a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml index 2cd65e3..2e93bca 100644 --- a/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml +++ b/helm/02_capif_db_express/charts/mongo-register-express/templates/deployment.yaml @@ -41,7 +41,7 @@ spec: protocol: TCP env: - name: ME_CONFIG_MONGODB_ENABLE_ADMIN - value: {{ .Values.env.meConfigMongodbEnableAdmin }} + value: {{ quote .Values.env.meConfigMongodbEnableAdmin }} - name: ME_CONFIG_BASICAUTH_USERNAME value: {{ quote .Values.env.meConfigBasicauthUsername }} - name: ME_CONFIG_BASICAUTH_PASSWORD -- GitLab From e853270c51b5318821615e80520620863f5bf0da Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 13 May 2026 11:13:17 +0200 Subject: [PATCH 12/13] Minor fixes --- .../charts/mongo-register/templates/deployment.yaml | 8 ++++---- helm/01_capif_db/charts/mongo/templates/deployment.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml index 442eee6..d2432c1 100644 --- a/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo-register/templates/deployment.yaml @@ -41,10 +41,10 @@ spec: containerPort: {{ .Values.service.port }} protocol: TCP env: - - name: MONGO_INITDB_ROOT_PASSWORD - value: {{ quote .Values.env.mongoInitdbRootPassword }} - - name: MONGO_INITDB_ROOT_USERNAME - value: {{ quote .Values.env.mongoInitdbRootUsername }} + - name: MONGO_INITDB_ROOT_PASSWORD + value: {{ quote .Values.env.mongoInitdbRootPassword }} + - name: MONGO_INITDB_ROOT_USERNAME + value: {{ quote .Values.env.mongoInitdbRootUsername }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: diff --git a/helm/01_capif_db/charts/mongo/templates/deployment.yaml b/helm/01_capif_db/charts/mongo/templates/deployment.yaml index 244693c..bf43c77 100644 --- a/helm/01_capif_db/charts/mongo/templates/deployment.yaml +++ b/helm/01_capif_db/charts/mongo/templates/deployment.yaml @@ -41,10 +41,10 @@ spec: containerPort: {{ .Values.service.port }} protocol: TCP env: - - name: MONGO_INITDB_ROOT_PASSWORD - value: {{ quote .Values.env.mongoInitdbRootPassword }} - - name: MONGO_INITDB_ROOT_USERNAME - value: {{ quote .Values.env.mongoInitdbRootUsername }} + - name: MONGO_INITDB_ROOT_PASSWORD + value: {{ quote .Values.env.mongoInitdbRootPassword }} + - name: MONGO_INITDB_ROOT_USERNAME + value: {{ quote .Values.env.mongoInitdbRootUsername }} livenessProbe: {{- toYaml .Values.livenessProbe | nindent 12 }} readinessProbe: -- GitLab From 00b8d32edf86246a6b4309a58deb1d1af275e22e Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 13 May 2026 11:24:47 +0200 Subject: [PATCH 13/13] Minor fixes --- .../charts/ocf-open-discover-service-api/templates/service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml index 9d98ea7..c36f55b 100644 --- a/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml +++ b/helm/04_capif_services/charts/ocf-open-discover-service-api/templates/service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: open-discover-service-apis + name: open-api-disc labels: {{- include "ocf-open-discover-service-api.labels" . | nindent 4 }} spec: -- GitLab