diff --git a/packages/apps/tenant/templates/configuration-hash.yaml b/packages/apps/tenant/templates/configuration-hash.yaml deleted file mode 100644 index d918e3e6..00000000 --- a/packages/apps/tenant/templates/configuration-hash.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: cozy-tenant-configuration-hash - namespace: {{ include "tenant.name" . }} -data: - cozyTenantConfigurationHash: {{ sha256sum (toJson .Values) | quote }} diff --git a/packages/core/platform/templates/apps.yaml b/packages/core/platform/templates/apps.yaml index bdc3322f..f1872870 100644 --- a/packages/core/platform/templates/apps.yaml +++ b/packages/core/platform/templates/apps.yaml @@ -54,12 +54,6 @@ spec: namespace: cozy-public values: host: "{{ $host }}" - valuesFrom: - - kind: ConfigMap - name: "cozy-system-configuration-hash" - valuesKey: "cozyTenantConfigurationHash" - targetPath: "cozyTenantConfigurationHash" - optional: true dependsOn: {{- range $x := $bundle.releases }} {{- if has $x.name (list "cilium" "kubeovn") }} diff --git a/packages/core/platform/templates/configuration-hash.yaml b/packages/core/platform/templates/configuration-hash.yaml deleted file mode 100644 index 8865a36c..00000000 --- a/packages/core/platform/templates/configuration-hash.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- $rootTenantConfiguration := dict "values" .Values }} -{{- $cozyConfig := index (lookup "v1" "ConfigMap" "cozy-system" "cozystack" ) "data" }} -{{- $cozyScheduling := index (lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling") "data" }} -{{- $cozyBranding := index (lookup "v1" "ConfigMap" "cozy-system" "cozystack-branding" ) "data" }} -{{- $_ := set $rootTenantConfiguration "config" $cozyConfig }} -{{- $_ := set $rootTenantConfiguration "scheduling" $cozyScheduling }} -{{- $_ := set $rootTenantConfiguration "branding" $cozyBranding }} -apiVersion: v1 -kind: ConfigMap -metadata: - name: cozy-system-configuration-hash - namespace: tenant-root -data: - cozyTenantConfigurationHash: {{ sha256sum (toJson $rootTenantConfiguration) | quote }} diff --git a/pkg/apis/apps/v1alpha1/types.go b/pkg/apis/apps/v1alpha1/types.go index 29d3d41e..5a21d270 100644 --- a/pkg/apis/apps/v1alpha1/types.go +++ b/pkg/apis/apps/v1alpha1/types.go @@ -21,12 +21,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -const ( - CozySystemConfigurationHashConfigMapName = "cozy-system-configuration-hash" - CozyTenantConfigurationHashConfigMapName = "cozy-tenant-configuration-hash" - CozyTenantConfigurationHashKey = "cozyTenantConfigurationHash" -) - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ApplicationList is a list of Application objects. diff --git a/pkg/registry/apps/application/rest.go b/pkg/registry/apps/application/rest.go index 8688c94d..9a3eb32d 100644 --- a/pkg/registry/apps/application/rest.go +++ b/pkg/registry/apps/application/rest.go @@ -988,18 +988,6 @@ func (r *REST) convertApplicationToHelmRelease(app *appsv1alpha1.Application) (* }, } - valuesFromConfigMap := appsv1alpha1.CozyTenantConfigurationHashConfigMapName - if helmRelease.Name == "tenant-root" && helmRelease.Namespace == "tenant-root" { - valuesFromConfigMap = appsv1alpha1.CozySystemConfigurationHashConfigMapName - } - helmRelease.Spec.ValuesFrom = []helmv2.ValuesReference{{ - Kind: "ConfigMap", - Name: valuesFromConfigMap, - ValuesKey: appsv1alpha1.CozyTenantConfigurationHashKey, - TargetPath: appsv1alpha1.CozyTenantConfigurationHashKey, - Optional: true, - }} - return helmRelease, nil }