From 1eb25e613548136d9b84da8328c5ead5f4290b73 Mon Sep 17 00:00:00 2001
From: Daishan <daishan@rancher.com>
Date: Thu, 8 Oct 2020 12:56:46 -0700
Subject: [PATCH 1/2] Update tls library to fix Common Name issue

---
 go.mod                                           | 2 +-
 go.sum                                           | 2 ++
 vendor/github.com/linkerd/linkerd2/pkg/tls/ca.go | 2 +-
 vendor/modules.txt                               | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index a44382da9..47e1ca29f 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ replace (
 	github.com/hashicorp/vault => github.com/hashicorp/vault v1.3.2
 	github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
 	github.com/jetstack/cert-manager v0.11.0 => github.com/rancher/cert-manager v0.5.1-0.20191021233300-3a070253aeda
-	github.com/linkerd/linkerd2 => github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a
+	github.com/linkerd/linkerd2 => github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f
 	github.com/pseudomuto/protoc-gen-doc => github.com/pseudomuto/protoc-gen-doc v1.0.0
 	github.com/wercker/stern v1.11.0 => github.com/rancher/stern v0.0.0-20191213223518-59c2bf84f705
 	golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793
diff --git a/go.sum b/go.sum
index 2b17d1bc6..874285525 100644
--- a/go.sum
+++ b/go.sum
@@ -178,6 +178,8 @@ github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a h1:kvyMlzSGU
 github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a/go.mod h1:C+pkr4rp/oOlvvsQMOZGHWRaZJfXxsLXIHL8MALgJjA=
 github.com/StrongMonkey/linkerd2 v0.5.1-0.20200529213430-ec8d2bb70324 h1:BYRNQzPquUfZza1P4kMF/rc9tjcsQFb4cprWYWQFsfo=
 github.com/StrongMonkey/linkerd2 v0.5.1-0.20200529213430-ec8d2bb70324/go.mod h1:5xd7QHQsrFsLXzXcAPViEO3RFCB4cHEFOYCXaCOo5oA=
+github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f h1:iLaecQC5bW1RFpLNdLLMAmPA/lyZbikXwbOx212y17I=
+github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f/go.mod h1:C+pkr4rp/oOlvvsQMOZGHWRaZJfXxsLXIHL8MALgJjA=
 github.com/ahmetb/gen-crd-api-reference-docs v0.1.5 h1:OU+AFpBEhyclrQGx4I6zpCx5WvXiKqvFeeOASOmhKCY=
 github.com/ahmetb/gen-crd-api-reference-docs v0.1.5/go.mod h1:P/XzJ+c2+khJKNKABcm2biRwk2QAuwbLf8DlXuaL7WM=
 github.com/airbrake/gobrake v3.6.1+incompatible/go.mod h1:wM4gu3Cn0W0K7GUuVWnlXZU11AGBXMILnrdOU8Kn00o=
diff --git a/vendor/github.com/linkerd/linkerd2/pkg/tls/ca.go b/vendor/github.com/linkerd/linkerd2/pkg/tls/ca.go
index 82830ac6e..238011f18 100644
--- a/vendor/github.com/linkerd/linkerd2/pkg/tls/ca.go
+++ b/vendor/github.com/linkerd/linkerd2/pkg/tls/ca.go
@@ -101,7 +101,7 @@ func CreateRootCA(
 	if ip := net.ParseIP(name); ip != nil {
 		t.IPAddresses = []net.IP{ip}
 	} else {
-		t.Subject = pkix.Name{CommonName: name}
+		t.DNSNames = []string{name}
 	}
 
 	t.IsCA = true
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1fb7ca39f..417fab293 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -415,7 +415,7 @@ github.com/json-iterator/go
 github.com/k0kubun/pp
 # github.com/konsorten/go-windows-terminal-sequences v1.0.2
 github.com/konsorten/go-windows-terminal-sequences
-# github.com/linkerd/linkerd2 v0.0.0-20191010175117-1039d8254738 => github.com/StrongMonkey/linkerd2 v0.0.0-20191021165729-976fad67457a
+# github.com/linkerd/linkerd2 v0.0.0-20191010175117-1039d8254738 => github.com/StrongMonkey/linkerd2 v0.5.1-0.20201008181831-07ef85ee9b6f
 github.com/linkerd/linkerd2/controller/gen/apis/serviceprofile
 github.com/linkerd/linkerd2/controller/gen/apis/serviceprofile/v1alpha2
 github.com/linkerd/linkerd2/controller/gen/client/clientset/versioned

From 8b0e19185f79d00d3251e53898d9e95b95d4f03f Mon Sep 17 00:00:00 2001
From: Daishan <daishan@rancher.com>
Date: Thu, 8 Oct 2020 12:57:19 -0700
Subject: [PATCH 2/2] Update k3s to v1.18.9+k3s1 in test environment

---
 Dockerfile.dapper | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 3830b8794..afc1d2db8 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -2,7 +2,7 @@ FROM golang:1.13.3-alpine3.10
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
-ENV K3S_VERSION v0.10.2
+ENV K3S_VERSION v1.18.9+k3s1
 ENV KUBECTL_VERSION v1.16.2
 ENV GO111MODULE off