fix(merge): conflict

Author: shinybrar

.github/workflows/helm-publish.yml

@@ -1,4 +1,4 @@
-name: Helm Publish
+name: Publish Helm Charts
 
 on:
   repository_dispatch:
@@ -95,7 +95,6 @@ jobs:
           COSIGN_EXPERIMENTAL: "1"
         run: |
           echo "Verifying Chart Signature..."
-          # Verify the signature using keyless verification with Sigstore Transparency Log
           cosign verify \
             --certificate-identity-regexp="https://github.com/${{ github.repository }}" \
             --certificate-oidc-issuer="https://token.actions.githubusercontent.com" \

.github/workflows/renovate.yml

@@ -13,14 +13,24 @@ on:
   workflow_dispatch:
     inputs:
       reason:
-        description: 'Reason for manual renovate run'
+        description: 'Reason for Manual Renovate Run'
         required: true
         type: string
+  repository_dispatch:
+    types: [renovate]
 
 jobs:
   renovate:
     runs-on: ubuntu-latest
     steps:
+      - name: Renovation Dispatch Event
+        id: renovate-dispatch-event
+        run: |
+          echo "=== Renovation Dispatch Event ==="
+          echo "Event: ${{ github.event_name }}"
+          echo "Payload: ${{ toJson(github.event) }}"
+          echo "=== End Payload ==="
+
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
 

.release-please-manifest.json

@@ -1,11 +1,11 @@
 {
-  "helm/applications/base": "0.6.0",
-  "helm/applications/cavern": "0.8.0",
-  "helm/applications/posix-mapper": "0.6.0",
-  "helm/applications/science-portal": "1.0.0",
-  "helm/applications/skaha": "1.2.0",
-  "helm/applications/sshd": "1.1.0",
+  "helm/applications/base": "0.4.1",
+  "helm/applications/cavern": "0.7.1",
+  "helm/applications/posix-mapper": "0.5.0",
+  "helm/applications/science-portal": "1.0.2",
+  "helm/applications/skaha": "1.1.1",
+  "helm/applications/sshd": "1.0.1",
   "helm/applications/storage-ui": "0.7.0",
-  "helm/applications/utils": "0.1.0",
+  "helm/applications/utils": "0.1.1",
   "helm/common": "1.0.0"
 }

helm/applications/base/Chart.yaml

@@ -19,7 +19,8 @@ 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.6.0
+version: 0.4.1
+
 # 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.

helm/applications/base/README.md

@@ -4,7 +4,7 @@ A Helm chart to install base components of the CANFAR Science Platform
 
 | Chart | AppVersion | Type |
 |:-----:|:----------:|:----:|
-|0.6.0<!-- x-release-please-version --> | 0.1.4 | application |
+|0.4.1<!-- x-release-please-version --> | 0.1.4 | application |
 
 ## Requirements
 

helm/applications/cavern/Chart.yaml

@@ -18,7 +18,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: 0.8.0
+version: 0.7.1
 
 # 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

helm/applications/cavern/README.md

@@ -4,7 +4,7 @@ A Helm chart to install the VOSpace User Storage API (Cavern)
 
 | Chart | AppVersion | Type |
 |:-----:|:----------:|:----:|
-|0.8.0<!-- x-release-please-version --> | 0.9.0 | application |
+|0.7.1<!-- x-release-please-version --> | 0.9.0 | application |
 
 ## Requirements
 

helm/applications/posix-mapper/Chart.yaml

@@ -18,7 +18,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: 0.6.0
+version: 0.5.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

helm/applications/posix-mapper/README.md

@@ -4,7 +4,7 @@ A Helm chart to install the UID/GID POSIX Mapper
 
 | Chart | AppVersion | Type |
 |:-----:|:----------:|:----:|
-|0.6.0<!-- x-release-please-version --> | 0.3.2 | application |
+|0.5.0<!-- x-release-please-version --> | 0.3.2 | application |
 
 ## Values
 

helm/applications/science-portal/Chart.yaml

@@ -18,14 +18,14 @@ 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.0.0
+version: 1.0.2
 
 # 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.
 # renovate: image=images.opencadc.org/platform/science-portal
-appVersion: "1.0.1"
+appVersion: "1.2.0"
 
 dependencies:
   - name: "redis"