mirror of
https://github.com/bitnami/charts.git
synced 2026-08-10 14:15:55 +08:00
Fix conflicts
This commit is contained in:
tompizmor
@@ -1,6 +1,6 @@
|
||||
name: nginx
|
||||
version: 0.5.1
|
||||
appVersion: 1.12.2
|
||||
version: 0.5.2
|
||||
appVersion: 1.14.0
|
||||
description: Chart for the nginx server
|
||||
keywords:
|
||||
- nginx
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/nginx
|
||||
tag: 1.12.2
|
||||
tag: 1.14.0
|
||||
## 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: node
|
||||
version: 1.0.2
|
||||
version: 2.0.0
|
||||
appVersion: 9.5.0
|
||||
description: Event-driven I/O server-side JavaScript environment based on V8
|
||||
keywords:
|
||||
|
||||
+20
-11
@@ -145,10 +145,10 @@ ingress:
|
||||
1. Create a secret containing your database credentials:
|
||||
|
||||
```
|
||||
$ kubectl create secret generic my-database-secret --from-literal=host=YOUR_DATABASE_HOST --from-literal=port=YOUR_DATABASE_PORT --from-literal=user=YOUR_DATABASE_USER --from-literal=password=YOUR_DATABASE_PASSWORD
|
||||
$ kubectl create secret generic my-database-secret --from-literal=host=YOUR_DATABASE_HOST --from-literal=port=YOUR_DATABASE_PORT --from-literal=username=YOUR_DATABASE_USER --from-literal=password=YOUR_DATABASE_PASSWORD --from-literal=database=YOUR_DATABASE_NAME
|
||||
```
|
||||
|
||||
`YOUR_DATABASE_HOST`, `YOUR_DATABASE_PORT`, `YOUR_DATABASE_USER` and `YOUR_DATABASE_PASSWORD` are placeholders that must be replaced with correct values.
|
||||
`YOUR_DATABASE_HOST`, `YOUR_DATABASE_PORT`, `YOUR_DATABASE_USER`, `YOUR_DATABASE_PASSWORD`, and `YOUR_DATABASE_NAME` are placeholders that must be replaced with correct values.
|
||||
|
||||
2. Deploy the node chart specifying the secret name
|
||||
|
||||
@@ -160,6 +160,16 @@ ingress:
|
||||
|
||||
1. Install Service Catalog in your Kubernetes cluster following [this instructions](https://kubernetes.io/docs/tasks/service-catalog/install-service-catalog-using-helm/)
|
||||
2. Install the Open Service Broker for Azure in your Kubernetes cluster following [this instructions](https://github.com/Azure/open-service-broker-azure/tree/master/contrib/k8s/charts/open-service-broker-azure)
|
||||
|
||||
> TIP: you may want to install the osba chart setting the `modules.minStability=EXPERIMENTAL` to see all the available services.
|
||||
>
|
||||
> $ helm install azure/open-service-broker-azure --name osba --namespace osba \
|
||||
> --set azure.subscriptionId=$AZURE_SUBSCRIPTION_ID \
|
||||
> --set azure.tenantId=$AZURE_TENANT_ID \
|
||||
> --set azure.clientId=$AZURE_CLIENT_ID \
|
||||
> --set azure.clientSecret=$AZURE_CLIENT_SECRET \
|
||||
> --set modules.minStability=EXPERIMENTAL
|
||||
|
||||
3. Create and deploy a ServiceInstance to provision a database server in Azure cloud.
|
||||
|
||||
```
|
||||
@@ -170,17 +180,16 @@ ingress:
|
||||
labels:
|
||||
app: mongodb
|
||||
spec:
|
||||
clusterServiceClassExternalName: azure-cosmos-mongo-db
|
||||
clusterServicePlanExternalName: mongo-db
|
||||
clusterServiceClassExternalName: azure-cosmosdb-mongo-account
|
||||
clusterServicePlanExternalName: account
|
||||
parameters:
|
||||
location: YOUR_AZURE_LOCATION
|
||||
resourceGroup: mongodb-k8s-service-catalog
|
||||
sslEnforcement: disabled
|
||||
firewallRules:
|
||||
- startIPAddress: "0.0.0.0"
|
||||
endIPAddress: "255.255.255.255"
|
||||
name: "AllowAll"
|
||||
ipFilters:
|
||||
allowedIPRanges:
|
||||
- "0.0.0.0/0"
|
||||
```
|
||||
|
||||
Please update the `YOUR_AZURE_LOCATION` placeholder in the above example.
|
||||
|
||||
```
|
||||
@@ -195,8 +204,8 @@ ingress:
|
||||
|
||||
Once the instance has been provisioned in Azure, a new secret should have been automatically created with the connection parameters for your application.
|
||||
|
||||
Deploy the helm chart enabling the Azure external database makes the following assumptions:
|
||||
Deploying the helm chart enabling the Azure external database makes the following assumptions:
|
||||
- You would want an Azure CosmosDB MongoDB database
|
||||
- Your application uses DATABASE_HOST, DATABASE_PORT, DATABASE_USER and DATABASE_PASSWORD environment variables to connect to the database.
|
||||
- Your application uses DATABASE_HOST, DATABASE_PORT, DATABASE_USER, DATABASE_PASSWORD, and DATABASE_NAME environment variables to connect to the database.
|
||||
|
||||
You can read more about the kubernetes service catalog at https://github.com/kubernetes-bitnami/service-catalog
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
{{- else if contains "ClusterIP" .Values.serviceType }}
|
||||
|
||||
export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "node.name" . }}" -o jsonpath="{.items[0].metadata.name}")
|
||||
echo http://127.0.0.1:8080/
|
||||
kubectl port-forward $POD_NAME 8080:80
|
||||
kubectl port-forward $POD_NAME 3000:3000
|
||||
|
||||
Access to http://127.0.0.1:3000/
|
||||
{{- end }}
|
||||
|
||||
@@ -29,3 +29,14 @@ Create chart name and version as used by the chart label.
|
||||
{{- define "node.chart" -}}
|
||||
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{/*
|
||||
Custom template to get proper service name
|
||||
*/}}
|
||||
{{- define "node.secretName" -}}
|
||||
{{- if .Values.externaldb.secretName }}
|
||||
{{- printf "%s" .Values.externaldb.secretName }}
|
||||
{{- else }}
|
||||
{{- printf "%s-%s" .Release.Name "mongodb-binding" | trunc 63 | trimSuffix "-" -}}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
@@ -63,26 +63,39 @@ spec:
|
||||
- name: DATABASE_HOST
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .Values.externaldb.secretName }}
|
||||
name: {{ template "node.secretName" . }}
|
||||
key: {{ template "externaldb.host" $type }}
|
||||
{{- if not .Values.externaldb.broker.serviceInstanceName }}
|
||||
- name: DATABASE_NAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "node.secretName" . }}
|
||||
key: database
|
||||
{{ else }}
|
||||
- name: DATABASE_NAME
|
||||
value: ""
|
||||
{{- end }}
|
||||
- name: DATABASE_PORT
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .Values.externaldb.secretName }}
|
||||
name: {{ template "node.secretName" . }}
|
||||
key: {{ template "externaldb.port" $type }}
|
||||
- name: DATABASE_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .Values.externaldb.secretName }}
|
||||
name: {{ template "node.secretName" . }}
|
||||
key: {{ template "externaldb.username" $type }}
|
||||
- name: DATABASE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ .Values.externaldb.secretName }}
|
||||
name: {{ template "node.secretName" . }}
|
||||
key: {{ template "externaldb.password" $type }}
|
||||
{{- if .Values.externaldb.ssl }}
|
||||
- name: DATABASE_CONNECTION_OPTIONS
|
||||
value: "ssl=true"
|
||||
{{ else }}
|
||||
- name: DATABASE_CONNECTION_OPTIONS
|
||||
value: ""
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
- name: DATA_FOLDER
|
||||
|
||||
@@ -11,9 +11,5 @@ metadata:
|
||||
spec:
|
||||
instanceRef:
|
||||
name: {{ .Values.externaldb.broker.serviceInstanceName }}
|
||||
{{- if .Values.externaldb.broker.serviceInstanceName }}
|
||||
secretName: {{ .Values.externaldb.secretName }}
|
||||
{{ else }}
|
||||
secretName: {{ template "node.fullname" . }}-mongodb-secret
|
||||
{{- end }}
|
||||
secretName: {{ template "node.secretName" . }}
|
||||
{{- end }}
|
||||
|
||||
@@ -42,7 +42,7 @@ applicationPort: 3000
|
||||
## Kubernetes configuration
|
||||
## For minikube, set this to NodePort, elsewhere use LoadBalancer
|
||||
##
|
||||
serviceType: LoadBalancer
|
||||
serviceType: ClusterIP
|
||||
|
||||
## Enable persistence using Persistent Volume Claims
|
||||
## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
|
||||
@@ -75,6 +75,12 @@ mongodb:
|
||||
## Whether to deploy a mongodb server to satisfy the applications database requirements.
|
||||
## To use an external database set this to false and configure the externaldb parameters
|
||||
install: true # Check mongodb chart for configuration values
|
||||
## MongoDB custom user and database
|
||||
## ref: https://github.com/bitnami/bitnami-docker-mongodb/blob/master/README.md#creating-a-user-and-database-on-first-run
|
||||
##
|
||||
mongodbUsername: user
|
||||
mongodbDatabase: test_db
|
||||
mongodbPassword: secret_password
|
||||
|
||||
## Provision an external database (Only if mongodb.install is false)
|
||||
## You can:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: drupal
|
||||
version: 0.11.16
|
||||
appVersion: 8.5.2
|
||||
version: 0.11.17
|
||||
appVersion: 8.5.3
|
||||
description: One of the most versatile open source content management systems.
|
||||
keywords:
|
||||
- drupal
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/drupal
|
||||
tag: 8.5.2
|
||||
tag: 8.5.3
|
||||
## 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
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/ghost
|
||||
tag: 1.22.1
|
||||
tag: 1.22.3
|
||||
## 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: parse
|
||||
version: 1.0.2
|
||||
version: 1.0.3
|
||||
appVersion: 2.7.4
|
||||
description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more.
|
||||
keywords:
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dependencies:
|
||||
- name: mongodb
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
version: 0.4.15
|
||||
digest: sha256:1a4e23d283ae090cf7595d7e255a0804b66a20f94620a4063b1271b2aa8b0879
|
||||
generated: 2017-09-03T14:24:36.800583401-04:00
|
||||
version: 0.4.24
|
||||
digest: sha256:13691f4fa1d39a912a1a47710bd95e2442584e6d50a75b222412087ba46770c7
|
||||
generated: 2018-04-30T10:49:23.667014102+02:00
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
dependencies:
|
||||
- name: mongodb
|
||||
version: 0.4.15
|
||||
version: 0.4.24
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: phabricator
|
||||
version: 1.0.4
|
||||
appVersion: 2018.15.0
|
||||
version: 1.0.5
|
||||
appVersion: 2018.16.0
|
||||
description: Collection of open source web applications that help software companies build better software.
|
||||
keywords:
|
||||
- phabricator
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/phabricator
|
||||
tag: 2018.15.0
|
||||
tag: 2018.16.0
|
||||
## 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: rabbitmq
|
||||
version: 0.7.6
|
||||
version: 0.8.0
|
||||
appVersion: 3.7.4
|
||||
description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
|
||||
keywords:
|
||||
|
||||
@@ -15,5 +15,3 @@ data:
|
||||
default_user={{.Values.rabbitmq.username}}
|
||||
default_pass=CHANGEME
|
||||
{{ .Values.rabbitmq.configuration | indent 4 }}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ template "rabbitmq.fullname" . }}
|
||||
name: {{ template "rabbitmq.fullname" . }}
|
||||
labels:
|
||||
app: {{ template "rabbitmq.name" . }}
|
||||
chart: {{ template "rabbitmq.chart" . }}
|
||||
|
||||
@@ -27,7 +27,7 @@ spec:
|
||||
{{- end}}
|
||||
{{- end }}
|
||||
{{- if .Values.rbacEnabled}}
|
||||
serviceAccountName: {{ template "rabbitmq.fullname" . }}
|
||||
serviceAccountName: {{ template "rabbitmq.fullname" . }}
|
||||
{{- end }}
|
||||
{{- if .Values.affinity }}
|
||||
affinity:
|
||||
@@ -42,7 +42,7 @@ spec:
|
||||
{{ toYaml .Values.tolerations | indent 8 }}
|
||||
{{- end }}
|
||||
terminationGracePeriodSeconds: 10
|
||||
containers:
|
||||
containers:
|
||||
- name: {{ template "rabbitmq.fullname" . }}
|
||||
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
|
||||
@@ -52,7 +52,6 @@ spec:
|
||||
- |
|
||||
#create the var/lib/rabbitmq directory under the bitnami folder
|
||||
mkdir -p /opt/bitnami/rabbitmq/var/lib/rabbitmq/
|
||||
|
||||
#persist the erlang cookie in both places for server and cli tools
|
||||
echo $RABBITMQ_ERL_COOKIE > /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie
|
||||
cp /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie /root
|
||||
@@ -127,7 +126,7 @@ spec:
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ template "rabbitmq.fullname" . }}
|
||||
key: rabbitmq-erlang-cookie
|
||||
key: rabbitmq-erlang-cookie
|
||||
- name: RABBITMQ_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
@@ -135,7 +134,7 @@ spec:
|
||||
key: rabbitmq-password
|
||||
volumes:
|
||||
- name: config-volume
|
||||
configMap:
|
||||
configMap:
|
||||
name: {{ template "rabbitmq.fullname" . }}-config
|
||||
items:
|
||||
- key: rabbitmq.conf
|
||||
@@ -149,4 +148,4 @@ spec:
|
||||
{{- else }}
|
||||
emptyDir: {}
|
||||
{{- end -}}
|
||||
|
||||
|
||||
|
||||
@@ -16,6 +16,9 @@ spec:
|
||||
- name: amqp
|
||||
port: {{ .Values.rabbitmq.nodePort }}
|
||||
targetPort: amqp
|
||||
{{- if (and (eq .Values.serviceType "NodePort") (not (empty .Values.rabbitmq.nodePort))) }}
|
||||
nodePort: {{ .Values.rabbitmq.nodePort }}
|
||||
{{- end }}
|
||||
- name: dist
|
||||
port: {{ .Values.rabbitmq.nodePort | add 20000 }}
|
||||
targetPort: dist
|
||||
|
||||
@@ -10,18 +10,18 @@ image:
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
##
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
|
||||
## set to true if you would like to see extra information on logs
|
||||
## it turns BASH and NAMI debugging in minideb
|
||||
## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
|
||||
## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging
|
||||
debug: false
|
||||
|
||||
|
||||
## Optionally specify an array of imagePullSecrets.
|
||||
## Secrets must be manually created in the namespace.
|
||||
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
|
||||
##
|
||||
# pullSecrets:
|
||||
# - myRegistrKeySecretName
|
||||
# - myRegistrKeySecretName
|
||||
|
||||
|
||||
## does your cluster have rbac enabled?
|
||||
@@ -64,11 +64,11 @@ rabbitmq:
|
||||
## ref: https://www.rabbitmq.com/disk-alarms.html
|
||||
##
|
||||
diskFreeLimit: '"6GiB"'
|
||||
|
||||
|
||||
## Plugins to enable
|
||||
plugins: |-
|
||||
[rabbitmq_management,rabbitmq_peer_discovery_k8s].
|
||||
|
||||
|
||||
## Configution file content
|
||||
configuration: |-
|
||||
## Clustering
|
||||
@@ -78,10 +78,11 @@ rabbitmq:
|
||||
cluster_formation.node_cleanup.interval = 10
|
||||
cluster_formation.node_cleanup.only_log_warning = false
|
||||
cluster_partition_handling = autoheal
|
||||
## queue master locator
|
||||
## queue master locator
|
||||
queue_master_locator=min-masters
|
||||
## enable guest user
|
||||
## enable guest user
|
||||
loopback_users.guest = false
|
||||
|
||||
## Kubernetes service type
|
||||
serviceType: ClusterIP
|
||||
|
||||
@@ -120,7 +121,7 @@ replicas: 3
|
||||
## Node labels and tolerations for pod assignment
|
||||
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
|
||||
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
|
||||
nodeSelector:
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/arch: amd64
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
|
||||
@@ -23,8 +23,8 @@ image:
|
||||
# pullSecrets:
|
||||
# - myRegistrKeySecretName
|
||||
|
||||
## does your cluster have rbac enabled? assume no by default
|
||||
rbacEnabled: false
|
||||
## does your cluster have rbac enabled? assume yes by default
|
||||
rbacEnabled: true
|
||||
|
||||
## section of specific values for rabbitmq
|
||||
rabbitmq:
|
||||
@@ -66,7 +66,7 @@ rabbitmq:
|
||||
|
||||
## Plugins to enable
|
||||
plugins: |-
|
||||
[rabbitmq_management,rabbitmq_peer_discovery_k8s].
|
||||
[rabbitmq_management, rabbitmq_peer_discovery_k8s].
|
||||
|
||||
## Configution file content
|
||||
configuration: |-
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name: redis
|
||||
version: 3.0.2
|
||||
version: 3.0.5
|
||||
appVersion: 4.0.9
|
||||
description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
|
||||
keywords:
|
||||
|
||||
@@ -138,7 +138,7 @@ Specify each parameter using the `--set key=value[,key=value]` argument to `helm
|
||||
|
||||
```bash
|
||||
$ helm install --name my-release \
|
||||
--set redisPassword=secretpassword \
|
||||
--set password=secretpassword \
|
||||
stable/redis
|
||||
```
|
||||
|
||||
|
||||
@@ -113,21 +113,21 @@ master:
|
||||
|
||||
## Redis Master Liveness Probe
|
||||
livenessProbe:
|
||||
enabled: false
|
||||
# initialDelaySeconds: 30
|
||||
# periodSeconds: 10
|
||||
# timeoutSeconds: 5
|
||||
# successThreshold: 1
|
||||
# failureThreshold: 5
|
||||
enabled: true
|
||||
initialDelaySeconds: 30
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 5
|
||||
successThreshold: 1
|
||||
failureThreshold: 5
|
||||
|
||||
## Redis Master Readiness Probe
|
||||
readinessProbe:
|
||||
enabled: false
|
||||
# initialDelaySeconds: 5
|
||||
# periodSeconds: 10
|
||||
# timeoutSeconds: 1
|
||||
# successThreshold: 1
|
||||
# failureThreshold: 5
|
||||
enabled: true
|
||||
initialDelaySeconds: 5
|
||||
periodSeconds: 10
|
||||
timeoutSeconds: 1
|
||||
successThreshold: 1
|
||||
failureThreshold: 5
|
||||
## Redis Master Node labels and tolerations for pod assignment
|
||||
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector
|
||||
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: wordpress
|
||||
version: 1.0.3
|
||||
appVersion: 4.9.4
|
||||
version: 1.0.5
|
||||
appVersion: 4.9.5
|
||||
description: Web publishing platform for building blogs and websites.
|
||||
icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
|
||||
keywords:
|
||||
|
||||
@@ -90,6 +90,7 @@ The following table lists the configurable parameters of the WordPress chart and
|
||||
| `ingress.secrets[0].certificate` | TLS Secret Certificate | `nil` |
|
||||
| `ingress.secrets[0].key` | TLS Secret Key | `nil` |
|
||||
| `persistence.enabled` | Enable persistence using PVC | `true` |
|
||||
| `persistence.existingClaim` | Enable persistence using an existing PVC | `nil` |
|
||||
| `persistence.storageClass` | PVC Storage Class | `nil` (uses alpha storage class annotation) |
|
||||
| `persistence.accessMode` | PVC Access Mode | `ReadWriteOnce` |
|
||||
| `persistence.size` | PVC Storage Request | `10Gi` |
|
||||
|
||||
@@ -138,7 +138,7 @@ spec:
|
||||
- name: wordpress-data
|
||||
{{- if .Values.persistence.enabled }}
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ template "fullname" . }}
|
||||
claimName: {{ .Values.persistence.existingClaim | default (include "fullname" .) }}
|
||||
{{- else }}
|
||||
emptyDir: {}
|
||||
{{ end }}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{{- if .Values.persistence.enabled -}}
|
||||
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
||||
kind: PersistentVolumeClaim
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/wordpress
|
||||
tag: 4.9.4
|
||||
tag: 4.9.5
|
||||
## 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
|
||||
@@ -222,6 +222,10 @@ persistence:
|
||||
## GKE, AWS & OpenStack)
|
||||
##
|
||||
# storageClass: "-"
|
||||
##
|
||||
## If you want to reuse an existing claim, you can pass the name of the PVC using
|
||||
## the existingClaim variable
|
||||
# existingClaim: your-claim
|
||||
accessMode: ReadWriteOnce
|
||||
size: 10Gi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user