oidc修改

ahx-oidc/DEV/Jenkinsfile

@@ -14,6 +14,7 @@ node {
     def deployAction = params.action ?: 'upgrade'
     def deployBaseBranch = params.baseBranch ?: 'dev'
     def deployNamespace = params.namespace ?: 'ahxpm'
+    println "deploy namespace: ${deployNamespace}"
     def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
     def stages = load "./sharedLibs/stages.k8s.groovy"
     def pipeline = load "./sharedLibs/pipelines.k8s.java.groovy"
@@ -25,7 +26,7 @@ node {
         def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
         CONFIG.pipeline = PROJECT_CONFIG.pipeline
         println 'configs: ' + CONFIG
-println 'deployNamespace: ' + deployNamespace
+        println 'deployNamespace: ' + deployNamespace
         pipeline.run(CONFIG, deployAction, stages, deployBaseBranch, deployNamespace)
     }
 }

ahx-oidc/DEV/deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: <service_name><service_version>
+  namespace: <namespace>
 spec:
   selector:
     matchLabels:

ahx-oidc/DEV/service.yaml

@@ -3,9 +3,10 @@ apiVersion: v1
 kind: Service
 metadata:
   name: <service_name><service_version>
+  namespace: <namespace>
 spec:
   selector:
     app: <service_name><service_version>
   ports:
     - port: 80
-      targetPort: 80
+      targetPort: 80

sharedLibs/stages.k8s.groovy

@@ -179,6 +179,7 @@ def deployWithConfigmapEnvOnly(SERVICE, K3S, String base_branch, String[] args,
     java_args = java_args[0..-2] + ']'
 
     kvs = [:]
+    kvs.put('<namespace>', namespace)
     kvs.put('<service_name>', SERVICE.name)
     kvs.put('<service_version>', SERVICE.version)
     kvs.put('<release>', base_branch)