chore: update push to registry and licence misc to edify

Author: Michiel87

.github/workflows/okteto-registry.yml

@@ -1,9 +1,16 @@
 name: okteto-registry
+permissions:
+  contents: read
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'Branch name to checkout'
+        required: false
+        default: 'main'
   push:
-    branches:
-      - main
+    branches: [ main ]
+  pull_request:
 
 jobs:
   upload-chart:
@@ -13,6 +20,8 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.inputs.branch || github.head_ref || github.ref_name || github.ref }}
 
       - name: Context
         uses: exivity/okteto-context-action@latest

charts/exivity/templates/edify/deployment.yaml

@@ -18,13 +18,21 @@ spec:
         {{- include "exivity.labels" $ | indent 8 }}
       annotations:
         checksum/{{- include "exivity.fullname" $ -}}-config-edify: {{ include (print $.Template.BasePath "/edify/configmap.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-licence-pub: {{ include (print $.Template.BasePath "/proximity/api.configmap.yaml") . | sha256sum }}
+        checksum/{{- include "exivity.fullname" $ -}}-licence-key: {{ include (print $.Template.BasePath "/proximity/api.secret.yaml") . | sha256sum }}
     spec:
       securityContext:
         {{- include "exivity.securityContext" (dict "root" . "component" "edify") | indent 8 }}
       volumes:
         - name: config-file
-          configMap:
-            name: {{ include "exivity.fullname" $ -}}-config-edify
+          projected:
+            sources:
+              - configMap:
+                  name: {{ include "exivity.fullname" $ -}}-config-edify
+              - configMap:
+                  name: {{ include "exivity.fullname" $ -}}-licence-pub
+              - secret:
+                  name: {{ include "exivity.fullname" $ -}}-licence-key
         - name: config
           persistentVolumeClaim:
             claimName: {{ include "exivity.fullname" $ -}}-etl-config

okteto.yaml

@@ -1,13 +1,24 @@
 deploy:
   commands:
-    - name: Install dependencies
+    - name: Set CHART_VERSION
+      command: |
+        BASE_VERSION=0.0.0
+        BRANCH_NAME=${OKTETO_GIT_BRANCH:-${GITHUB_REF_NAME:-unknown}}
+        SAFE_BRANCH=$(echo "$BRANCH_NAME" | tr '/_' '--')
+        CHART_VERSION="$BASE_VERSION-$SAFE_BRANCH"
+        export CHART_VERSION
+        echo "Using CHART_VERSION: $CHART_VERSION"
+        echo "CHART_VERSION=$CHART_VERSION" > /tmp/chart_version.env
+    - name: Install dependencies for exivity
       command: helm dependency update charts/exivity
     - name: Login registry
       command: |
         helm registry login ${OKTETO_REGISTRY_URL} -u ${OKTETO_USERNAME} -p ${OKTETO_TOKEN}
-    - name: Package chart
+    - name: Package exivity chart
       command: |
-        helm package ./charts/exivity --version 0.0.1
-    - name: Push chart to registry
+        . /tmp/chart_version.env
+        helm package ./charts/exivity --version $CHART_VERSION
+    - name: Push exivity chart to registry
       command: |
-        helm push ./exivity-0.0.1.tgz oci://${OKTETO_REGISTRY_URL}/okteto
+        . /tmp/chart_version.env
+        helm push ./exivity-$CHART_VERSION.tgz oci://${OKTETO_REGISTRY_URL}/okteto