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' } 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' } 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 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 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 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 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 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 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 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 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 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