From 43eb71e91a49f513694192fbe69e5e3ac4d02fcc Mon Sep 17 00:00:00 2001 From: luzle <31396915+luzle@users.noreply.github.com> Date: Tue, 9 Jul 2019 19:33:23 +0800 Subject: [PATCH 1/5] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 67c8a7f20..3ffe6e4fc 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 = 'luzle' + GITHUB_ACCOUNT = '443627859@qq.com' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID= 'sonar-token' } From 142658442e906b0766041ce08fa774128a0cf0b7 Mon Sep 17 00:00:00 2001 From: luzle <31396915+luzle@users.noreply.github.com> Date: Thu, 1 Aug 2019 10:16:01 +0800 Subject: [PATCH 2/5] Update Jenkinsfile-online --- Jenkinsfile-online | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 3ffe6e4fc..00d6daacd 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,8 +10,8 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'dockerhub-id' - GITHUB_CREDENTIAL_ID = 'github-id' + DOCKER_CREDENTIAL_ID = 'liuzhong-dockerhub-id' + GITHUB_CREDENTIAL_ID = 'liuzhong-github-id' KUBECONFIG_CREDENTIAL_ID = 'demo-kubeconfig' REGISTRY = 'docker.io' DOCKERHUB_NAMESPACE = 'luzle' From c49cbd42caf3942f139dcb8a378437f8b076827d Mon Sep 17 00:00:00 2001 From: luzle <31396915+luzle@users.noreply.github.com> Date: Thu, 1 Aug 2019 11:53:29 +0800 Subject: [PATCH 3/5] 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 ed2a07471..bcaa3e0d8 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: sample-pro 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 97976ba797beac1f79a2b08bc6c5a14e750ed67a Mon Sep 17 00:00:00 2001 From: luzle <31396915+luzle@users.noreply.github.com> Date: Thu, 1 Aug 2019 11:53:50 +0800 Subject: [PATCH 4/5] 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..9c682fd44 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: sample-pro 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 0b67ab597818af8a4de244484037a4128d624662 Mon Sep 17 00:00:00 2001 From: luzle <31396915+luzle@users.noreply.github.com> Date: Thu, 1 Aug 2019 12:05:27 +0800 Subject: [PATCH 5/5] Update devops-sample-svc.yaml --- deploy/prod-ol/devops-sample-svc.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/prod-ol/devops-sample-svc.yaml b/deploy/prod-ol/devops-sample-svc.yaml index 9c682fd44..1dccd32e8 100644 --- a/deploy/prod-ol/devops-sample-svc.yaml +++ b/deploy/prod-ol/devops-sample-svc.yaml @@ -12,7 +12,7 @@ spec: port: 8080 protocol: TCP targetPort: 8080 - nodePort: 30961 + nodePort: 30890 selector: app: kubesphere component: ks-sample