From 3f3e435df3cbbb39170e2314063b719bd179d596 Mon Sep 17 00:00:00 2001
From: Daishan <daishan@rancher.com>
Date: Fri, 14 Feb 2020 16:26:34 -0700
Subject: [PATCH] Update rancher pipeline images

---
 apis/management.cattle.io/v3/tools_system_images.go | 8 ++++----
 image/mirror.go                                     | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apis/management.cattle.io/v3/tools_system_images.go b/apis/management.cattle.io/v3/tools_system_images.go
index 61b7c4fc..7ea6d9e9 100644
--- a/apis/management.cattle.io/v3/tools_system_images.go
+++ b/apis/management.cattle.io/v3/tools_system_images.go
@@ -13,17 +13,17 @@ var (
 		AuthSystemImages     AuthSystemImages
 	}{
 		PipelineSystemImages: projectv3.PipelineSystemImages{
-			Jenkins:       m("rancher/pipeline-jenkins-server:v0.1.4"),
-			JenkinsJnlp:   m("jenkins/jnlp-slave:3.35-4"),
+			Jenkins:       m("rancher/pipeline-jenkins-server:v0.1.5"),
+			JenkinsJnlp:   m("jenkins/jnlp-slave:3.40-1"),
 			AlpineGit:     m("rancher/pipeline-tools:v0.1.14"),
 			PluginsDocker: m("plugins/docker:18.09"),
-			Minio:         m("minio/minio:RELEASE.2019-09-25T18-25-51Z"),
+			Minio:         m("minio/minio:RELEASE.2020-02-07T23-28-16Z"),
 			Registry:      m("registry:2"),
 			RegistryProxy: m("rancher/pipeline-tools:v0.1.14"),
 			KubeApply:     m("rancher/pipeline-tools:v0.1.14"),
 		},
 		AuthSystemImages: AuthSystemImages{
-			KubeAPIAuth: m("rancher/kube-api-auth:v0.1.3"),
+			KubeAPIAuth: m("rancher/kube-api-auth:v0.1.4"),
 		},
 	}
 )
diff --git a/image/mirror.go b/image/mirror.go
index 6321d12d..1503fcf1 100644
--- a/image/mirror.go
+++ b/image/mirror.go
@@ -6,9 +6,6 @@ var Mirrors = map[string]string{}
 
 func Mirror(image string) string {
 	orig := image
-	if strings.HasPrefix(image, "weaveworks") {
-		return image
-	}
 
 	image = strings.Replace(image, "gcr.io/google_containers", "rancher", 1)
 	image = strings.Replace(image, "quay.io/coreos/", "rancher/coreos-", 1)
@@ -24,6 +21,7 @@ func Mirror(image string) string {
 	image = strings.Replace(image, "quay.io/pires", "rancher", 1)
 	image = strings.Replace(image, "coredns/", "rancher/coredns-", 1)
 	image = strings.Replace(image, "minio/", "rancher/minio-", 1)
+	image = strings.Replace(image, "weaveworks/", "rancher/weaveworks-", 1)
 
 	Mirrors[image] = orig
 	return image