fix namespace

fix namespace

poyee-app/DEV/Jenkinsfile

@@ -37,7 +37,7 @@ EOF
                                 "-Dserver.port=80",
                                 "-jar", "/app/target/${CONFIG.service.jar}",
                                 "--spring.config.location=file:/app/configs/application.yml,file:/app/configs/application-druid.yml"]
-                            String[] K8S_BACKUPS = []
+                            String[] K8S_BACKUPS = ["configmap-env.ini", "deployment.yaml", "service.yaml"]
 
                             if ("upgrade" == action || "upgrade:selected" == action) {
 

sharedLibs/k3sUtil.groovy

@@ -2,7 +2,7 @@
 //   - SERVICE: service配置
 //   - K3S: k3s配置
 //   - configMapPath: 指定configMapPath，默认使用"projdir/configmap-env"
-def applyConfigMapEnv(Object SERVICE, Object K3S, String configMapPath='projdir/configmap-env.ini', String defaultNS='default') {
+def applyConfigMapEnv(Object SERVICE, Object K3S, String configMapPath='projdir/configmap-env.ini', String defaultNS='ahxpm') {
 
   println "applying k3s configmap environment from ${configMapPath}"
   configmap_env_name = "${SERVICE.name}${SERVICE.version}-env"
@@ -16,7 +16,7 @@ def applyConfigMapEnv(Object SERVICE, Object K3S, String configMapPath='projdir/
 //   - SERVICE: service配置
 //   - K3S: k3s配置
 //   - configMapPath: 指定configMapPath，默认使用./configmap/
-def applyConfigMapConfig(Object SERVICE, Object K3S, String configMapPath = './configmap/', String defaultNS='default') {
+def applyConfigMapConfig(Object SERVICE, Object K3S, String configMapPath = './configmap/', String defaultNS='ahxpm') {
 
   println "applying k3s configmap config from ${configMapPath}"
   configmap_name = "${SERVICE.name}${SERVICE.version}-config"

sharedLibs/stages.k8s.groovy

@@ -168,7 +168,7 @@ def deployWithConfigmapEnvOnly(SERVICE, K3S, String base_branch, String[] args,
     k3sUtils.applyService(K3S, 'service.yaml')
 }
 
-def deployWithConfigmapEnvOnly_rollback(SERVICE, K3S, String rollbackBuildNumber, String[] args, configmapEnv="./configmap-env.ini", namespace='default') {
+def deployWithConfigmapEnvOnly_rollback(SERVICE, K3S, String rollbackBuildNumber, String[] args, configmapEnv="./configmap-env.ini", namespace='ahxpm') {
 
     print "loading ${sharedLibsPath}/k3sUtil.groovy..."
     def k3sUtils = load "${sharedLibsPath}/k3sUtil.groovy"
@@ -199,7 +199,7 @@ def deployWithConfigmapEnvOnly_rollback(SERVICE, K3S, String rollbackBuildNumber
     }
 }
 
-def deployWithConfigmapEnvOnly2nd(SERVICE, K3S, String base_branch, String[] args, configmapEnv="./configmap-env.ini", namespace='default') {
+def deployWithConfigmapEnvOnly2nd(SERVICE, K3S, String base_branch, String[] args, configmapEnv="./configmap-env.ini", namespace='ahxpm') {
 
     print "loading ${sharedLibsPath}/k3sUtil.groovy..."
     def k3sUtils = load "${sharedLibsPath}/k3sUtil.groovy"
@@ -227,7 +227,7 @@ def deployWithConfigmapEnvOnly2nd(SERVICE, K3S, String base_branch, String[] arg
     k3sUtils.applyService(K3S, 'service2.yaml')
 }
 
-def deployWithConfigmapEnvOnly2nd_rollback(SERVICE, K3S, String rollbackBuildNumber, String[] args, configmapEnv="./configmap-env.ini", namespace='default') {
+def deployWithConfigmapEnvOnly2nd_rollback(SERVICE, K3S, String rollbackBuildNumber, String[] args, configmapEnv="./configmap-env.ini", namespace='ahxpm') {
 
     print "loading ${sharedLibsPath}/k3sUtil.groovy..."
     def k3sUtils = load "${sharedLibsPath}/k3sUtil.groovy"
@@ -367,7 +367,7 @@ def execute(CONFIG, base_branch, closures=[:]) {                    //配置文
         if (closures.BUILDJAR != null)                          //检查是否自定义闭包，有就使用，没有就使用默认方法
             projDir = closures.BUILDJAR()
         else
-            projDir = buildJar(CONFIG.service, projDir) //default
+            projDir = buildJar(CONFIG.service, projDir) //ahxpm
 
         if (closures.BACKUP != null)
             closures.BACKUP()
@@ -375,7 +375,7 @@ def execute(CONFIG, base_branch, closures=[:]) {                    //配置文
         if (closures.GENERATEDOCKERFILE != null)
             projDir = closures.GENERATEDOCKERFILE()
         else
-            projDir = generateDockerfile(CONFIG.service) //default
+            projDir = generateDockerfile(CONFIG.service) //ahxpm
 
         if (closures.BUILDIMAGE != null)
             imageUri = closures.BUILDIMAGE()
@@ -419,12 +419,12 @@ def upgrade(Object CONFIG, String base_branch, String[] k8sBackupFiles, closures
         if (closures.BUILDJAR != null)
             projDir = closures.BUILDJAR()
         else
-            projDir = buildJar(CONFIG.service, projDir) //default
+            projDir = buildJar(CONFIG.service, projDir) //ahxpm
 
         if (closures.GENERATEDOCKERFILE != null)
             projDir = closures.GENERATEDOCKERFILE()
         else
-            projDir = generateDockerfile(CONFIG.service) //default
+            projDir = generateDockerfile(CONFIG.service) //ahxpm
 
         if (closures.BUILDIMAGE != null)
             imageUri = closures.BUILDIMAGE()