diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 67c8a7f2..76da7d2f 100644 --- a/Jenkinsfile-online +++ b/Jenkinsfile-online @@ -10,12 +10,12 @@ pipeline { } environment { - DOCKER_CREDENTIAL_ID = 'dockerhub-id' - 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 = 'docker_username' - GITHUB_ACCOUNT = 'kubesphere' + DOCKERHUB_NAMESPACE = 'aboutim' + GITHUB_ACCOUNT = 'aboutim' APP_NAME = 'devops-java-sample' SONAR_CREDENTIAL_ID= 'sonar-token' } 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 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 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 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 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 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 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 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 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 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