Merge pull request #424 from glazychev-art/spire_upd

Update spire version
networkservicemesh · Apr 8, 2022 · bbd0454 · bbd0454
2 parents 6b73d41 + d3a13cd
commit bbd0454
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,8 +4,8 @@ ENV CGO_ENABLED=0
 ENV GOBIN=/bin
 RUN go get github.com/go-delve/delve/cmd/dlv@v1.5.0
 RUN go get github.com/edwarnicke/dl
-RUN dl https://github.com/spiffe/spire/releases/download/v0.11.1/spire-0.11.1-linux-x86_64-glibc.tar.gz | \
-    tar -xzvf - -C /bin --strip=3 ./spire-0.11.1/bin/spire-server ./spire-0.11.1/bin/spire-agent
+RUN dl https://github.com/spiffe/spire/releases/download/v1.2.2/spire-1.2.2-linux-x86_64-glibc.tar.gz | \
+    tar -xzvf - -C /bin --strip=2 spire-1.2.2/bin/spire-server spire-1.2.2/bin/spire-agent
 
 FROM go as build
 WORKDIR /build

diff --git a/go.mod b/go.mod
@@ -8,9 +8,9 @@ require (
 	github.com/edwarnicke/grpcfd v1.1.2
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5
-	github.com/networkservicemesh/sdk v0.5.1-0.20220408092549-c625edaefed2
-	github.com/networkservicemesh/sdk-k8s v0.0.0-20220408093626-6d6827417c4d
-	github.com/networkservicemesh/sdk-sriov v0.0.0-20220407210436-4588ca3ebe91
+	github.com/networkservicemesh/sdk v0.5.1-0.20220408124029-adfd2db62d17
+	github.com/networkservicemesh/sdk-k8s v0.0.0-20220408132531-c168f38387a0
+	github.com/networkservicemesh/sdk-sriov v0.0.0-20220408125444-7f4929ac39a1
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spiffe/go-spiffe/v2 v2.0.0

diff --git a/go.sum b/go.sum
@@ -353,15 +353,14 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
 github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0=
 github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5 h1:5zQY4PhShozvj/GFJS0dX6ocamAB9oWwEOJviAhGUaw=
 github.com/networkservicemesh/api v1.3.0-rc.1.0.20220405210054-fbcde048efa5/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
-github.com/networkservicemesh/sdk v0.5.1-0.20220407205627-db55b92ab6a2/go.mod h1:NK425uKTgqAo3tHGNZsrFiIxhqqX/bU75ltayQhj2I8=
-github.com/networkservicemesh/sdk v0.5.1-0.20220408092549-c625edaefed2 h1:rhzWlE+Xc6msPpPt+XpomWpWuJtekcXOxhc5R5hD3ws=
-github.com/networkservicemesh/sdk v0.5.1-0.20220408092549-c625edaefed2/go.mod h1:QHDp+cawYWaL8UKppdZT9a6hn/1Oi9pUQTBOTjQPeG0=
-github.com/networkservicemesh/sdk-k8s v0.0.0-20220408093626-6d6827417c4d h1:oa9RlaWdEqWIRrWMLi+BoNU8ucT1cNBDvFwLpsSzIFc=
-github.com/networkservicemesh/sdk-k8s v0.0.0-20220408093626-6d6827417c4d/go.mod h1:Ncaa1ttHLvy7AJoiUTdYbaILDkuKTO1t4Y4mTHNzYVI=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20220407205919-0109ff22ab1a h1:/hb7449TSo6N7DEJ+uPHGNEsgS3kp0fcJ1QvZMK8Dlc=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20220407205919-0109ff22ab1a/go.mod h1:IUrPH1Ygo/2Rp1nwZApFcCRA8kvRJ2gNGwOhdavB1DQ=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20220407210436-4588ca3ebe91 h1:9y3+GjXTO3kdoo2MQdtVsLbJGLoyhDpbhg9RV8Q2XL0=
-github.com/networkservicemesh/sdk-sriov v0.0.0-20220407210436-4588ca3ebe91/go.mod h1:SAc9YFqvc7DfWcGqIKt5be5GnzuGPHqb7O+04E6ZZBk=
+github.com/networkservicemesh/sdk v0.5.1-0.20220408124029-adfd2db62d17 h1:rsxG174SoBGRHXhg3JGyU5HStMGIS+UY98wCqF5EYho=
+github.com/networkservicemesh/sdk v0.5.1-0.20220408124029-adfd2db62d17/go.mod h1:QHDp+cawYWaL8UKppdZT9a6hn/1Oi9pUQTBOTjQPeG0=
+github.com/networkservicemesh/sdk-k8s v0.0.0-20220408132531-c168f38387a0 h1:lGc7LltIGe79E6hKoa+qiA1YB5sTqDLU409VlmMJdhk=
+github.com/networkservicemesh/sdk-k8s v0.0.0-20220408132531-c168f38387a0/go.mod h1:Vst8CazaNITZnaLLD61GMt33aITeDDXhv58TD+9keXE=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20220408124342-c6a45e684ec8 h1:7dwK35JgaEm+oYMAEr4cOUzjZUHlrST/zzB0KBV4RWk=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20220408124342-c6a45e684ec8/go.mod h1:/5H2UQB/jwdAReqWaaGdgVpOVYYhkpBz/Oy8+AT7eoE=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20220408125444-7f4929ac39a1 h1:FFHcOlfws+2MkzPYb9f/4XvTrisGy7VL1EIcOCmriJc=
+github.com/networkservicemesh/sdk-sriov v0.0.0-20220408125444-7f4929ac39a1/go.mod h1:qedZ1GGoj5Toz564YyaktWXtoOlHrACApGTby8xagS4=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -452,7 +451,6 @@ github.com/spf13/pflag v0.0.0-20181024212040-082b515c9490/go.mod h1:DYY7MBk1bdzu
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
-github.com/spiffe/go-spiffe/v2 v2.0.0-alpha.4.0.20200528145730-dc11d0c74e85/go.mod h1:Z6jOEo3L49OpNaK5JTIOig6K9HJhwH6cb78MF5mothQ=
 github.com/spiffe/go-spiffe/v2 v2.0.0 h1:y6N7BZAxgaFZYELyrIdxSMm2e2tWpzgQewUts9h1hfM=
 github.com/spiffe/go-spiffe/v2 v2.0.0/go.mod h1:TEfgrEcyFhuSuvqohJt6IxENUNeHfndWCCV1EX7UaVk=
 github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=