Merge pull request #138 from Calcagiara/0.9.x

Merge request for 0.9.x

.github/conventionalchangelog/config.json

@@ -0,0 +1,39 @@
+{
+    "options": {
+      "preset": {
+        "name": "@dslab/conventionalcommits-helm",
+        "types": [
+            { "type": "feat", "scope": "aac", "hidden": true },
+            { "type": "fix", "scope": "aac", "hidden": true },
+            { "type": "bump", "scope": "aac", "hidden": true},
+            { "type": "feature", "scope": "aac", "hidden": true},
+            { "type": "perf", "scope": "aac", "hidden": true},
+            { "type": "revert", "scope": "aac", "hidden": true},
+            { "type": "docs", "scope": "aac", "hidden": true},
+            { "type": "style", "scope": "aac", "hidden": true},
+            { "type": "chore", "scope": "aac", "hidden": true},
+            { "type": "refactor", "scope": "aac", "hidden": true},
+            { "type": "test", "scope": "aac", "hidden": true},
+            { "type": "build", "scope": "aac", "hidden": true},
+            { "type": "ci", "scope": "aac", "hidden": true},
+            { "type": "feat", "scope": "test", "hidden": true },
+            { "type": "fix", "scope": "test", "hidden": true },
+            { "type": "feat", "scope": "tests", "hidden": true },
+            { "type": "fix", "scope": "tests", "hidden": true },
+            { "type": "bump", "section": "New version"},
+            { "type": "feat", "section": "Features" },
+            { "type": "feature", "section": "Features" },
+            { "type": "fix", "section": "Bug Fixes" },
+            { "type": "perf", "section": "Performance Improvements" },
+            { "type": "revert", "section": "Reverts" },
+            { "type": "docs", "section": "Documentation"},
+            { "type": "style", "section": "Styles"},
+            { "type": "chore", "section": "Miscellaneous Chores"},
+            { "type": "refactor", "section": "Code Refactoring"},
+            { "type": "test", "section": "Tests"},
+            { "type": "build", "section": "Build System"},
+            { "type": "ci", "section": "Continuous Integration"}
+        ]
+      }
+    }
+  }

.github/workflows/release.yaml

@@ -32,6 +32,28 @@ jobs:
           git config user.name "$GITHUB_ACTOR"
           git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
 
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 'latest'
+
+      - name: Install conventional-changelog
+        run: npm install -g conventional-changelog-cli
+
+      - name: Install changelog preset
+        run: npm install -g @dslab/conventional-changelog-conventionalcommits-helm
+
+      - name: Generate changelogs
+        run: |
+          for chart in charts/*; do
+            tag=${chart//"charts/"/}
+            if [ ${tag} != "digitalhub" ]; then
+              conventional-changelog -p @dslab/conventionalcommits-helm -i ${chart}/CHANGELOG.md -s -r 1 -t ${tag}- --commit-path ${chart}
+            else
+              conventional-changelog -p @dslab/conventionalcommits-helm -i ${chart}/CHANGELOG.md -s -r 1 -t ${tag}- -n .github/conventionalchangelog/config.json
+            fi
+          done
+
       - name: Set up Helm
         uses: Azure/setup-helm@v4
         with:
@@ -56,7 +78,8 @@ jobs:
         uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          CR_GENERATE_RELEASE_NOTES: true
+          CR_GENERATE_RELEASE_NOTES: false
+          CR_RELEASE_NOTES_FILE: CHANGELOG.md
           CR_SKIP_EXISTING: true
 
       # see https://github.com/helm/chart-releaser/issues/183

charts/core/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: core
 description: Core backend application for DigitalHub.
 type: application
-version: 0.2.18
+version: 0.2.19
 appVersion: "0.8.0"
 maintainers:
   - name: ffais

charts/core/templates/configmap.yaml

@@ -67,6 +67,8 @@ data:
   JWT_KEYSTORE_PATH: "{{ .Values.keystore.keystorePath }}/keystore.jwks"
   JWT_KEYSTORE_KID: {{ .Values.keystore.keystoreKid | quote }}
 {{- end }}
+  JWT_ACCESS_TOKEN_DURATION: {{ .Values.coreTokens.accessTokenDuration | quote }}
+  JWT_REFRESH_TOKEN_DURATION: {{ .Values.coreTokens.refreshTokenDuration | quote }}
   AWS_DEFAULT_REGION: {{ .Values.minio.awsDefaultRegion }}
   AWS_REGION: {{ .Values.minio.awsRegion }}
   S3_ENDPOINT: {{ .Values.minio.publicUrl }}
@@ -85,3 +87,6 @@ data:
   K8S_RESOURCE_GPU_KEY: {{ .Values.additionalConfig.resources.gpuKey | quote }}
   K8S_SERVICE_TYPE: {{ .Values.additionalConfig.service.type | quote }}
   K8S_JOB_DEADLINE: {{ .Values.additionalConfig.job.deadline | quote }}
+{{- with .Values.configmapAdditionalEnv }}
+{{- toYaml . | nindent 2 }}
+{{- end }}

charts/core/values.yaml

@@ -258,3 +258,9 @@ additionalConfig:
     type: "NodePort"
   job:
     deadline: "604800"
+
+coreTokens:
+  accessTokenDuration: "43200"
+  refreshTokenDuration: "86400"
+
+configmapAdditionalEnv: {}

charts/ext-postgres-operator/Chart.yaml

@@ -11,7 +11,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: 1.2.5
+version: 1.2.6
 
 # 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/ext-postgres-operator/templates/operator.yaml

@@ -66,6 +66,10 @@ spec:
             - name: {{ $key }}
               value: {{ $value }}
             {{- end }}
+          {{- if .Values.resources }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          {{- end }}
           {{- if .Values.volumeMounts }}
           volumeMounts:
             {{- toYaml .Values.volumeMounts | nindent 12 }}