From b56323854b2c48576780418623e2394532b330e0 Mon Sep 17 00:00:00 2001 From: Damien Coraboeuf Date: Mon, 28 Oct 2024 19:31:15 +0100 Subject: [PATCH] feat: support for embedded license --- .github/workflows/release.yml | 1 + charts/ontrack/Chart.yaml | 4 ++-- charts/ontrack/templates/deployment.yaml | 4 ++++ charts/ontrack/values.yaml | 4 ++++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 400c519..aca2603 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,6 +4,7 @@ on: push: branches: - main + - beta/* jobs: release: diff --git a/charts/ontrack/Chart.yaml b/charts/ontrack/Chart.yaml index a29eaa8..3b0142c 100644 --- a/charts/ontrack/Chart.yaml +++ b/charts/ontrack/Chart.yaml @@ -15,12 +15,12 @@ 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.11.4 +version: 0.12.0+beta-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. # It is recommended to use it with quotes. -appVersion: "4.8.35" +appVersion: "4.11-beta.0" dependencies: - name: postgresql diff --git a/charts/ontrack/templates/deployment.yaml b/charts/ontrack/templates/deployment.yaml index 3dbb3b4..5321365 100644 --- a/charts/ontrack/templates/deployment.yaml +++ b/charts/ontrack/templates/deployment.yaml @@ -222,6 +222,10 @@ spec: - name: ONTRACK_CONFIG_LICENSE_FIXED_ACTIVE value: {{ .Values.ontrack.config.license.fixed.active | quote }} {{- end }} + {{ if eq .Values.ontrack.config.license.type "embedded" }} + - name: ONTRACK_CONFIG_LICENSE_EMBEDDED_KEY + value: {{ .Values.ontrack.config.license.embedded.key | quote }} + {{- end }} ######################################## # Arbitrary environment variables ######################################## diff --git a/charts/ontrack/values.yaml b/charts/ontrack/values.yaml index 26b7874..89bf2bf 100644 --- a/charts/ontrack/values.yaml +++ b/charts/ontrack/values.yaml @@ -175,6 +175,10 @@ ontrack: token_key_name: token # Name of the secret key which contains ID of the Stripe subscription subscription_key_name: subscription + # For embedded license key + embedded: + # Provided license key + key: "" # Management configuration management: metrics: