From 50dd0d1f83ed7c8a808d69418d0b071610e06d22 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 14:41:47 +0800 Subject: [PATCH 01/12] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 2ca69e7f1..1f8e6ad44 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -14,8 +14,8 @@ pipeline { GITHUB_CREDENTIAL_ID = 'github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' - DOCKERHUB_NAMESPACE = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'lijingwei' + GITHUB_ACCOUNT = 'lijingwei03@163.com' APP_NAME = 'devops-java-sample' } From d5e0f1151b6033e14b96e84cd59f4e15cd9dd5a2 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:21:45 +0800 Subject: [PATCH 02/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 ddab42691..c6ee941ee 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: demo-devops-java 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 b94a4f2bea51375a9f4457c0924ab52bd3ea6a04 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:22:02 +0800 Subject: [PATCH 03/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 24fff6f31..9a7901172 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: demo-devops-java 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 ebc016ae9ba55ede9b4a65f95256d5a66e170133 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:22:45 +0800 Subject: [PATCH 04/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 fe71ae957..4ad72e9c9 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: demo-devops-java-prod spec: progressDeadlineSeconds: 600 replicas: 2 From 9ac0553b73dfdb914950bbe185d554117656ddc3 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:22:59 +0800 Subject: [PATCH 05/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 6211066c6..ca5c52e03 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: demo-devops-java-prod 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 ae85eb2f14482d938bc74350883b831c5f71ca12 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:23:31 +0800 Subject: [PATCH 06/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 24fff6f31..9a7901172 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: demo-devops-java 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 4d210d89548f1dd2b721615be4f6bf7c50c66964 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:24:07 +0800 Subject: [PATCH 07/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 e0a259a47..0d7f59017 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: demo-devops-java spec: progressDeadlineSeconds: 600 replicas: 1 From 393ce9916e831e069fa855593cf6da8b5331577c Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:24:28 +0800 Subject: [PATCH 08/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 6211066c6..ca5c52e03 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: demo-devops-java-prod 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 b30f7954532d61cad048246f07dd9ba002bc27e9 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:24:42 +0800 Subject: [PATCH 09/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 4d93876a4..23eb67f4d 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: demo-devops-java-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 0c003d50d97bed8f7c9ead6a6b1f08c07bc5ff42 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:25:11 +0800 Subject: [PATCH 10/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 417b966c6..f4a35d1e3 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: demo-devops-java spec: progressDeadlineSeconds: 600 replicas: 1 From 7ccef5c0a36a526b90047f0301bba2cfdf463fc8 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 15:25:25 +0800 Subject: [PATCH 11/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 24fff6f31..9a7901172 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: demo-devops-java 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 51db022f0b38e0e83a4f3898945e0e17eae581a7 Mon Sep 17 00:00:00 2001 From: "James.li" Date: Wed, 26 May 2021 16:00:04 +0800 Subject: [PATCH 12/12] Update Jenkinsfile-on-prem --- Jenkinsfile-on-prem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile-on-prem b/Jenkinsfile-on-prem index b76a9ccb3..25bc9ce5c 100644 --- a/Jenkinsfile-on-prem +++ b/Jenkinsfile-on-prem @@ -15,7 +15,7 @@ pipeline { KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'harbor.devops.kubesphere.local:30280' HARBOR_NAMESPACE = 'library' - GITLAB_ACCOUNT = 'admin1' + GITLAB_ACCOUNT = 'lijingwei' APP_NAME = 'devops-java-sample' }