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/bee-localchain/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: latest
name: bee-localchain
version: 0.1.1
version: 0.2.0
description: Bee localchain Helm chart for Kubernetes
home: https://www.ethswarm.org
icon: https://docs.ethswarm.org/img/swarm-logo-2.svg
Expand Down
4 changes: 0 additions & 4 deletions charts/bee-localchain/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "bee-localchain.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
Expand Down
7 changes: 4 additions & 3 deletions charts/bee-localchain/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ service:
ingress:
enabled: false
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
class: ""
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
class: "nginx"
hosts:
- host: chart-example.local
paths: []
Expand Down
2 changes: 1 addition & 1 deletion charts/bee/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: 2.5.0
name: bee
version: 0.16.15
version: 0.17.0
kubeVersion: ">=1.19.0-0"
description: Ethereum Swarm Bee Helm chart for Kubernetes
home: https://www.ethswarm.org
Expand Down
32 changes: 3 additions & 29 deletions charts/bee/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@

# MAIN INGRESS
---
{{- if semverCompare ">=1.19-0" $root.Capabilities.KubeVersion.Version }}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: networking.k8s.io/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
Expand All @@ -22,9 +18,10 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ $root.Values.ingress.ingressClassName }}
{{- if $root.Values.ingress.tls }}
tls:
{{- range $root.Values.ingress.hosts }}
{{- range $root.Values.ingress.hosts }}
- hosts:
{{- if .domain }}
- {{ $fullName }}.{{ .domain }}
Expand All @@ -35,9 +32,6 @@ spec:
secretName: {{ .tlsSecret }}
{{- end }}
{{- end }}
{{- end }}
{{- if semverCompare ">=1.18-0" $root.Capabilities.KubeVersion.Version }}
ingressClassName: {{ $root.Values.ingress.ingressClassName }}
{{- end }}
rules:
{{- range $root.Values.ingress.hosts }}
Expand All @@ -50,30 +44,19 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
{{- if semverCompare ">=1.18-0" $root.Capabilities.KubeVersion.Version }}
pathType: {{ $root.Values.ingress.pathType }}
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $root.Capabilities.KubeVersion.Version }}
service:
name: {{ $fullName }}
port:
number: {{ $svcPort }}
{{- else }}
serviceName: {{ $fullName }}
servicePort: {{ $svcPort }}
{{- end }}
{{- end }}
{{- end }}

# PER POD INGRESS
{{- range $i, $e := until (int $root.Values.replicaCount) }}
---
{{- if semverCompare ">=1.19-0" $root.Capabilities.KubeVersion.Version }}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: networking.k8s.io/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}-{{ $i }}
Expand All @@ -85,6 +68,7 @@ metadata:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ $root.Values.ingress.ingressClassName }}
{{- if $root.Values.ingress.tls }}
tls:
{{- range $root.Values.ingress.hosts }}
Expand All @@ -98,9 +82,6 @@ spec:
secretName: {{ .tlsSecret }}
{{- end }}
{{- end }}
{{- end }}
{{- if semverCompare ">=1.18-0" $root.Capabilities.KubeVersion.Version }}
ingressClassName: {{ $root.Values.ingress.ingressClassName }}
{{- end }}
rules:
{{- range $root.Values.ingress.hosts }}
Expand All @@ -113,19 +94,12 @@ spec:
paths:
{{- range .paths }}
- path: {{ . }}
{{- if semverCompare ">=1.18-0" $root.Capabilities.KubeVersion.Version }}
pathType: {{ $root.Values.ingress.pathType }}
{{- end }}
backend:
{{- if semverCompare ">=1.19-0" $root.Capabilities.KubeVersion.Version }}
service:
name: {{ $fullName }}-{{ $i }}
port:
name: api
{{- else }}
serviceName: {{ $fullName }}-{{ $i }}
servicePort: api
{{- end }}
{{- end }}
{{- end }}
{{- end }}
Expand Down
21 changes: 12 additions & 9 deletions charts/bee/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,11 @@ ingress:
enabled: false
## Used if cluster version is >= 1.19-0
pathType: ImplementationSpecific
# ingressClassName: ingress-nginx
ingressClassName: nginx
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
hosts:
- domain: ""
paths: []
Expand Down Expand Up @@ -281,10 +282,11 @@ gatewayProxy:
enabled: false
## Used if cluster version is >= 1.19-0
pathType: ImplementationSpecific
# ingressClassName: ingress-nginx
ingressClassName: nginx
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
hosts:
- domain: ""
paths: []
Expand Down Expand Up @@ -332,10 +334,11 @@ swarmProxy:
enabled: false
## Used if cluster version is >= 1.19-0
pathType: ImplementationSpecific
# ingressClassName: ingress-nginx
ingressClassName: nginx
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
hosts:
- domain: ""
paths: []
Expand Down
2 changes: 1 addition & 1 deletion charts/beeport-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ dependencies:
description: Chart to build and deploy beeport-ui
name: beeport-ui
type: application
version: 0.73.3
version: 0.74.0
home: https://www.ethswarm.org
icon: https://docs.ethswarm.org/img/swarm-logo-2.svg
keywords:
Expand Down
21 changes: 14 additions & 7 deletions charts/beeport-ui/tests/ingress_domain_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,32 @@ tests:
set:
ingresses:
- host: chart-example.local
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/client-max-body-size: "0"
- host: another.local
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/client-max-body-size: "0"
asserts:
- hasDocuments:
count: 2
- it: Should generate multiple ingresses
set:
ingress:
host: chart-example.local
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/proxy-read-timeout: "60s"
ingresses:
- host: chart-example.local
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/proxy-read-timeout: "60s"
- host: another.local
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/proxy-read-timeout: "60s"
asserts:
- hasDocuments:
count: 3
Expand All @@ -105,12 +110,14 @@ tests:
ingresses:
- host: chart-example.local
tlsEnabled: true
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/redirect-to-https: "true"
- host: another.local
tlsEnabled: true
ingressClassName: nginx
annotations:
kubernetes.io/ingress.class: nginx
nginx.org/redirect-to-https: "true"
asserts:
- template: ingress.yaml
documentIndex: 0
Expand Down
8 changes: 5 additions & 3 deletions charts/beeport-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ service:
port: 8080

ingress:
# className: ""
ingressClassName: "nginx"
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
# nginx.org/websocket-services: "beeport-ui"
host: "app.ethswarm.org"
tlsEnabled: false

Expand Down
2 changes: 1 addition & 1 deletion charts/bzz-token-service/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: latest
name: bzz-token-service
version: 0.1.1
version: 0.2.0
description: BZZ Token Service Helm chart for Kubernetes
home: https://www.ethswarm.org
icon: https://docs.ethswarm.org/img/swarm-logo-2.svg
Expand Down
4 changes: 0 additions & 4 deletions charts/bzz-token-service/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "bzz-token-service.fullname" . -}}
{{- $svcPort := .Values.service.port -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
Expand Down
7 changes: 4 additions & 3 deletions charts/bzz-token-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ service:
ingress:
enabled: false
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
class: ""
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
class: "nginx"
hosts:
- host: chart-example.local
paths: []
Expand Down
2 changes: 1 addition & 1 deletion charts/etherproxy/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: latest
name: etherproxy
version: 0.1.0
version: 0.2.0
description: EtherProxy Helm chart for Kubernetes
home: https://www.ethswarm.org
icon: https://docs.ethswarm.org/img/swarm-logo-2.svg
Expand Down
4 changes: 0 additions & 4 deletions charts/etherproxy/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "etherproxy.fullname" . -}}
{{- $svcPort := .Values.service.portAPI -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.Version -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
Expand Down
7 changes: 4 additions & 3 deletions charts/etherproxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ service:
ingress:
enabled: false
annotations: {}
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
class: ""
# nginx.org/client-max-body-size: "0"
# nginx.org/proxy-connect-timeout: "60s"
# nginx.org/proxy-read-timeout: "60s"
class: "nginx"
hosts:
- host: chart-example.local
paths: []
Expand Down
2 changes: 1 addition & 1 deletion charts/ethexporter/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: latest
name: ethexporter
version: 0.2.1
version: 0.3.0
description: ETHexporter Helm chart for Kubernetes
home: https://www.ethswarm.org
icon: https://docs.ethswarm.org/img/swarm-logo-2.svg
Expand Down
Loading
Loading