Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-08-10 14:15:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/owncloud] Adapt ingress to k8s 1.20 (#5002)

Browse Source 
* [bitnami/owncloud] Adapt ingress to k8s 1.20

* Update Chart.yaml
This commit is contained in:
Javier J. Salmerón-García
2021-01-31 09:49:35 +01:00
committed by GitHub
parent 8278ed0b34
commit 383cfaf311
5 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitnami/owncloud/Chart.lock
+3 -3
View File
@@ -4,6 +4,6 @@ dependencies:
version: 1.2.3
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 9.2.0
digest: sha256:c5755985765848812be6b046d49236b8dfa24f25ed88b16ab6ff99ea06b730ea
generated: "2021-01-05T16:21:27.936215887Z"
version: 9.2.2
digest: sha256:c4eb99cfdd1830e268247e326a89d163110c20d51a7c51df7f39e3e7ffda743b
generated: "2021-01-13T16:27:33.336466+01:00"
bitnami/owncloud/Chart.yaml
+1 -1
View File
@@ -31,4 +31,4 @@ name: owncloud
sources:
- https://github.com/bitnami/bitnami-docker-owncloud
- https://owncloud.org/
version: 10.1.0
version: 10.2.0
bitnami/owncloud/README.md
+23 -21
View File
@@ -73,6 +73,7 @@ The following table lists the configurable parameters of the ownCloud chart and
| `commonLabels` | Labels to add to all deployed objects | `nil` |
| `commonAnnotations` | Annotations to add to all deployed objects | `[]` |
| `extraDeploy` | Array of extra objects to deploy with the release (evaluated as a template). | `nil` |
| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `nil` |
### ownCloud parameters
@@ -174,27 +175,28 @@ The following table lists the configurable parameters of the ownCloud chart and
### Traffic Exposure Parameters
| Parameter | Description | Default |
|----------------------------------|---------------------------------------------|------------------|
| `service.type` | Kubernetes Service type | `LoadBalancer` |
| `service.loadBalancerIP` | Kubernetes LoadBalancerIP to request | `LoadBalancer` |
| `service.port` | Service HTTP port | `80` |
| `service.httpsPort` | Service HTTPS port | `443` |
| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` |
| `service.nodePorts.http` | Kubernetes http node port | `""` |
| `service.nodePorts.https` | Kubernetes https node port | `""` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.certManager` | Add annotations for cert-manager | `false` |
| `ingress.hostname` | Default host for the ingress resource | `owncloud.local` |
| `ingress.tls` | Enable TLS for `ingress.hostname` parameter | `false` |
| `ingress.annotations` | Ingress annotations | `{}` |
| `ingress.extraHosts[0].name` | Hostname to your ownCloud installation | `nil` |
| `ingress.extraHosts[0].path` | Path within the url structure | `nil` |
| `ingress.extraTls[0].hosts[0]` | TLS configuration for additional hosts | `nil` |
| `ingress.extraTls[0].secretName` | TLS Secret (certificates) | `nil` |
| `ingress.secrets[0].name` | TLS Secret Name | `nil` |
| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
| `ingress.secrets[0].key` | TLS Secret Key | `nil` |
| Parameter | Description | Default |
|----------------------------------|---------------------------------------------|--------------------------|
| `service.type` | Kubernetes Service type | `LoadBalancer` |
| `service.loadBalancerIP` | Kubernetes LoadBalancerIP to request | `LoadBalancer` |
| `service.port` | Service HTTP port | `80` |
| `service.httpsPort` | Service HTTPS port | `443` |
| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` |
| `service.nodePorts.http` | Kubernetes http node port | `""` |
| `service.nodePorts.https` | Kubernetes https node port | `""` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.certManager` | Add annotations for cert-manager | `false` |
| `ingress.hostname` | Default host for the ingress resource | `owncloud.local` |
| `ingress.tls` | Enable TLS for `ingress.hostname` parameter | `false` |
| `ingress.annotations` | Ingress annotations | `{}` |
| `ingress.extraHosts[0].name` | Hostname to your ownCloud installation | `nil` |
| `ingress.extraHosts[0].path` | Path within the url structure | `nil` |
| `ingress.extraTls[0].hosts[0]` | TLS configuration for additional hosts | `nil` |
| `ingress.extraTls[0].secretName` | TLS Secret (certificates) | `nil` |
| `ingress.secrets[0].name` | TLS Secret Name | `nil` |
| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
| `ingress.secrets[0].key` | TLS Secret Key | `nil` |
| `ingress.pathType` | Ingress path type | `ImplementationSpecific` |
### Metrics parameters
bitnami/owncloud/templates/ingress.yaml
+14 -9
View File
@@ -26,19 +26,24 @@ spec:
- host: {{ .Values.ingress.hostname }}
http:
paths:
- path: /
backend:
serviceName: {{ include "common.names.fullname" . }}
servicePort: http
{{- if .Values.ingress.extraPaths }}
{{- toYaml .Values.ingress.extraPaths | nindent 10 }}
{{- end }}
- path: {{ .Values.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.ingress.extraHosts }}
- host: {{ .name }}
- host: {{ .name | quote }}
http:
paths:
- path: {{ default "/" .path }}
backend:
serviceName: {{ include "common.names.fullname" $ }}
servicePort: http
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- if or .Values.ingress.tls .Values.ingress.extraTls }}
tls:
@@ -48,7 +53,7 @@ spec:
secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
{{- end }}
{{- if .Values.ingress.extraTls }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $ ) | nindent 4 }}
{{- include "common.tplvalues.render" ( dict "value" .Values.ingress.extraTls "context" $ ) | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}
bitnami/owncloud/values.yaml
+8
View File
@@ -31,6 +31,10 @@ image:
##
debug: false
## Force target Kubernetes version (using Helm capabilites if not set)
##
kubeVersion:
## String to partially override owncloud.fullname template (will maintain the release name)
##
nameOverride:
@@ -283,6 +287,10 @@ ingress:
##
hostname: owncloud.local
## Ingress Path type
##
pathType: ImplementationSpecific
## Ingress annotations done as key:value pairs
## For a full list of possible ingress annotations, please see
## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md