oidc

ahx-oidc/DEV/Jenkinsfile

@@ -2,7 +2,7 @@ properties([
     parameters([
         // New preferred params:
         string(name: 'baseBranch', defaultValue: 'ahx-dev', description: '分支名（如 master, dev）'),
-        choice(name: 'namespace', defaultValue:'ahxpm',choices: ['ahxpm'], description: 'K8S namespace（如 default）'),
+        choice(name: 'namespace', choices: ['ahxpm'], description: 'K8S namespace（如 default）'),
         choice(name: 'action', choices: ['upgrade', 'upgrade:selected'], description: '选择操作类型')
         // Backward compatible legacy param:
         // string(name: 'actionParameter', defaultValue: 'refs/heads/dev', description: '参数路径（如 refs/heads/dev）')
@@ -27,4 +27,4 @@ node {
         println 'configs: ' + CONFIG
         pipeline.run(CONFIG, deployAction, stages, deployBaseBranch, deployNamespace)
     }
-}
+}

sharedLibs/k3sUtil.groovy

@@ -133,7 +133,7 @@ def generateCanaryService(Map kvs, String version, String template="service.yaml
   return outputFile
 }
 
-def applyDeployment(Object K3S, String deployment="deployment.yaml") {
+def applyDeployment(Object K3S, String deployment="deployment.yaml", String defaultNS='default') {
 
   if (!fileExists(deployment)) {
     println "ignore, file ${deployment} not exists" 
@@ -141,10 +141,10 @@ def applyDeployment(Object K3S, String deployment="deployment.yaml") {
   }
 
   println "applying k8s deployment file: ${deployment} ..."
-  sh "/k3s/kubectl --kubeconfig ${env.WORKSPACE}/${K3S.kubeconfig} apply -f ${deployment}"
+  sh "/k3s/kubectl --kubeconfig ${env.WORKSPACE}/${K3S.kubeconfig} apply -f ${deployment} -n ${defaultNS}"
 }
 
-def applyService(K3S, String service="service.yaml") {
+def applyService(K3S, String service="service.yaml", String defaultNS='default') {
 
   if (!fileExists(service)) {
     println "ignore, file ${service} not exists" 
@@ -152,7 +152,7 @@ def applyService(K3S, String service="service.yaml") {
   }
 
   println "applying k8s deployment file: ${service} ..."
-  sh "/k3s/kubectl --kubeconfig ${env.WORKSPACE}/${K3S.kubeconfig} apply -f ${service}"
+  sh "/k3s/kubectl --kubeconfig ${env.WORKSPACE}/${K3S.kubeconfig} apply -f ${service} -n ${defaultNS}"
 }
 
-return this
+return this

sharedLibs/stages.k8s.groovy

@@ -190,10 +190,10 @@ def deployWithConfigmapEnvOnly(SERVICE, K3S, String base_branch, String[] args,
         kvs.put('<service_health>', SERVICE.health)
     kvs.put('<configmap_env_name>', configmap_env_name)
     k3sUtils.generateDeployment(kvs, 'deployment.yaml')
-    k3sUtils.applyDeployment(K3S, 'deployment.yaml')
+    k3sUtils.applyDeployment(K3S, 'deployment.yaml', namespace)
 
     k3sUtils.generateService(kvs, 'service.yaml')
-    k3sUtils.applyService(K3S, 'service.yaml')
+    k3sUtils.applyService(K3S, 'service.yaml', namespace)
 }
 
 def deployWithConfigmapEnvOnly_rollback(SERVICE, K3S, String rollbackBuildNumber, String[] args, configmapEnv="./configmap-env.ini", namespace='default') {
@@ -731,4 +731,4 @@ def sendGroupNotification(String title, String content) {
 }    
 
         
-return this
+return this