alair 4 miesięcy temu
rodzic
commit
7e26df74b1

+ 3 - 3
Jenkinsfile

@@ -6,7 +6,7 @@ pipeline{
 	environment {
         harbor_user = 'admin'
         harbor_passwd = 'Zq0034bgns.'
-        harbor_address = '192.168.0.3:9080'
+        harbor_address = '192.168.0.5:9080'
         harbor_repo = 'repo'
 	}
     stages {
@@ -40,12 +40,12 @@ pipeline{
         }
         stage('将yaml文件传到k8smaster服务器') {
             steps {
-sshPublisher(publishers: [sshPublisherDesc(configName: 'rancher-k8s-dev', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'pipeline.yaml')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
+                sshPublisher(publishers: [sshPublisherDesc(configName: '应用服务器', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'pipeline.yaml')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)])
             }
         }
         stage('远程执行k8s-master的kubectl命令') {
             steps {
-                sh 'ssh root@10.211.55.12 kubectl apply -f /usr/local/k8s/pipeline.yaml'
+                sh 'ssh root@192.168.0.3 kubectl apply -f /usr/local/k8s/pipeline.yaml'
             }
         }
     }

+ 2 - 21
pipeline.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: pipleline
-          image: 192.168.0.3:9080/repo/pipeline:v6.0.3
+          image: 192.168.0.5:9080/repo/pipeline:v6.0.4
           imagePullPolicy: Always
           ports:
             - containerPort: 8080
@@ -35,23 +35,4 @@ spec:
   ports:
   - port: 18081
     targetPort: 8080
-  type: NodePort
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-    namespace: test
-    name: pipleline
-spec:
-  ingressClassName: nginx
-  rules:
-  - host: autumn.pipleline.com
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: pipleline
-            port:
-              number: 18081
+  type: ClusterIP

+ 1 - 1
src/main/java/com/autumn/mytest/controller/TestController.java

@@ -8,6 +8,6 @@ public class TestController {
 
     @GetMapping("/test")
     public String test() {
-        return "Hello Jenkins! - v6.0.3";
+        return "Hello Jenkins! - v6.0.4";
     }
 }