diff --git a/Jenkinsfile-online b/Jenkinsfile-online index 67c8a7f2..00d6daac 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 = 'liuzhong-dockerhub-id' + GITHUB_CREDENTIAL_ID = 'liuzhong-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' } diff --git a/deploy/prod-ol/devops-sample-svc.yaml b/deploy/prod-ol/devops-sample-svc.yaml index 6211066c..1dccd32e 100644 --- a/deploy/prod-ol/devops-sample-svc.yaml +++ b/deploy/prod-ol/devops-sample-svc.yaml @@ -5,17 +5,17 @@ metadata: app: kubesphere component: ks-sample name: ks-sample - namespace: kubesphere-sample-prod + namespace: sample-pro spec: ports: - name: http port: 8080 protocol: TCP targetPort: 8080 - nodePort: 30961 + nodePort: 30890 selector: app: kubesphere 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 ed2a0747..bcaa3e0d 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