Merge pull request #14 from luisdavim/patch-2

use networking.k8s.io/v1 Ingress
pmint93 · Jul 1, 2021 · 83d3e9a · 83d3e9a
2 parents 0ff786f + 97ad7fa
commit 83d3e9a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/charts/metabase/Chart.yaml b/charts/metabase/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: The easy, open source way for everyone in your company to ask questions
   and learn from data.
 name: metabase
-version: 0.13.5
+version: 1.0.0
 appVersion: v0.39.3
 maintainers:
   - name: pmint93

diff --git a/charts/metabase/README.md b/charts/metabase/README.md
@@ -99,9 +99,9 @@ The following table lists the configurable parameters of the Metabase chart and
 | serviceAccount.annotations       | Annotations to add to the service account                   | {}                |
 | serviceAccount.name              | The name of the service account to use                      | null              |
 | ingress.enabled                  | Enable ingress controller resource                          | false             |
-| ingress.hosts                    | Ingress resource hostnames                                  | null              |
+| ingress.hosts                    | Ingress resource hostnames                                  | ["*"]             |
 | ingress.path                     | Ingress path                                                | /                 |
-| ingress.pathType                 | Ingress pathType                                            | null              |
+| ingress.pathType                 | Ingress pathType                                            | Prefix            |
 | ingress.labels                   | Ingress labels configuration                                | null              |
 | ingress.annotations              | Ingress annotations configuration                           | {}                |
 | ingress.tls                      | Ingress TLS configuration                                   | null              |

diff --git a/charts/metabase/templates/ingress.yaml b/charts/metabase/templates/ingress.yaml
@@ -3,7 +3,7 @@
 {{- $servicePort := .Values.service.externalPort -}}
 {{- $ingressPath := .Values.ingress.path -}}
 {{- $ingressPathType := .Values.ingress.pathType -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "metabase.fullname" . }}
@@ -23,16 +23,16 @@ metadata:
 spec:
   rules:
     {{- range $host := .Values.ingress.hosts }}
-    - host: {{ $host }}
+    - host: {{ $host | quote }}
       http:
         paths:
           - path: {{ $ingressPath }}
-            {{- if $ingressPathType }}
             pathType: {{ $ingressPathType }}
-            {{- end }}
             backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
     {{- end -}}
   {{- if .Values.ingress.tls }}
   tls:

diff --git a/charts/metabase/values.yaml b/charts/metabase/values.yaml
@@ -65,7 +65,8 @@ emojiLogging: true
 # pluginsDirectory:
 # siteUrl:
 
-session: {}
+session:
+  {}
   # maxSessionAge:
   # sessionCookies:
   # cookieSameSite:
@@ -87,21 +88,25 @@ service:
   internalPort: 3000
   # Used to fix NodePort when service.type: NodePort.
   nodePort:
-  annotations: {}
+  annotations:
+    {}
     # Used to add custom annotations to the Service.
     # service.beta.kubernetes.io/aws-load-balancer-internal: "0.0.0.0/0"
 ingress:
   enabled: false
   # Used to create Ingress record (should used with service.type: ClusterIP).
   hosts:
+    - "*"
     # - metabase.domain.com
   # The ingress path. Useful to host metabase on a subpath, such as `/metabase`.
   path: /
+  pathType: Prefix
   labels:
     # Used to add custom labels to the Ingress
     # Useful if for example you have multiple Ingress controllers and want your Ingress controllers to bind to specific Ingresses
     # traffic: internal
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
   tls:
@@ -124,7 +129,8 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name:
 
-resources: {}
+resources:
+  {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following