Fix override url (#139)

* Fixed: url override generation

* Changed: bump up version

* Changed: supported k8s versions

* Changed: changelog update
This commit is contained in:
Valeriano Manassero 2023-01-25 16:34:28 +01:00 committed by GitHub
parent 16506130ba
commit 9e97c03b5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 9 deletions

View File

@ -2,9 +2,9 @@ apiVersion: v2
name: clearml name: clearml
description: MLOps platform description: MLOps platform
type: application type: application
version: "5.4.1" version: "5.4.2"
appVersion: "1.9.2" appVersion: "1.9.2"
kubeVersion: ">= 1.21.0-0 < 1.26.0-0" kubeVersion: ">= 1.21.0-0 < 1.27.0-0"
home: https://clear.ml home: https://clear.ml
icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg icon: https://raw.githubusercontent.com/allegroai/clearml/master/docs/clearml-logo.svg
sources: sources:
@ -32,5 +32,7 @@ dependencies:
condition: elasticsearch.enabled condition: elasticsearch.enabled
annotations: annotations:
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added
description: support for kubernetes 1.26
- kind: fixed - kind: fixed
description: enterprise apps deployment not working description: wrong override display url for Enterprise

View File

@ -1,6 +1,6 @@
# ClearML Ecosystem for Kubernetes # ClearML Ecosystem for Kubernetes
![Version: 5.4.1](https://img.shields.io/badge/Version-5.4.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square) ![Version: 5.4.2](https://img.shields.io/badge/Version-5.4.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.9.2](https://img.shields.io/badge/AppVersion-1.9.2-informational?style=flat-square)
MLOps platform MLOps platform
@ -130,7 +130,7 @@ For detailed instructions, see the [Optional Configuration](https://github.com/a
## Requirements ## Requirements
Kubernetes: `>= 1.21.0-0 < 1.26.0-0` Kubernetes: `>= 1.21.0-0 < 1.27.0-0`
| Repository | Name | Version | | Repository | Name | Version |
|------------|------|---------| |------------|------|---------|

View File

@ -202,11 +202,11 @@ clientConfiguration string compose
{{- define "clearml.clientConfiguration" -}} {{- define "clearml.clientConfiguration" -}}
{{- $clientConfiguration := "" }} {{- $clientConfiguration := "" }}
{{- if and (.Values.clearml.clientConfigurationApiUrl) .Values.clearml.clientConfigurationFilesUrl }} {{- if and (.Values.clearml.clientConfigurationApiUrl) .Values.clearml.clientConfigurationFilesUrl }}
{{- $clientConfiguration = "{\"apiServer\":\"{{ .Values.clearml.clientConfigurationApiUrl }}\",\"filesServer\":\"{{ .Values.clearml.clientConfigurationFilesUrl }}\"}" }} {{- $clientConfiguration = printf "%s%s%s%s%s" "{\"apiServer\":\"" .Values.clearml.clientConfigurationApiUrl "\",\"filesServer\":\"" .Values.clearml.clientConfigurationFilesUrl "\"}" }}
{{- else if .Values.clearml.clientConfigurationApiUrl }} {{- else if .Values.clearml.clientConfigurationApiUrl }}
{{- $clientConfiguration = "{\"apiServer\":\"{{ .Values.clearml.clientConfigurationApiUrl }}\"}" }} {{- $clientConfiguration = printf "%s%s%s" "{\"apiServer\":\"" .Values.clearml.clientConfigurationApiUrl "\"}" }}
{{- else if .Values.clearml.clientConfigurationFilesUrl }} {{- else if .Values.clearml.clientConfigurationFilesUrl }}
{{- $clientConfiguration = "{\"filesServer\":\"{{ .Values.clearml.clientConfigurationFilesUrl }}\"}" }} {{- $clientConfiguration = printf "%s%s%s" "{\"filesServer\":\"" .Values.clearml.clientConfigurationFilesUrl "\"}" }}
{{- end }} {{- end }}
{{- $clientConfiguration }} {{- $clientConfiguration }}
{{- end }} {{- end }}

View File

@ -17,7 +17,7 @@ data:
}, },
"docsLink": "https://clear.ml/docs/", "docsLink": "https://clear.ml/docs/",
"applicationsBackground": "ui-assets/apps-message.svg" "applicationsBackground": "ui-assets/apps-message.svg"
{{- if and .Values.webserver.overrideReferenceApiUrl .Values.enterpriseFeatures.overrideReferenceFileUrl }} {{- if and .Values.enterpriseFeatures.overrideReferenceApiUrl .Values.enterpriseFeatures.overrideReferenceFileUrl }}
, ,
"fileBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceFileUrl }}", "fileBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceFileUrl }}",
"apiBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceApiUrl }}" "apiBaseUrl": "{{ .Values.enterpriseFeatures.overrideReferenceApiUrl }}"