nemerosa/ontrack#1155 Fixed license configuration

nemerosa · Jan 6, 2024 · ef8f94e · ef8f94e
1 parent d557cfd
commit ef8f94e
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -250,11 +250,29 @@ ontrack:
 
 # Change log
 
-| Version  | Postgres | Elasticsearch | Kubernetes | Minimal Ontrack version |
-|-----------------|----------|---------------|------------|-------------------------|
-| 0.8.x  | 11 | 7 | 1.24 | 4.7.13 |
-| 0.9.x  | 15 | 7 | 1.24 | 4.7.20 |
+| Version | Postgres | Elasticsearch | Kubernetes | Minimal Ontrack version |
+|----------------|----------|---------------|------------|-------------------------|
+| 0.8.x | 11 | 7 | 1.24 | 4.7.13 |
+| 0.9.x | 15 | 7 | 1.24 | 4.7.20 |
 | [0.10.x](#010) | 15 | 7 | 1.24 | 4.8.1 |
+| [0.11.x](#011) | 15 | 7 | 1.24 | 4.8.12 |
+
+## 0.11
+
+* Support for the `fixed` license:
+
+```yaml
+ontrack:
+ config:
+ license:
+ type: fixed
+ fixed:
+ name: Premium
+ assignee: Nemerosa
+ active: true
+ validUntil: 2024-12-31T12:00:00
+ maxProjects: 0
+```
 
 ## 0.10
 

diff --git a/charts/ontrack/Chart.yaml b/charts/ontrack/Chart.yaml
@@ -15,7 +15,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.10.0
+version: 0.11.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
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/charts/ontrack/templates/deployment.yaml b/charts/ontrack/templates/deployment.yaml
@@ -210,6 +210,18 @@ spec:
  name: {{ .Values.ontrack.config.license.stripe.secret | quote }}
  key: {{ .Values.ontrack.config.license.stripe.subscription_key_name | quote }}
  {{- end }}
+ {{ if eq .Values.ontrack.config.license.type "fixed" }}
+ - name: ONTRACK_CONFIG_LICENSE_FIXED_NAME
+ value: {{ .Values.ontrack.config.license.fixed.name | quote }}
+ - name: ONTRACK_CONFIG_LICENSE_FIXED_ASSIGNEE
+ value: {{ .Values.ontrack.config.license.fixed.assignee | quote }}
+ - name: ONTRACK_CONFIG_LICENSE_FIXED_VALIDUNTIL
+ value: {{ .Values.ontrack.config.license.fixed.validUntil | quote }}
+ - name: ONTRACK_CONFIG_LICENSE_FIXED_MAXPROJECTS
+ value: {{ .Values.ontrack.config.license.fixed.maxProjects | quote }}
+ - name: ONTRACK_CONFIG_LICENSE_FIXED_ACTIVE
+ value: {{ .Values.ontrack.config.license.fixed.active | quote }}
+ {{- end }}
  ########################################
  # Arbitrary environment variables
  ########################################

diff --git a/charts/ontrack/values.yaml b/charts/ontrack/values.yaml
@@ -153,8 +153,20 @@ ontrack:
  directory: "/var/ontrack/key_store"
  # License management
  license:
- # Type of license: none, stripe
+ # Type of license: none, stripe, fixed
  type: none
+ # For Fixed based configuration
+ fixed:
+ # Type of license, display name, description, etc.
+ name:
+ # Name of the assignee
+ assignee:
+ # Is the license active?
+ active: false
+ # End of validity for this license (null for unlimited)
+ validUntil:
+ # Maximum number of projects which can be created (0 for unlimited)
+ maxProjects: 0
  # For Stripe based configuration
  stripe:
  # Name of the secret which contains the Stripe information