fix name

Author: zubenkoivan

charts/platform-adjust-inotify/templates/_helpers.tpl

@@ -3,13 +3,17 @@
 {{- end -}}
 
 {{- define "platform.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "platform.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}}

charts/platform-common/templates/_helpers.tpl

@@ -3,13 +3,17 @@
 {{- end -}}
 
 {{- define "platform.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "platform.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}}

charts/platform-external-secrets/templates/_helpers.tpl

@@ -3,13 +3,17 @@
 {{- end -}}
 
 {{- define "platform.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "platform.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}}

charts/platform-external-secrets/templates/cluster-vault-secret-store.yaml

@@ -5,7 +5,7 @@
 apiVersion: external-secrets.io/v1
 kind: ClusterSecretStore
 metadata:
-  name: {{ include "platform.fullname" . }}-vault
+  name: {{ .Release.Name }}-vault
   labels:
     {{- include "platform.labels.common" . | nindent 4 }}
   annotations:

charts/platform-external-secrets/templates/external-secrets.yaml

@@ -11,7 +11,7 @@ metadata:
     {{- include "platform.labels.common" $ | nindent 4 }}
 spec:
   secretStoreRef:
-    name: {{ include "platform.fullname" $ }}-vault
+    name: {{ $.Release.Name }}-vault
     kind: ClusterSecretStore
   {{- if not $externalSecret.spec.refreshInterval }}
   refreshInterval: '15s'

charts/platform-ingress/templates/_helpers.tpl

@@ -3,13 +3,17 @@
 {{- end -}}
 
 {{- define "platform.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "platform.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}}

charts/platform-volumes/templates/_helpers.tpl

@@ -3,13 +3,17 @@
 {{- end -}}
 
 {{- define "platform.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "platform.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}}

charts/platform/templates/_helpers.tpl

@@ -3,13 +3,17 @@
 {{- end -}}
 
 {{- define "platform.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 {{- end -}}
+{{- end -}}
 
 {{- define "platform.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" -}}
@@ -59,7 +63,7 @@ release: {{ .Release.Name | quote }}
 {{- end -}}
 
 {{- define "platform.registryUrl" -}}
-{{ printf "registry.%s" (include "platform.clusterDnsName" .) }}
+{{ printf "https://registry.%s" (include "platform.clusterDnsName" .) }}
 {{- end -}}
 
 {{- define "platform.priorityClassName" -}}

charts/platform/templates/platform-monitoring-application.yaml

@@ -2,7 +2,7 @@
 {{- $platformUrls := include "platform.urls" . | fromYaml -}}
 {{- $platformNamespace := include "platform.argocd.destination.namespace" . -}}
 image:
-  repository: ghcr.io/neuro-inc/monitoringapi
+  repository: ghcr.io/neuro-inc/platformmonitoringapi
 securityContext:
   enabled: true
 nodeLabels:

charts/platform/tests/__snapshot__/platform-api-poller-application_test.yaml.snap

@@ -43,7 +43,7 @@ should match snapshot:
               clusterName: test-cluster
               configUrl: https://api.apolo.us
               eventsUrl: https://api.apolo.us
-              registryUrl: registry.test-cluster.org.apolo.us
+              registryUrl: https://registry.test-cluster.org.apolo.us
               token:
                 valueFrom:
                   secretKeyRef: