diff options
author | jmac <james.macnider@amdocs.com> | 2018-04-08 19:28:01 +0000 |
---|---|---|
committer | BorislavG <Borislav.Glozman@amdocs.com> | 2018-04-10 07:54:36 +0000 |
commit | a4ddffab35edfb474dbd9a5376398cb2bf88ea18 (patch) | |
tree | d078ad79fc9c99ea70c5ca15a5a7a5a9c4cf73fe /kubernetes/common/mysql/values.yaml | |
parent | cdda4e20f3904dcb193625350c91d596a0bc4197 (diff) |
Restore pv and pvc in mysql chart
This change restores the pv.yaml and pvc.yaml that were previously
removed. These are required for the case when the NFS provisioner is
disabled. I've added a condition to these files such that they should
be disabled if the NFS provisioner is enabled. The two ways of
managing entities need to be mutually exclusive.
Borislav: Solution for directory creation problem
upon first deployment with persistence enabled
Borislav: Fixed licenses for mysql
Change-Id: I9879b3b6574f8026a28793b9d86d6ef3ec9ce2e9
Signed-off-by: jmac <james.macnider@amdocs.com>
Issue-ID: OOM-889
Diffstat (limited to 'kubernetes/common/mysql/values.yaml')
-rw-r--r-- | kubernetes/common/mysql/values.yaml | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/kubernetes/common/mysql/values.yaml b/kubernetes/common/mysql/values.yaml index 43b690aa94..1e8c8bdd84 100644 --- a/kubernetes/common/mysql/values.yaml +++ b/kubernetes/common/mysql/values.yaml @@ -1,3 +1,17 @@ +# Copyright © 2017 Amdocs, Bell Canada +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + ################################################################# # Global configuration defaults. ################################################################# @@ -6,15 +20,14 @@ global: repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ== persistence: {} readinessRepository: oomk8s - readinessImage: readiness-check:1.0.0 + readinessImage: readiness-check:1.1.1 ################################################################# # Application configuration defaults. ################################################################# -#repository: mysql -repository: registry.hub.docker.com +dockerHubRepository: registry.hub.docker.com image: library/mysql:5.7 pullPolicy: Always @@ -29,6 +42,8 @@ nodeSelector: {} affinity: {} +disableNfsProvisioner: true + # probe configuration parameters liveness: initialDelaySeconds: 30 @@ -61,7 +76,7 @@ persistence: accessMode: ReadWriteMany size: 1Gi mountPath: /dockerdata-nfs - mountSubPath: mysql/data + mountSubPath: "mysql/data" service: name: mysql |