[REL4 MR] Merge staging into main branch for Release 4

Jorge Moratinosrequested to merge
staging into main

Proposers

  • Jorge Moratinos Salcines (Telefónica).

Description

This MR is created to merge staging content into main branch in order to create a new Release 4

Acknowledgements

This work is funded by the European Commission through the project with Grant Agreement number . example HORIZON-JU-SNS-2022 FLEX-SCALE project with Grant Agreement number 101096909.

Merge request reports

helm/capif/charts/mongo/templates/deployment.yaml

+1 −1
Changes for helm/capif/charts/mongo/templates/deployment.yaml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ spec: 
            {{- toYaml . | nindent 12 }}

          {{- end }}

        - name: mongo-helper

          image: busybox

          image: "{{ .Values.busybox.repository }}:{{ .Values.busybox.tag | default .Chart.AppVersion }}"

          command:

            - sh

            - -c

helm/capif/charts/mongo/values.yaml

+6 −0
Changes for helm/capif/charts/mongo/values.yaml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ image: 
  # Overrides the image tag whose default is the chart appVersion.

  tag: "6.0.2"



busybox:

  repository: busybox

  pullPolicy: Always

  # Overrides the image tag whose default is the chart appVersion.

  tag: "1.37.0"



imagePullSecrets: []

nameOverride: ""

fullnameOverride: ""

helm/capif/charts/ocf-helper/templates/ocf-helper-configmap.yaml

+15 −0
Changes for helm/capif/charts/ocf-helper/templates/ocf-helper-configmap.yaml: 15 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -27,3 +27,18 @@ data: 
    {{- if .Values.capifConfiguration }}

    capif_configuration: {{ .Values.capifConfiguration | toYaml | nindent 6 }}

    {{- end }}



    package_paths: {

      "helper_api": {

        "path": "/api",

        "openapi_file": "api/openapi/openapi.yaml"

      },

      "configuration_api": {

        "path": "/configuration",

        "openapi_file": "configuration/openapi/openapi.yaml"

      },

      "visibility_control": {

        "path": "/visibility-control",

        "openapi_file": "visibility_control/openapi/openapi.yaml"

      }

    }
 
 No newline at end of file

helm/capif/charts/ocf-register/templates/deployment.yaml

+2 −0
Changes for helm/capif/charts/ocf-register/templates/deployment.yaml: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ spec: 
              value: {{ quote .Values.env.logLevel }}

            - name: TIMEOUT

              value: {{ quote .Values.env.timeout }}

            - name: REGISTER_HOSTNAME

              value: {{ quote .Values.env.registerHostname }}

          livenessProbe:

            {{- toYaml .Values.livenessProbe | nindent 12 }}

          readinessProbe:

helm/capif/charts/ocf-register/values.yaml

+1 −0
Changes for helm/capif/charts/ocf-register/values.yaml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ env: 
  vaultPort: 8200

  vaultAccessToken: dev-only-token

  capifHostname: capif-test.example.int

  registerHostname: register

  logLevel: "INFO"

  timeout: "30"