fix secondary resources

Alfresco · Jan 5, 2024 · 99ffc36 · 99ffc36
1 parent 89e0df6
commit 99ffc36
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/charts/alfresco-search-service/templates/ingress.yaml b/charts/alfresco-search-service/templates/ingress.yaml
@@ -1,12 +1,11 @@
 {{- if .Values.ingress.enabled }}
-{{- $serviceName :=  printf "%s-%s" (include  "alfresco-search-service.fullname" .) "solr" -}}
 {{- $servicePort := .Values.service.name | default (include "alfresco-search.svcPort" .) -}}
-{{- $backendSvc := dict "serviceName" $serviceName "servicePort" $servicePort "context" $ -}}
+{{- $backendSvc := dict "serviceName" (include "alfresco-search-service.deployment.name" .) "servicePort" $servicePort "context" $ -}}
 
 apiVersion: {{ template "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
-  name: {{ template "alfresco-search-service.fullname" . }}-solr
+  name: {{ template "alfresco-search-service.deployment.name" . }}
   annotations:
     kubernetes.io/ingress.class: "nginx"
     nginx.ingress.kubernetes.io/auth-secret: {{ $.Values.ingress.existingSecretName | default (printf "%s-ingress-secret" (include "alfresco-search-service.fullname" $)) }}

diff --git a/charts/alfresco-search-service/templates/secret-ingress.yaml b/charts/alfresco-search-service/templates/secret-ingress.yaml
@@ -4,8 +4,7 @@ kind: Secret
 metadata:
   name: {{ template "alfresco-search-service.fullname" . }}-ingress-secret
   labels:
-    app: {{ template "alfresco-search-service.fullname" . }}-solr
-    release: {{ .Release.Name }}
+    {{- include "alfresco-search-service.labels" . | nindent 4 }}
 type: Opaque
 data:
   auth: {{ .Values.ingress.basicAuth | quote }}

diff --git a/charts/alfresco-search-service/templates/secret-repository.yaml b/charts/alfresco-search-service/templates/secret-repository.yaml
@@ -1,9 +1,8 @@
-{{- if (not .Values.repository.existingSecret.name) }}
-{{- if and (eq "secret" .Values.repository.securecomms) (not .Values.repository.existingConfigMap.name) }}
+{{- if and (not .Values.repository.existingSecret.name) (eq "secret" .Values.repository.securecomms) }}
 apiVersion: v1
 kind: Secret
-metadata: {{- $ctx := dict "Values" (dict "nameOverride" (printf "%s-repository" $.Chart.Name )) "Chart" $.Chart "Release" $.Release }}
-  name: {{ template "alfresco-search-service.fullname" $ctx }}
+metadata:
+  name: {{ template "alfresco-search-service.repository-config.name" . }}
   labels:
     {{ template "alfresco-search-service.labels" . }}
 type: Opaque
@@ -12,4 +11,3 @@ data:
   {{- $shared_secret := required $reqmsg (index .Values.repository "sharedSecret") }}
   SOLR_ALFRESCO_SECURECOMMS_SECRET: {{ $shared_secret | b64enc | quote }}
 {{- end }}
-{{- end }}