From 42f1dabc31050e94a99bdc42968a979e523ef82d Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Fri, 14 Feb 2025 17:47:37 +0300 Subject: [PATCH] add wl --- packages/apps/versions_map | 4 +- packages/core/platform/bundles/paas-full.yaml | 71 +++++++++++++++---- .../core/platform/bundles/paas-hosted.yaml | 56 +++++++++++++-- .../templates/configure-kk.yaml | 6 ++ 4 files changed, 114 insertions(+), 23 deletions(-) diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 9b6c67e71..b86592124 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -112,7 +112,7 @@ virtual-machine 0.5.0 cad9cde virtual-machine 0.6.0 0e728870 virtual-machine 0.7.0 af58018a virtual-machine 0.7.1 05857b95 -virtual-machine 0.8.0 3fa4dd3a +virtual-machine 0.8.0 3fa4dd3 virtual-machine 0.8.1 HEAD vm-disk 0.1.0 HEAD vm-instance 0.1.0 ced8e5b9 @@ -120,7 +120,7 @@ vm-instance 0.2.0 4f767ee3 vm-instance 0.3.0 0e728870 vm-instance 0.4.0 af58018a vm-instance 0.4.1 05857b95 -vm-instance 0.5.0 3fa4dd3a +vm-instance 0.5.0 3fa4dd3 vm-instance 0.5.1 HEAD vpn 0.1.0 f642698 vpn 0.2.0 7151424 diff --git a/packages/core/platform/bundles/paas-full.yaml b/packages/core/platform/bundles/paas-full.yaml index d85af27a1..fdf0db75a 100644 --- a/packages/core/platform/bundles/paas-full.yaml +++ b/packages/core/platform/bundles/paas-full.yaml @@ -232,24 +232,67 @@ releases: namespace: cozy-dashboard dependsOn: [cilium,kubeovn,keycloak-configure] values: + kubeapps: {{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }} {{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }} - redis: - master: - podAnnotations: - {{- range $index, $repo := . }} - {{- with (($repo.status).artifact).revision }} - repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }} - {{- end }} - {{- end }} - {{- end }} + redis: + master: + podAnnotations: + {{- range $index, $repo := . }} + {{- with (($repo.status).artifact).revision }} + repository.cozystack.io/{{ $repo.metadata.name }}: {{ quote . }} + {{- end }} + {{- end }} {{- end }} - - {{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }} - {{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }} - {{- if $dashboardKCValues }} - {{- $dashboardKCValues | nindent 4 }} {{- end }} + dashboard: + image: + registry: ghcr.io/aenix-io/cozystack + repository: dashboard + tag: v0.25.0 + digest: "sha256:81e7b625c667bce5fc339eb97c8e115eafb82f66df4501550b3677ac53f6e234" + {{- $wlConfigmap := lookup "v1" "ConfigMap" "cozy-dashboard" "white-label" }} + {{- $locale := dig "data" "locale" "" $wlConfigmap }} + {{- if $locale }} + customLocale: + "Kubeapps": {{ $locale }} + {{- end }} + customStyle: | + {{- $logoImage := dig "data" "logo" "" $wlConfigmap }} + {{- if $logoImage }} + .kubeapps-logo { + background-image: {{ $logoImage }} + } + {{- end }} + #serviceaccount-selector { + display: none; + } + .login-moreinfo { + display: none; + } + a[href="#/docs"] { + display: none; + } + .login-group .clr-form-control .clr-control-label { + display: none; + } + .appview-separator div.appview-first-row div.center { + display: none; + } + .appview-separator div.appview-first-row section[aria-labelledby="app-secrets"] { + display: none; + } + .appview-first-row section[aria-labelledby="access-urls-title"] { + width: 100%; + } + {{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }} + {{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }} + {{- if $dashboardKCValues }} + valuesFrom: + - kind: ConfigMap + name: kubeapps-auth-config + valuesKey: values.yaml + {{- end }} {{- if eq $oidcEnabled "true" }} dependsOn: [keycloak-configure] diff --git a/packages/core/platform/bundles/paas-hosted.yaml b/packages/core/platform/bundles/paas-hosted.yaml index 82edc2ab7..4185fc16b 100644 --- a/packages/core/platform/bundles/paas-hosted.yaml +++ b/packages/core/platform/bundles/paas-hosted.yaml @@ -155,9 +155,9 @@ releases: chart: cozy-dashboard namespace: cozy-dashboard values: + kubeapps: {{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }} {{- with (lookup "source.toolkit.fluxcd.io/v1" "HelmRepository" "cozy-public" "").items }} - kubeapps: redis: master: podAnnotations: @@ -168,12 +168,54 @@ releases: {{- end }} {{- end }} {{- end }} - - {{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }} - {{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }} - {{- if $dashboardKCValues }} - {{- $dashboardKCValues | nindent 4 }} - {{- end }} + dashboard: + image: + registry: ghcr.io/aenix-io/cozystack + repository: dashboard + tag: v0.25.0 + digest: "sha256:81e7b625c667bce5fc339eb97c8e115eafb82f66df4501550b3677ac53f6e234" + {{- $wlConfigmap := lookup "v1" "ConfigMap" "cozy-dashboard" "white-label" }} + {{- $locale := dig "data" "locale" "" $wlConfigmap }} + {{- if $locale }} + customLocale: + "Kubeapps": {{ $locale }} + {{- end }} + customStyle: | + {{- $logoImage := dig "data" "logo" "" $wlConfigmap }} + {{- if $logoImage }} + .kubeapps-logo { + background-image: {{ $logoImage }} + } + {{- end }} + #serviceaccount-selector { + display: none; + } + .login-moreinfo { + display: none; + } + a[href="#/docs"] { + display: none; + } + .login-group .clr-form-control .clr-control-label { + display: none; + } + .appview-separator div.appview-first-row div.center { + display: none; + } + .appview-separator div.appview-first-row section[aria-labelledby="app-secrets"] { + display: none; + } + .appview-first-row section[aria-labelledby="access-urls-title"] { + width: 100%; + } + {{- $dashboardKCconfig := lookup "v1" "ConfigMap" "cozy-dashboard" "kubeapps-auth-config" }} + {{- $dashboardKCValues := dig "data" "values.yaml" "" $dashboardKCconfig }} + {{- if $dashboardKCValues }} + valuesFrom: + - kind: ConfigMap + name: kubeapps-auth-config + valuesKey: values.yaml + {{- end }} {{- if eq $oidcEnabled "true" }} dependsOn: [keycloak-configure] diff --git a/packages/system/keycloak-configure/templates/configure-kk.yaml b/packages/system/keycloak-configure/templates/configure-kk.yaml index ef6e44e3a..c37382617 100644 --- a/packages/system/keycloak-configure/templates/configure-kk.yaml +++ b/packages/system/keycloak-configure/templates/configure-kk.yaml @@ -29,6 +29,9 @@ {{- $cookieSecret = randAlphaNum 16 }} {{- end }} +{{- $wlConfigmap := lookup "v1" "ConfigMap" "cozy-dashboard" "white-label" }} +{{- $locale := index $wlConfigmap.data "locale" }} + --- apiVersion: v1 @@ -83,6 +86,9 @@ metadata: spec: realmName: cozy clusterKeycloakRef: keycloak-cozy + {{- if $locale }} + displayNameHtml: {{ $locale }} + {{- end }} ---