bump version

.gitlab-ci.yml

@@ -13,16 +13,15 @@ version-bump-dev:
   before_script:
     - git config user.email 'renovate@nmaas.eu'
     - git config user.name 'NMaaS Renovate'
-    - git config pull.rebase true
+    # - git config pull.rebase true
   script:
     - git fetch
     - git checkout master
     - export MASTER_CHART_VERSION=$(yq e '.version' charts/$CHART_NAME/Chart.yaml)
     - git checkout $CI_COMMIT_REF_NAME
     - git branch --set-upstream-to=origin/$CI_COMMIT_REF_NAME $CI_COMMIT_REF_NAME
-    - git fetch origin $CI_COMMIT_REF_NAME
-    - git reset --hard origin/$CI_COMMIT_REF_NAME
     - git status
+    - git pull
     - export CURRENT_CHART_VERSION=$(yq e '.version' charts/$CHART_NAME/Chart.yaml)
     - export CURRENT_DOCKER_IMAGE_VERSION=$(yq e '.platform.image.tag' charts/$CHART_NAME/values.yaml)
     - export CURRENT_CHART_APP_VERSION=$(yq e '.appVersion' charts/$CHART_NAME/Chart.yaml)

charts/nmaas/templates/nmaas-platform-deployment.yaml

@@ -207,7 +207,7 @@ spec:
             value: {{ .Values.platform.properties.autoNamespaceCreationForDomains | quote }}
           - name: PORTAL_SSO_ALLOWED_FLAG
             value: {{ .Values.platform.properties.oidc.enabled | quote }}
-          {{- if .Values.properties.oidc.enabled }}
+          {{- if .Values.platform.properties.oidc.enabled }}
           - name: OIDC_CLIENT_ID
             value: {{ .Values.platform.properties.oidc.clientId | quote }}
           - name: OIDC_ISSUER_URI