Commit 032187b2 authored by Nikos Psaromanolakis's avatar Nikos Psaromanolakis
Browse files

Merge changes from develop

parents 84659e8d 16b55e67

.gitlab-ci.yml

+9 −0
Original line number Diff line number Diff line
@@ -380,6 +380,15 @@ update_values: 
      

        git status

        git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:develop



        git checkout gitops-cd

        git pull origin gitops-cd

        git fetch origin develop

        git merge origin/develop -m "Merge changes from develop"

      

        git status

        git push -f "https://${GITLAB_USER_NAME}:${GROUP_ACCESS_TOKEN}@labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.ops/installer.git" HEAD:gitops-cd



      else

        echo "No changes to commit."

      fi

charts/hypo/Chart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 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: '2026.6.30'

version: '2026.7.23'



# 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

charts/hypo/values.yaml

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ tmf-api: 
    repository: 

      labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.api/tmf/tmf-api-jvm

    pullPolicy: Always

    tag: "1.0.0"

    tag: "1.0.2"



  imagePullSecrets:

  - name: regcred
@@ -283,7 +283,7 @@ portal-cart: 
    repository: 

      labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.portal/cart/hypo-portal-jvm

    pullPolicy: Always

    tag: "1.0.0"

    tag: "1.0.1"



  imagePullSecrets:

  - name: regcred
@@ -377,7 +377,7 @@ peering-api: 
    repository: 

      labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.api/peering/peering-api-jvm

    pullPolicy: Always

    tag: "1.0.0"

    tag: "1.1.0"



  imagePullSecrets:

  - name: regcred
@@ -471,7 +471,7 @@ fabric-api: 
    repository: 

      labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.api/fabric/fabric-api-jvm

    pullPolicy: Always

    tag: "1.0.0"

    tag: "1.0.1"

  env:

    CONFIG_HYPO_DIAL_ROLE: "hypo_dial_x"

    FABRIC_POLLER_INTERVAL: "120s"