update

zhouwenyang · Jun 23, 2021 · 13cbf98 · 13cbf98
1 parent 4877535
commit 13cbf98
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -28,13 +28,13 @@ pipeline {
           }
         }
 
-        stage('SonarQube Check') {
+        stage('CI - SonarQube Check') {
             steps {
                 sh 'docker run --rm -e SONAR_HOST_URL="${SONAR_HOST_URL}" -e SONAR_LOGIN="${SONAR_LOGIN}" -v "${PWD}:/usr/src" sonarsource/sonar-scanner-cli'
             }
         }
 
-        stage('Unit Tests & Publish Result') {
+        stage('CI - Unit Tests & Publish Result') {
             steps {
                 sh 'docker-compose -f docker-compose-build.yaml -p boathouse-calculator-testrun up'
                 sh 'docker-compose -f docker-compose-build.yaml -p boathouse-calculator-testrundown -v --rmi all --remove-orphans'
@@ -47,7 +47,7 @@ pipeline {
             }
         }
 
-        stage('Docker Build & Push') {
+        stage('CI - Docker Build & Push') {
             steps {
                 echo "Docker Build ... "
                 sh 'docker build -f Dockerfile -t ${REGISTRY_URL}/${REGISTRY_NS}/boathouse-calculator:latest .'
@@ -65,7 +65,7 @@ pipeline {
         }
 
         // dev 环境
-        stage('Deploy - DEV') { 
+        stage('CD - DEV') { 
             steps {
               sh "sed -i 's/#{REGISTRY_URL}#/${REGISTRY_URL}/g' docker-compose-template.yaml"
               sh "sed -i 's/#{REGISTRY_NS}#/${REGISTRY_NS}/g' docker-compose-template.yaml"
@@ -91,15 +91,28 @@ pipeline {
         }
 
         // 测试环境部署
-        stage('Deploy - K8S TEST') {
+        stage('CD - K8S TEST') {
             steps {
                 timeout(5) {
                     input message: '是否部署到测试环境?', ok: '是', submitter: 'admin'
                 }
-                sh "sed -i 's/#{REGISTRY_URL}#/${REGISTRY_URL}/g' kube-deploy.yaml"
-                sh "sed -i 's/#{REGISTRY_NS}#/${REGISTRY_NS}/g' kube-deploy.yaml"
-                sh "sed -i 's/#{K8S_NAMESPACE_TEST}#/${K8S_NAMESPACE_TEST}/g' kube-deploy.yaml"
-                kubernetesDeploy configs: 'kube-deploy.yaml', deleteResource: false, kubeconfigId: 'minikube', secretName: 'regcred', secretNamespace: 'boathouse-test'
+                sh "sed -i 's/#{REGISTRY_URL}#/${REGISTRY_URL}/g' kube-deploy-test.yaml"
+                sh "sed -i 's/#{REGISTRY_NS}#/${REGISTRY_NS}/g' kube-deploy-test.yaml"
+                sh "sed -i 's/#{K8S_NAMESPACE}#/${K8S_NAMESPACE_TEST}/g' kube-deploy-test.yaml"
+                kubernetesDeploy configs: 'kube-deploy-test.yaml', deleteResource: false, kubeconfigId: 'minikube', secretName: 'regcred', secretNamespace: 'boathouse-test'
+            }
+        }
+
+        // 测试环境部署
+        stage('CD - K8S Prod') {
+            steps {
+                timeout(5) {
+                    input message: '是否部署到生产环境?', ok: '是', submitter: 'admin'
+                }
+                sh "sed -i 's/#{REGISTRY_URL}#/${REGISTRY_URL}/g' kube-deploy-prod.yaml"
+                sh "sed -i 's/#{REGISTRY_NS}#/${REGISTRY_NS}/g' kube-deploy-prod.yaml"
+                sh "sed -i 's/#{K8S_NAMESPACE}#/${K8S_NAMESPACE_PROD}/g' kube-deploy-prod.yaml"
+                kubernetesDeploy configs: 'kube-deploy-prod.yaml', deleteResource: false, kubeconfigId: 'minikube', secretName: 'regcred', secretNamespace: 'boathouse-test'
             }
         }
     }

diff --git a/README.md b/README.md
@@ -47,4 +47,7 @@ docker run \
     sonarsource/sonar-scanner-cli
 ```
 
-kubectl create secret docker-registry regcred --docker-server=registry.cn-hangzhou.aliyuncs.com --docker-username=boathouse216 --docker-password=devops@2021 --docker-email=info@idcf.io -n boathouse-test
+kubectl create secret docker-registry regcred --docker-server=registry.cn-hangzhou.aliyuncs.com --docker-username=boathouse216 --docker-password=devops@2021 --docker-email=info@idcf.io -n boathouse-test
+
+
+kubectl create secret docker-registry regcred --docker-server=registry.cn-hangzhou.aliyuncs.com --docker-username=boathouse216 --docker-password=devops@2021 --docker-email=info@idcf.io -n boathouse-prod
diff --git a/kube-deploy.yaml → kube-deploy-prod.yaml b/kube-deploy.yaml → kube-deploy-prod.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: boathouse-calculator
-  namespace: #{K8S_NAMESPACE_TEST}#
+  namespace: #{K8S_NAMESPACE}#
 spec:
   replicas: 1
   selector:
@@ -38,7 +38,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: boathouse-calculator
-  namespace: #{K8S_NAMESPACE_TEST}#
+  namespace: #{K8S_NAMESPACE}#
 spec:
   type: LoadBalancer
   ports:

diff --git a/kube-deploy-test.yaml b/kube-deploy-test.yaml
@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: boathouse-calculator
+  namespace: #{K8S_NAMESPACE}#
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: boathouse-calculator
+  strategy:
+    rollingUpdate:
+      maxSurge: 1
+      maxUnavailable: 1
+  minReadySeconds: 5 
+  template:
+    metadata:
+      labels:
+        app: boathouse-calculator
+    spec:
+      nodeSelector:
+        "beta.kubernetes.io/os": linux
+      containers:
+      - name: boathouse-calculator
+        image: #{REGISTRY_URL}#/#{REGISTRY_NS}#/boathouse-calculator:latest
+        ports:
+        - containerPort: 3000
+        resources:
+          requests:
+            cpu: 250m
+          limits:
+            cpu: 500m
+      imagePullSecrets:
+      - name: regcred
+      restartPolicy: Always
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: boathouse-calculator
+  namespace: #{K8S_NAMESPACE}#
+spec:
+  type: LoadBalancer
+  ports:
+  - port: 80
+    targetPort: 3000
+  selector:
+    app: boathouse-calculator