Remove apache and/or php volume (#14316)

Signed-off-by: Carlos Rodriguez Hernandez <crhernandez@bitnami.com>
This commit is contained in:
Carlos Rodríguez Hernández
2019-05-30 08:32:29 -07:00
committed by Kubernetes Prow Robot
parent 49b92d3a36
commit 9d190f8775
5 changed files with 3 additions and 50 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: orangehrm
version: 4.3.4
version: 4.4.0
appVersion: 4.3.1-0
description: OrangeHRM is a free HR management system that offers a wealth of modules
to suit the needs of your business.
+1 -4
View File
@@ -82,9 +82,6 @@ The following table lists the configurable parameters of the OrangeHRM chart and
| `ingress.secrets[0].key` | TLS Secret Key | `nil` |
| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` |
| `persistence.enabled` | Enable persistence using PVC | `true` |
| `persistence.apache.storageClass` | PVC Storage Class 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.orangehrm.storageClass` | PVC Storage Class for OrangeHRM volume | `nil` (uses alpha storage class annotation) |
| `persistence.orangehrm.accessMode` | PVC Access Mode for OrangeHRM volume | `ReadWriteOnce` |
| `persistence.orangehrm.size` | PVC Storage Request for OrangeHRM volume | `8Gi` |
@@ -141,7 +138,7 @@ Bitnami will release a new chart updating its containers if a new version of the
## Persistence
The [Bitnami OrangeHRM](https://github.com/bitnami/bitnami-docker-orangehrm) image stores the OrangeHRM data and configurations at the `/bitnami/orangehrm` and `/bitnami/apache` paths of the container.
The [Bitnami OrangeHRM](https://github.com/bitnami/bitnami-docker-orangehrm) image stores the OrangeHRM data and configurations at the `/bitnami/orangehrm` path of the container.
Persistent Volume Claims are used to keep the data across deployments. There is a [known issue](https://github.com/kubernetes/kubernetes/issues/39178) in Kubernetes Clusters with EBS in different availability zones. Ensure your cluster is configured properly to create Volumes in the same availability zone where the nodes are running. Kuberentes 1.12 solved this issue with the [Volume Binding Mode](https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode).
@@ -1,24 +0,0 @@
{{- if .Values.persistence.enabled -}}
kind: PersistentVolumeClaim
apiVersion: v1
metadata:
name: {{ template "orangehrm.fullname" . }}-apache
labels:
app: {{ template "orangehrm.fullname" . }}
chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
spec:
accessModes:
- {{ .Values.persistence.apache.accessMode | quote }}
resources:
requests:
storage: {{ .Values.persistence.apache.size | quote }}
{{- if .Values.persistence.apache.storageClass }}
{{- if (eq "-" .Values.persistence.apache.storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: "{{ .Values.persistence.apache.storageClass }}"
{{- end }}
{{- end }}
{{- end -}}
@@ -109,8 +109,6 @@ spec:
volumeMounts:
- name: orangehrm-data
mountPath: /bitnami/orangehrm
- name: apache-data
mountPath: /bitnami/apache
{{- if .Values.metrics.enabled }}
- name: metrics
image: {{ template "orangehrm.metrics.image" . }}
@@ -142,10 +140,3 @@ spec:
{{- else }}
emptyDir: {}
{{- end }}
- name: apache-data
{{- if .Values.persistence.enabled }}
persistentVolumeClaim:
claimName: {{ template "orangehrm.fullname" . }}-apache
{{- else }}
emptyDir: {}
{{- end }}
+1 -12
View File
@@ -13,7 +13,7 @@
image:
registry: docker.io
repository: bitnami/orangehrm
tag: 4.3.1-0-debian-9-r5
tag: 4.3.1-0-debian-9-r8
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -140,17 +140,6 @@ service:
##
persistence:
enabled: true
apache:
## apache data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>
## If set to "-", storageClassName: "", which disables dynamic provisioning
## If undefined (the default) or set to null, no storageClassName spec is
## set, choosing the default provisioner. (gp2 on AWS, standard on
## GKE, AWS & OpenStack)
##
# storageClass: "-"
accessMode: ReadWriteOnce
size: 1Gi
orangehrm:
## orangehrm data Persistent Volume Storage Class
## If defined, storageClassName: <storageClass>