From 9d190f877595e6892c41259eba78923b50fbc29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Thu, 30 May 2019 17:32:29 +0200 Subject: [PATCH] Remove apache and/or php volume (#14316) Signed-off-by: Carlos Rodriguez Hernandez --- stable/orangehrm/Chart.yaml | 2 +- stable/orangehrm/README.md | 5 +---- stable/orangehrm/templates/apache-pvc.yaml | 24 ---------------------- stable/orangehrm/templates/deployment.yaml | 9 -------- stable/orangehrm/values.yaml | 13 +----------- 5 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 stable/orangehrm/templates/apache-pvc.yaml diff --git a/stable/orangehrm/Chart.yaml b/stable/orangehrm/Chart.yaml index 03916753e2..805860c3de 100644 --- a/stable/orangehrm/Chart.yaml +++ b/stable/orangehrm/Chart.yaml @@ -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. diff --git a/stable/orangehrm/README.md b/stable/orangehrm/README.md index 49c86ddb07..12c1c286eb 100644 --- a/stable/orangehrm/README.md +++ b/stable/orangehrm/README.md @@ -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). diff --git a/stable/orangehrm/templates/apache-pvc.yaml b/stable/orangehrm/templates/apache-pvc.yaml deleted file mode 100644 index d81c24c15e..0000000000 --- a/stable/orangehrm/templates/apache-pvc.yaml +++ /dev/null @@ -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 -}} diff --git a/stable/orangehrm/templates/deployment.yaml b/stable/orangehrm/templates/deployment.yaml index 7bbfe09e05..c90daef4db 100644 --- a/stable/orangehrm/templates/deployment.yaml +++ b/stable/orangehrm/templates/deployment.yaml @@ -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 }} diff --git a/stable/orangehrm/values.yaml b/stable/orangehrm/values.yaml index 763e8fdb27..9c01941d87 100644 --- a/stable/orangehrm/values.yaml +++ b/stable/orangehrm/values.yaml @@ -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: - ## 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: