Merge pull request #4 from devil-scp/master

更新镜像及apiversion

Author: TimeBye

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: registry.cn-hangzhou.aliyuncs.com/choerodon-tools/cibase:0.8.1
+image: registry.cn-shanghai.aliyuncs.com/choerodon-tools/cibase:0.9.1
 
 stages:
   - build

charts/model-service/templates/_helpers.tpl

@@ -25,4 +25,26 @@ choerodon.io/logs-parser: {{ .Values.logs.parser | quote }}
 {{- define "service.monitoring.pod.annotations" -}}
 choerodon.io/metrics-group: {{ .Values.metrics.group | quote }}
 choerodon.io/metrics-path: {{ .Values.metrics.path | quote }}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "app.deployment.apiVersion" -}}
+{{- if semverCompare "<1.9-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta2" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Return the appropriate apiVersion for ingress.
+*/}}
+{{- define "app.ingress.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- end -}}
 {{- end -}}

charts/model-service/templates/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: apps/v1beta2
+apiVersion: {{ include "app.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ .Release.Name }}

charts/model-service/templates/ingress.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-apiVersion: extensions/v1beta1
+apiVersion: {{ include "app.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
   name: {{ .Release.Name }}

charts/model-service/values.yaml

@@ -15,7 +15,7 @@ preJob:
   # job超时时间
   timeout: 300
   # job镜像库地址
-  image: registry.cn-hangzhou.aliyuncs.com/choerodon-tools/dbtool:0.6.4
+  image: registry.cn-hangzhou.aliyuncs.com/choerodon-tools/dbtool:0.6.7
   preConfig:
     # 是否初始化manager_service数据库
     enabled: true

init-local-database.sh

@@ -2,7 +2,7 @@
 MAVEN_LOCAL_REPO=$(cd / && mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout)
 TOOL_GROUP_ID=io.choerodon
 TOOL_ARTIFACT_ID=choerodon-tool-liquibase
-TOOL_VERSION=0.11.1.RELEASE
+TOOL_VERSION=0.12.0.RELEASE
 TOOL_JAR_PATH=${MAVEN_LOCAL_REPO}/${TOOL_GROUP_ID/\./\/}/${TOOL_ARTIFACT_ID}/${TOOL_VERSION}/${TOOL_ARTIFACT_ID}-${TOOL_VERSION}.jar
 mvn org.apache.maven.plugins:maven-dependency-plugin:get \
  -Dartifact=${TOOL_GROUP_ID}:${TOOL_ARTIFACT_ID}:${TOOL_VERSION} \

pom.xml

@@ -12,12 +12,12 @@
     <parent>
         <groupId>io.choerodon</groupId>
         <artifactId>choerodon-framework-parent</artifactId>
-        <version>0.11.0.RELEASE</version>
+        <version>0.12.0.RELEASE</version>
     </parent>
 
     <!--choerodon-starters dependency-->
     <properties>
-        <choerodon.starters.version>0.11.1.RELEASE</choerodon.starters.version>
+        <choerodon.starters.version>0.12.0.RELEASE</choerodon.starters.version>
     </properties>
     <dependencies>
         <!--spring boot-->