Merge branch 'main' of github.com:compolabs/spark-middleware

Author: nazgull08

helm/templates/_helpers.tpl

@@ -46,7 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "helm-chart.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "helm-chart.name" . }}
+app.kubernetes.io/name: {{ include "helm-chart.fullname" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

helm/templates/deployment.yaml

@@ -35,11 +35,10 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
-            {{- toYaml .Values.env | nindent 12}}
             {{- toYaml .Values.marketEnv | nindent 12}}
           envFrom:
             - secretRef:
-                name: {{ .Values.envFromSecret }}
+                name: {{ include "helm-chart.fullname" . }}
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

helm/values.production.yaml

@@ -1,7 +1,7 @@
 replicaCount: 1
 
 ingress:
-  enabled: true
+  enabled: false
   hosts:
     - host: spark-middleware.production.sprk.fi
       paths:

helm/values.staging.yaml

@@ -1,5 +1,5 @@
 ingress:
-  enabled: true
+  enabled: false
   hosts:
     - host: spark-middleware.staging.sprk.fi
       paths:

helm/values.yaml

@@ -1,8 +1,5 @@
 replicaCount: 1
 
-fullnameOverride: spark-middleware
-envFromSecret: spark-middleware
-
 image:
   repository: harbor.infra.sprk.fi/sprk/spark-middleware
   pullPolicy: IfNotPresent