Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/metabase/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description:
The easy, open source way for everyone in your company to ask questions
and learn from data.
name: metabase
version: 2.24.2
version: 2.24.3
appVersion: v0.56.20.x
maintainers:
- name: pmint93
Expand Down
7 changes: 6 additions & 1 deletion charts/metabase/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,12 @@ Create chart name and version as used by the chart label.

{{/*
Create the namespace name
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "metabase.namespace" -}}
{{- .Release.Namespace -}}
{{- if .Values.fullnamespaceOverride -}}
{{- .Values.fullnamespaceOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf .Release.Namespace | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/metabase/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: ConfigMap
metadata:
name: {{ template "metabase.fullname" . }}-config
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/database-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ template "metabase.fullname" . }}-database
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: {{ template "deployment.apiVersion" . }}
kind: Deployment
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
4 changes: 2 additions & 2 deletions charts/metabase/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down Expand Up @@ -47,7 +47,7 @@ apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/pdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: policy/v1
kind: PodDisruptionBudget
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/route.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/securitygrouppolicy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: vpcresources.k8s.aws/v1beta1
kind: SecurityGroupPolicy
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
4 changes: 2 additions & 2 deletions charts/metabase/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
kind: Service
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down Expand Up @@ -47,4 +47,4 @@ spec:
{{- end }}
selector:
app: {{ template "metabase.name" . }}
release: {{ .Release.Name }}
release: {{ .Release.Name }}
2 changes: 1 addition & 1 deletion charts/metabase/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: ServiceAccount
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
metadata:
name: {{ include "metabase.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "metabase.fullname" . }}
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/metabase/templates/ssl-secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: v1
kind: Secret
metadata:
name: {{ template "metabase.fullname" . }}-ssl
namespace: {{ .Release.Namespace }}
namespace: {{ template "metabase.namespace" . }}
labels:
app: {{ template "metabase.name" . }}
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
Expand Down
3 changes: 2 additions & 1 deletion charts/metabase/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ image:
pullPolicy: IfNotPresent
pullSecrets: []

## String to fully override metabase.fullname template
## Strings to fully override metabase.fullname and metabase.namespace templates
##
# fullnameOverride:
# fullnamespaceOverride:

# Config Jetty web server
listen:
Expand Down