Merge pull request teracyhq#27 from hieptranquoc/master

@ teracyhq#26 | should let the users choose the api version
datphan · Mar 12, 2020 · f89a681 · f89a681
2 parents 750f09d + 9800a88
commit f89a681
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ sudo: false
 env:
   global:
   - HELM_URL=https://storage.googleapis.com/kubernetes-helm
-  - HELM_TARBALL=helm-v2.9.1-linux-amd64.tar.gz
+  - HELM_TARBALL=helm-dev-v3-linux-amd64.tar.gz
   - ALLOW_OVERWRITE_INDEX_FILE=true
 before_install:
 - git submodule update --init --recursive
@@ -12,7 +12,6 @@ install:
 - wget -q ${HELM_URL}/${HELM_TARBALL}
 - tar xzfv ${HELM_TARBALL}
 - PATH=`pwd`/linux-amd64/:$PATH
-- helm init --client-only
 - if [ ! -d ${HOME}/google-cloud-sdk ]; then export CLOUDSDK_CORE_DISABLE_PROMPTS=1;
   curl https://sdk.cloud.google.com | bash; fi
 - source /home/travis/google-cloud-sdk/path.bash.inc

diff --git a/incubator/duplicity/templates/job.yaml b/incubator/duplicity/templates/job.yaml
@@ -1,5 +1,5 @@
 {{- $fullname := include "duplicity.fullname" . -}}
-apiVersion: batch/v1
+apiVersion: {{ default "batch/v1" .Values.kubeMeta.batchApiVersion }}
 kind: Job
 metadata:
   name: {{ $fullname }}

diff --git a/incubator/duplicity/values.yaml b/incubator/duplicity/values.yaml
@@ -1,3 +1,6 @@
+kubeMeta:
+  batchApiVersion: batch/v1
+
 repository: teracy/duplicity
 tag: latest
 pullPolicy: IfNotPresent

diff --git a/incubator/mysqlha/Chart.yaml b/incubator/mysqlha/Chart.yaml
@@ -1,5 +1,6 @@
 name: mysqlha
 version: 0.4.0
+apiVersion: v1
 appVersion: 5.7.13
 description: MySQL cluster with a single master and zero or more slave replicas
 keywords:

diff --git a/incubator/mysqlha/templates/statefulset.yaml b/incubator/mysqlha/templates/statefulset.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta1
+apiVersion: {{ default "apps/v1" .Values.kubeMeta.appsApiVersion }}
 kind: StatefulSet
 metadata:
   name: {{ template "fullname" . }}

diff --git a/incubator/mysqlha/values.yaml b/incubator/mysqlha/values.yaml
@@ -1,6 +1,9 @@
 ## mysql image version
 ## ref: https://hub.docker.com/r/library/mysql/tags/
 ##
+kubeMeta:
+  appsApiVersion: apps/v1
+
 mysqlImage: mysql:5.7.13
 # TODO(hoatle): use teracy/xtrabackup:2.4 by default instead
 xtraBackupImage: gcr.io/google-samples/xtrabackup:1.0

diff --git a/incubator/pv-join/Chart.yaml b/incubator/pv-join/Chart.yaml
@@ -1,4 +1,4 @@
-apiVersion: v0.1
+apiVersion: v1
 appVersion: "0.1"
 description: A Helm chart for Kubernetes to join persistent volumes to do tasks
 name: pv-join

diff --git a/incubator/pv-join/templates/deployment.yaml b/incubator/pv-join/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: {{ default "apps/v1" .Values.kubeMeta.appsApiVersion }}
 kind: Deployment
 metadata:
   name: {{ include "pv-join.fullname" . }}

diff --git a/incubator/pv-join/values.yaml b/incubator/pv-join/values.yaml
@@ -2,6 +2,9 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+kubeMeta:
+  appsApiVersion: apps/v1
+
 replicaCount: 1
 
 image: