From bfa2aa77341b660aa64448242f72905da84038c7 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Sun, 9 Feb 2020 00:31:26 -0600
Subject: [PATCH 01/12] Update Jenkinsfile-online

---
 Jenkinsfile-online | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 67c8a7f2..9b70a56d 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -10,12 +10,12 @@ pipeline {
     }
 
     environment {
-        DOCKER_CREDENTIAL_ID = 'dockerhub-id'
+        DOCKER_CREDENTIAL_ID = 'docker-hub'
         GITHUB_CREDENTIAL_ID = 'github-id'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'aboutim'
+        GITHUB_ACCOUNT = 'aboutim'
         APP_NAME = 'devops-java-sample'
         SONAR_CREDENTIAL_ID= 'sonar-token'
     }

From a865173b1c0adf10945af9bc9368a745c0f486bc Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:19:29 +0800
Subject: [PATCH 02/12] Update Jenkinsfile-online

---
 Jenkinsfile-online | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 9b70a56d..76da7d2f 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -10,8 +10,8 @@ pipeline {
     }
 
     environment {
-        DOCKER_CREDENTIAL_ID = 'docker-hub'
-        GITHUB_CREDENTIAL_ID = 'github-id'
+        DOCKER_CREDENTIAL_ID = 'dockerhub-id-tim'
+        GITHUB_CREDENTIAL_ID = 'github-id-tim'
         KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'aboutim'

From 580f610561ad50665d9e06f04832bfd3bd05cfc8 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:24:01 +0800
Subject: [PATCH 03/12] Update devops-sample.yaml

---
 deploy/prod/devops-sample.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/prod/devops-sample.yaml b/deploy/prod/devops-sample.yaml
index a6409ab7..76f999c9 100644
--- a/deploy/prod/devops-sample.yaml
+++ b/deploy/prod/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample
     tier: backend
   name: ks-sample
-  namespace: kubesphere-sample-prod
+  namespace: kubesphere-sample-prod-tim
 spec:
   progressDeadlineSeconds: 600
   replicas: 2

From 367dc63d8268765dc026d8ed30eac7efa6c950b8 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:27:42 +0800
Subject: [PATCH 04/12] Update devops-sample-svc.yaml

---
 deploy/prod/devops-sample-svc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/prod/devops-sample-svc.yaml b/deploy/prod/devops-sample-svc.yaml
index 6211066c..29ae2831 100644
--- a/deploy/prod/devops-sample-svc.yaml
+++ b/deploy/prod/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample
   name: ks-sample
-  namespace: kubesphere-sample-prod
+  namespace: kubesphere-sample-prod-tim
 spec:
   ports:
     - name: http
@@ -18,4 +18,4 @@ spec:
     component: ks-sample
     tier: backend
   sessionAffinity: None
-  type: NodePort
\ No newline at end of file
+  type: NodePort

From af052fba346f0d4097ad72e1e1fd38a442a08b21 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:29:42 +0800
Subject: [PATCH 05/12] Update devops-sample.yaml

---
 deploy/dev/devops-sample.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/dev/devops-sample.yaml b/deploy/dev/devops-sample.yaml
index 29aadf29..10978233 100644
--- a/deploy/dev/devops-sample.yaml
+++ b/deploy/dev/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample-dev
     tier: backend
   name: ks-sample-dev
-  namespace: kubesphere-sample-dev
+  namespace: kubesphere-sample-dev-tim
 spec:
   progressDeadlineSeconds: 600
   replicas: 1
@@ -52,4 +52,4 @@ spec:
           terminationMessagePolicy: File
       dnsPolicy: ClusterFirst
       restartPolicy: Always
-      terminationGracePeriodSeconds: 30
\ No newline at end of file
+      terminationGracePeriodSeconds: 30

From 53b3a88cae9f38b570c5be2ae46b9f1beb6664eb Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:31:53 +0800
Subject: [PATCH 06/12] Update devops-sample-svc.yaml

---
 deploy/dev/devops-sample-svc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/dev/devops-sample-svc.yaml b/deploy/dev/devops-sample-svc.yaml
index 24fff6f3..5cf49a2c 100644
--- a/deploy/dev/devops-sample-svc.yaml
+++ b/deploy/dev/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample-dev
   name: ks-sample-dev
-  namespace: kubesphere-sample-dev
+  namespace: kubesphere-sample-dev-tim
 spec:
   ports:
     - name: http
@@ -18,4 +18,4 @@ spec:
     component: ks-sample-dev
     tier: backend
   sessionAffinity: None
-  type: NodePort
\ No newline at end of file
+  type: NodePort

From 4b8015753cc7c5b0b9db430c2a4f495857da3334 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 17:58:32 +0800
Subject: [PATCH 07/12] Update devops-sample.yaml

---
 deploy/no-branch-dev/devops-sample.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/no-branch-dev/devops-sample.yaml b/deploy/no-branch-dev/devops-sample.yaml
index 1b39c63f..dcef48ea 100644
--- a/deploy/no-branch-dev/devops-sample.yaml
+++ b/deploy/no-branch-dev/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample-dev
     tier: backend
   name: ks-sample-dev
-  namespace: kubesphere-sample-dev
+  namespace: kubesphere-sample-dev-tim
 spec:
   progressDeadlineSeconds: 600
   replicas: 1

From bef70edead422a88af120a6e599c4e02334e6121 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 18:00:56 +0800
Subject: [PATCH 08/12] Update devops-sample-svc.yaml

---
 deploy/no-branch-dev/devops-sample-svc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/no-branch-dev/devops-sample-svc.yaml b/deploy/no-branch-dev/devops-sample-svc.yaml
index 24fff6f3..5cf49a2c 100644
--- a/deploy/no-branch-dev/devops-sample-svc.yaml
+++ b/deploy/no-branch-dev/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample-dev
   name: ks-sample-dev
-  namespace: kubesphere-sample-dev
+  namespace: kubesphere-sample-dev-tim
 spec:
   ports:
     - name: http
@@ -18,4 +18,4 @@ spec:
     component: ks-sample-dev
     tier: backend
   sessionAffinity: None
-  type: NodePort
\ No newline at end of file
+  type: NodePort

From 2a47ae7ba8a1204be34ecd5e97e1423c9547e158 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 18:03:51 +0800
Subject: [PATCH 09/12] Update devops-sample.yaml

---
 deploy/dev-ol/devops-sample.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy/dev-ol/devops-sample.yaml b/deploy/dev-ol/devops-sample.yaml
index b15fd32e..c01ba802 100644
--- a/deploy/dev-ol/devops-sample.yaml
+++ b/deploy/dev-ol/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample-dev
     tier: backend
   name: ks-sample-dev
-  namespace: kubesphere-sample-dev
+  namespace: kubesphere-sample-dev-tim
 spec:
   progressDeadlineSeconds: 600
   replicas: 1

From 0a1411e404d15f6feed82822f6801b943c530327 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 18:06:40 +0800
Subject: [PATCH 10/12] Update devops-sample-svc.yaml

---
 deploy/dev-ol/devops-sample-svc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/dev-ol/devops-sample-svc.yaml b/deploy/dev-ol/devops-sample-svc.yaml
index 24fff6f3..5cf49a2c 100644
--- a/deploy/dev-ol/devops-sample-svc.yaml
+++ b/deploy/dev-ol/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample-dev
   name: ks-sample-dev
-  namespace: kubesphere-sample-dev
+  namespace: kubesphere-sample-dev-tim
 spec:
   ports:
     - name: http
@@ -18,4 +18,4 @@ spec:
     component: ks-sample-dev
     tier: backend
   sessionAffinity: None
-  type: NodePort
\ No newline at end of file
+  type: NodePort

From d9f716110288ebfc56cbfa8dd9a92923b36a1509 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 18:12:19 +0800
Subject: [PATCH 11/12] Update devops-sample.yaml

---
 deploy/prod-ol/devops-sample.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/prod-ol/devops-sample.yaml b/deploy/prod-ol/devops-sample.yaml
index 01fd023a..2c2942dc 100644
--- a/deploy/prod-ol/devops-sample.yaml
+++ b/deploy/prod-ol/devops-sample.yaml
@@ -6,7 +6,7 @@ metadata:
     component: ks-sample
     tier: backend
   name: ks-sample
-  namespace: kubesphere-sample-prod
+  namespace: kubesphere-sample-prod-tim
 spec:
   progressDeadlineSeconds: 600
   replicas: 2
@@ -57,4 +57,4 @@ spec:
           terminationMessagePolicy: File
       dnsPolicy: ClusterFirst
       restartPolicy: Always
-      terminationGracePeriodSeconds: 30
\ No newline at end of file
+      terminationGracePeriodSeconds: 30

From e6d6cb060a47a618afcd23a419d569a2f5e40a34 Mon Sep 17 00:00:00 2001
From: aboutim <30617006+aboutim@users.noreply.github.com>
Date: Thu, 13 Feb 2020 18:13:53 +0800
Subject: [PATCH 12/12] Update devops-sample-svc.yaml

---
 deploy/prod-ol/devops-sample-svc.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/prod-ol/devops-sample-svc.yaml b/deploy/prod-ol/devops-sample-svc.yaml
index 6211066c..29ae2831 100644
--- a/deploy/prod-ol/devops-sample-svc.yaml
+++ b/deploy/prod-ol/devops-sample-svc.yaml
@@ -5,7 +5,7 @@ metadata:
     app: kubesphere
     component: ks-sample
   name: ks-sample
-  namespace: kubesphere-sample-prod
+  namespace: kubesphere-sample-prod-tim
 spec:
   ports:
     - name: http
@@ -18,4 +18,4 @@ spec:
     component: ks-sample
     tier: backend
   sessionAffinity: None
-  type: NodePort
\ No newline at end of file
+  type: NodePort