diff --git a/stable/owncloud/Chart.yaml b/stable/owncloud/Chart.yaml index 7f93ec95ee..c9e265983d 100644 --- a/stable/owncloud/Chart.yaml +++ b/stable/owncloud/Chart.yaml @@ -1,5 +1,5 @@ name: owncloud -version: 0.5.1 +version: 0.5.2 appVersion: 10.0.3 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/stable/owncloud/README.md b/stable/owncloud/README.md index 1d11ecbd66..514a2ea460 100644 --- a/stable/owncloud/README.md +++ b/stable/owncloud/README.md @@ -51,6 +51,9 @@ The following tables lists the configurable parameters of the ownCloud chart and | `imagePullPolicy` | Image pull policy | `IfNotPresent` | | `ingress.enabled` | Enable use of ingress controllers | `false` | | `ingress.servicePort` | Ingress' backend servicePort | `http` | +| `ingress.annotations` | An array of service annotations | `nil` | +| `ingress.tls` | Ingress TLS configuration | `[]` | +| `networkPolicyApiVersion` | The kubernetes network API version | `extensions/v1beta1` | | `owncloudHost` | ownCloud host to create application URLs | `nil` | | `owncloudLoadBalancerIP` | `loadBalancerIP` for the owncloud Service | `nil` | | `owncloudUsername` | User of the application | `user` | @@ -60,9 +63,11 @@ The following tables lists the configurable parameters of the ownCloud chart and | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `nil` (uses alpha storage class annotation) | +| `persistence.apache.existingClaim` | An Existing PVC name for Apache volume | `nil` (uses alpha storage class annotation) | | `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | | `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | | `persistence.owncloud.storageClass` | PVC Storage Class for ownCloud volume | `nil` (uses alpha storage class annotation) | +| `persistence.owncloud.existingClaim` | An Existing PVC name for ownCloud volume | `nil` (uses alpha storage class annotation) | | `persistence.owncloud.accessMode` | PVC Access Mode for ownCloud volume | `ReadWriteOnce` | | `persistence.owncloud.size` | PVC Storage Request for ownCloud volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | diff --git a/stable/owncloud/templates/apache-pvc.yaml b/stable/owncloud/templates/apache-pvc.yaml index 5be92cafb8..cecdb57505 100644 --- a/stable/owncloud/templates/apache-pvc.yaml +++ b/stable/owncloud/templates/apache-pvc.yaml @@ -1,4 +1,5 @@ {{- if .Values.persistence.enabled -}} +{{- if not .Values.persistence.apache.existingClaim -}} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -17,3 +18,4 @@ spec: {{- end }} {{- end }} {{- end -}} +{{- end -}} diff --git a/stable/owncloud/templates/deployment.yaml b/stable/owncloud/templates/deployment.yaml index 358544e692..5ce3f30eb1 100644 --- a/stable/owncloud/templates/deployment.yaml +++ b/stable/owncloud/templates/deployment.yaml @@ -74,14 +74,14 @@ spec: - name: owncloud-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "owncloud.fullname" . }}-owncloud + claimName: {{ if .Values.persistence.owncloud.existingClaim }}{{ .Values.persistence.owncloud.existingClaim }}{{- else }}{{ template "owncloud.fullname" . }}-owncloud{{- end }} {{- else }} emptyDir: {} {{- end }} - name: apache-data {{- if .Values.persistence.enabled }} persistentVolumeClaim: - claimName: {{ template "owncloud.fullname" . }}-apache + claimName: {{ if .Values.persistence.apache.existingClaim }}{{ .Values.persistence.apache.existingClaim }}{{- else }}{{ template "owncloud.fullname" . }}-apache{{- end }} {{- else }} emptyDir: {} {{- end }} diff --git a/stable/owncloud/templates/ingress.yaml b/stable/owncloud/templates/ingress.yaml index 7bb9b61a0b..0bc8370b00 100644 --- a/stable/owncloud/templates/ingress.yaml +++ b/stable/owncloud/templates/ingress.yaml @@ -1,5 +1,5 @@ {{- if .Values.ingress.enabled }} -apiVersion: extensions/v1beta1 +apiVersion: {{ required "A valid .Values.networkPolicyApiVersion entry required!" .Values.networkPolicyApiVersion }} kind: Ingress metadata: name: {{ template "fullname" . }} @@ -8,6 +8,10 @@ metadata: chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" +{{- if .Values.ingress.annotations }} + annotations: +{{ toYaml .Values.ingress.annotations | indent 4 }} +{{- end }} spec: rules: - host: {{ .Values.owncloudHost }} @@ -17,4 +21,8 @@ spec: backend: serviceName: {{ template "fullname" . }} servicePort: {{ .Values.ingress.servicePort }} +{{- if .Values.ingress.tls }} + tls: +{{ toYaml .Values.ingress.tls | indent 4 }} +{{- end -}} {{- end }} diff --git a/stable/owncloud/templates/owncloud-pvc.yaml b/stable/owncloud/templates/owncloud-pvc.yaml index 2f3c56bf92..6e15b9b09e 100644 --- a/stable/owncloud/templates/owncloud-pvc.yaml +++ b/stable/owncloud/templates/owncloud-pvc.yaml @@ -1,4 +1,5 @@ {{- if .Values.persistence.enabled -}} +{{- if not .Values.persistence.apache.existingClaim -}} kind: PersistentVolumeClaim apiVersion: v1 metadata: @@ -17,3 +18,4 @@ spec: {{- end }} {{- end }} {{- end -}} +{{- end -}} diff --git a/stable/owncloud/values.yaml b/stable/owncloud/values.yaml index 393dbb4092..c23e2e05cc 100644 --- a/stable/owncloud/values.yaml +++ b/stable/owncloud/values.yaml @@ -8,12 +8,23 @@ image: bitnami/owncloud:10.0.3-r0 ## imagePullPolicy: IfNotPresent +## For Kubernetes v1.4, v1.5 and v1.6, use 'extensions/v1beta1' +## For Kubernetes v1.7, use 'networking.k8s.io/v1' +networkPolicyApiVersion: extensions/v1beta1 + ## Allowing use of ingress controllers ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/ ## ingress: enabled: false servicePort: http + annotations: + # kubernetes.io/ingress.class: nginx + # ingress.kubernetes.io/whitelist-source-range: "10.0.0.0/24,172.10.0.1" + tls: + # - secretName: owncloud.cluster.local + # hosts: + # - owncloud.cluster.local ## ownCloud host to create application URLs ## ref: https://github.com/bitnami/bitnami-docker-owncloud#configuration @@ -85,6 +96,12 @@ persistence: ## GKE, AWS & OpenStack) ## # storageClass: "-" + + ## A manually managed Persistent Volume and Claim + ## Requires persistence.enabled: true + ## If defined, PVC must be created manually before volume will be bound + # existingClaim: + accessMode: ReadWriteOnce size: 1Gi owncloud: @@ -96,6 +113,12 @@ persistence: ## GKE, AWS & OpenStack) ## # storageClass: "-" + + ## A manually managed Persistent Volume and Claim + ## Requires persistence.enabled: true + ## If defined, PVC must be created manually before volume will be bound + # existingClaim: + accessMode: ReadWriteOnce size: 8Gi