From 8a1a44fe0536757bb606514856d0f5417c498332 Mon Sep 17 00:00:00 2001
From: TrueVoid <332658610@qq.com>
Date: Mon, 19 Apr 2021 19:21:14 +0800
Subject: [PATCH 1/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 2ca69e7f..efca9e7f 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -10,12 +10,12 @@ pipeline {
     }
 
     environment {
-        DOCKER_CREDENTIAL_ID = 'dockerhub-id'
-        GITHUB_CREDENTIAL_ID = 'github-id'
-        KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig'
+        DOCKER_CREDENTIAL_ID = 'ljl-dockerhub'
+        GITHUB_CREDENTIAL_ID = 'ljl-github'
+        KUBECONFIG_CREDENTIAL_ID = 'ljl-kubernetes'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'docker_username'
-        GITHUB_ACCOUNT = 'kubesphere'
+        DOCKERHUB_NAMESPACE = 'TrueVoid'
+        GITHUB_ACCOUNT = 'TrueVoid'
         APP_NAME = 'devops-java-sample'
     }
 

From 5cd2615235cf0d7ed3c3e82f6664628ffc30f108 Mon Sep 17 00:00:00 2001
From: TrueVoid <332658610@qq.com>
Date: Tue, 20 Apr 2021 17:07:50 +0800
Subject: [PATCH 2/6] Update Jenkinsfile-online

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

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index efca9e7f..cf5301b0 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -12,9 +12,9 @@ pipeline {
     environment {
         DOCKER_CREDENTIAL_ID = 'ljl-dockerhub'
         GITHUB_CREDENTIAL_ID = 'ljl-github'
-        KUBECONFIG_CREDENTIAL_ID = 'ljl-kubernetes'
+        KUBECONFIG_CREDENTIAL_ID = 'ljl-kubernets'
         REGISTRY = 'docker.io'
-        DOCKERHUB_NAMESPACE = 'TrueVoid'
+        DOCKERHUB_NAMESPACE = 'lifeontrip'
         GITHUB_ACCOUNT = 'TrueVoid'
         APP_NAME = 'devops-java-sample'
     }

From eccce2be2907cc2e381b82ecf343d8ec5f6d17d9 Mon Sep 17 00:00:00 2001
From: TrueVoid <332658610@qq.com>
Date: Wed, 21 Apr 2021 16:25:19 +0800
Subject: [PATCH 3/6] 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 e0a259a4..536b0599 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: ljl-dev
 spec:
   progressDeadlineSeconds: 600
   replicas: 1

From 489b691a63ce8a133e11ea3d2404d7c1fe0d2443 Mon Sep 17 00:00:00 2001
From: TrueVoid <332658610@qq.com>
Date: Wed, 21 Apr 2021 16:25:41 +0800
Subject: [PATCH 4/6] 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 4d93876a..8a5b72ed 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: ljl-prod
 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 2d0f7fe7f45d36e9a012ab62c5c235a50338c432 Mon Sep 17 00:00:00 2001
From: TrueVoid <332658610@qq.com>
Date: Wed, 21 Apr 2021 16:47:56 +0800
Subject: [PATCH 5/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index cf5301b0..0db27166 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -15,7 +15,7 @@ pipeline {
         KUBECONFIG_CREDENTIAL_ID = 'ljl-kubernets'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'lifeontrip'
-        GITHUB_ACCOUNT = 'TrueVoid'
+        GITHUB_ACCOUNT = 'kubesphere'
         APP_NAME = 'devops-java-sample'
     }
 

From adceecd5db28fa18ea2e74d13f307388c23c147b Mon Sep 17 00:00:00 2001
From: TrueVoid <332658610@qq.com>
Date: Wed, 21 Apr 2021 18:25:37 +0800
Subject: [PATCH 6/6] Update Jenkinsfile-online

---
 Jenkinsfile-online | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile-online b/Jenkinsfile-online
index 0db27166..cf5301b0 100644
--- a/Jenkinsfile-online
+++ b/Jenkinsfile-online
@@ -15,7 +15,7 @@ pipeline {
         KUBECONFIG_CREDENTIAL_ID = 'ljl-kubernets'
         REGISTRY = 'docker.io'
         DOCKERHUB_NAMESPACE = 'lifeontrip'
-        GITHUB_ACCOUNT = 'kubesphere'
+        GITHUB_ACCOUNT = 'TrueVoid'
         APP_NAME = 'devops-java-sample'
     }