aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormilaszki <daniel.milaszkiewicz@nokia.com>2020-07-07 12:23:07 +0000
committerKrzysztof Opasiak <k.opasiak@samsung.com>2020-07-13 19:13:52 +0000
commit804afe7cc6253cfc914c6a0f589a851443182481 (patch)
tree41caa41193c2c8324f8eda61b6bd05ea62a27790
parent88c4c3788d35af106d46ace89fabfb1efca1bca8 (diff)
[COMMON] Make MariaDB compatible with Kubernetes v1.17
Issue-ID: OOM-2482 Signed-off-by: Daniel Milaszkiewicz <daniel.milaszkiewicz@nokia.com> Change-Id: I5dbe0b168535d48068a93dd3494a59bf90ea2a6f
-rw-r--r--kubernetes/common/mariadb-galera/resources/create-deployment.yml2
-rw-r--r--kubernetes/common/mariadb-galera/templates/statefulset.yaml5
2 files changed, 5 insertions, 2 deletions
diff --git a/kubernetes/common/mariadb-galera/resources/create-deployment.yml b/kubernetes/common/mariadb-galera/resources/create-deployment.yml
index 61bfc78945..d81d640b0d 100644
--- a/kubernetes/common/mariadb-galera/resources/create-deployment.yml
+++ b/kubernetes/common/mariadb-galera/resources/create-deployment.yml
@@ -47,4 +47,4 @@ spec:
key: password
name: {{ include "common.fullname" . }}-temp-upgrade-root
subdomain: {{ .Values.service.name }}
- hostname: {{ .Values.nameOverride }}-upgrade-deployment \ No newline at end of file
+ hostname: {{ .Values.nameOverride }}-upgrade-deployment
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index 855d50e5ea..47d1e0ef3d 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "common.fullname" . }}
@@ -27,6 +27,9 @@ metadata:
spec:
serviceName: {{ .Values.service.name }}
replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app: {{ include "common.fullname" . }}
template:
metadata:
labels:
se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
---
project: 'so'
project_creation_date: '2017-01-30'
lifecycle_state: 'Incubation'
project_category: ''
project_lead: &onap_releng_ptl
    name: 'Seshu Kumar'
    email: 'seshu.kumar.m@huawei.com'
    id: 'seshukm'
    company: 'Huawei'
    timezone: 'India/Bangalore'
primary_contact: *onap_releng_ptl
issue_tracking:
    type: 'jira'
    url: 'https://jira.onap.org/projects/SO'
    key: 'SO'
mailing_list:
    type: 'groups.io'
    url: 'lists.onap.org'
    tag: '<[sub-project_name]>'
realtime_discussion: ''
meetings:
    - type: 'zoom'
      agenda: 'https://wiki.onap.org/display/DW/Minutes+Of+Meeting'
      url: 'https://wiki.onap.org/display/DW/Service+Orchestrator+Project'
      server: 'n/a'
      channel: 'n/a'
      repeats: 'weekly'
      time: '14:00 UTC'
repositories:
    - so
    - so-chef-repo
    - so-docker-config
    - so-libs
    - so-so-config
committers:
    - <<: *onap_releng_ptl
    - name: 'Chuanyu Chen'
      email: 'chenchuanyu@huawei.com'
      company: 'Huawei'
      id: 'boychuanyu'
      timezone: 'Asia/Shanghai'
    - name: 'Byung-Woo Jun'
      email: 'byung-woo.jun@ericsson.com'
      company: 'Ericsson'
      id: 'byungwoojun'
      timezone: 'America/New_York'
    - name: 'DeWayne Filppi'
      email: 'dewayne@cloudify.co'
      company: 'Cloudify'
      id: 'dfilppi'
      timezone: 'America/Los_Angeles'
    - name: 'Max Benjamin'
      email: 'max.benjamin@att.com'
      company: 'ATT'
      id: 'mfour'
      timezone: 'America/New_York'
    - name: 'Yan Yang'
      email: 'yangyanyj@chinamobile.com'
      company: 'China Mobile'
      id: 'yangyan'
      timezone: 'Asia/Shanghai'
    - name: 'Marcus Williams'
      email: 'marcus.williams@intel.com'
      company: 'Intel'
      id: 'mgkwill'
      timezone: 'America/Los_Angeles'
    - name: 'Sanchita Pathak'
      email: 'sanchita@techmahindra.com'
      company: 'Tech Mahindra'
      id: 'sanchitap'
      timezone: 'Asia/Kolkata'
    - name: 'Steve Smokowski'
      email: 'ss835w@att.com'
      company: 'ATT'
      id: 'stevesmokowski'
      timezone: 'America/New_York'
    - name: 'Subhash Kumar Singh'
      email: 'Subhash.Kumar.Singh@huawei.com'
      company: 'Huawei'
      id: 'subhash_singh'
      timezone: 'Asia/Kolkata'
    - name: 'Lukasz Muszkieta'
      email: 'lukasz.muszkieta@nokia.com'
      company: 'Nokia'
      id: 'lukaszM'
      timezone: 'Europe/Warsaw'
tsc:
    approval: 'https://lists.onap.org/pipermail/onap-tsc'
    changes:
        - type: 'removal'
          name: 'Tal Liron'
          name: 'Heliu Zhong'
          name: 'Yuanwei Yang'
          name: 'Christophe Closset'
          name: 'Claude Noshpitz'
          name: 'maopeng zhang'
          name: 'Bin Hou'
          name: 'Fu Jinhua'
          name: 'Jie Feng'
          name: 'jackie tian'
          name: 'Deng Hui'
          link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html'
        - type: 'addition'
          name: 'Marcus Williams'
          name: 'Sanchita Pathak'
          link: 'https://lists.onap.org/pipermail/onap-tsc/2018-May/004802.html'
        - type: 'addition'
          name: 'Steve Smokowski'
          name: 'Subhash Kumar Singh'
          name: 'Lukasz Muszkieta'
          link: 'https://lists.onap.org/g/onap-tsc/message/4320'
        - type: 'removal'
          name: 'Rob Daugherty'
        - type: 'addition'
          name: 'Max Benjamin'
          link: 'https://lists.onap.org/g/onap-tsc/message/4981?p=,,,20,0,0,0::Created,,committer,20,2,0,31638681'