From 5f91c5bce220894ced96c70f96cfba4728def3f2 Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Tue, 26 Jul 2022 20:56:09 +0200 Subject: [PATCH 1/3] NSM uplift to 1.5.0-rc.1 --- deployments/helm/values.yaml | 4 ++-- docs/demo/deployments/nsm/values.yaml | 2 +- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml index 72068987..9a71683c 100644 --- a/deployments/helm/values.yaml +++ b/deployments/helm/values.yaml @@ -95,7 +95,7 @@ subnetPool: vlanNSE: image: cmd-nse-remote-vlan - version: v1.4.0 + version: v1.5.0-rc.1 probe: addr: :5003 spiffe: true @@ -103,7 +103,7 @@ vlanNSE: vlanNSC: image: cmd-nsc - version: v1.4.0 + version: v1.5.0-rc.1 userId: 10000 vlan: diff --git a/docs/demo/deployments/nsm/values.yaml b/docs/demo/deployments/nsm/values.yaml index 36ef6552..7891ac66 100644 --- a/docs/demo/deployments/nsm/values.yaml +++ b/docs/demo/deployments/nsm/values.yaml @@ -3,7 +3,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -tag: v1.4.0 +tag: v1.5.0-rc.1 pullPolicy: IfNotPresent registry: ghcr.io diff --git a/go.mod b/go.mod index d64d1ba1..c8b0f8ce 100644 --- a/go.mod +++ b/go.mod @@ -10,16 +10,16 @@ require ( github.com/google/nftables v0.0.0-20210916140115-16a134723a96 github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.4.0 - github.com/networkservicemesh/sdk v1.4.0 - github.com/networkservicemesh/sdk-sriov v1.4.0 + github.com/networkservicemesh/api v1.5.0-rc.1 + github.com/networkservicemesh/sdk v1.5.0-rc.1 + github.com/networkservicemesh/sdk-sriov v1.5.0-rc.1 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.17.0 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 github.com/stretchr/testify v1.7.0 - github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845 + github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b go.uber.org/goleak v1.1.12 golang.org/x/sys v0.0.0-20220307203707-22a9840ba4d7 golang.org/x/tools v0.1.9 // indirect diff --git a/go.sum b/go.sum index 30a2de6e..29a9117a 100644 --- a/go.sum +++ b/go.sum @@ -407,12 +407,12 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/networkservicemesh/api v1.4.0 h1:a7V5C760AtDKhygGOeWvl2Mx4X1wcKtrp9PIoMDSCGg= -github.com/networkservicemesh/api v1.4.0/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v1.4.0 h1:ipVjmmjWYhnYvpo4N78JEOg7tjLB+DhYyyKbsJf5wPg= -github.com/networkservicemesh/sdk v1.4.0/go.mod h1:7cS1AlEYjHHUP60XvWBEv0tmVnIXaxMFgounaZgDmQk= -github.com/networkservicemesh/sdk-sriov v1.4.0 h1:JFFUpQ+z1OLqTa+P7RtCQprNaJg4nLFYTCjKNfTZh3Y= -github.com/networkservicemesh/sdk-sriov v1.4.0/go.mod h1:umjPum97SQsB96sCAgdfoTU8GcHsE83sux7TKFlUeDQ= +github.com/networkservicemesh/api v1.5.0-rc.1 h1:PAsunsktICufmAVovspCofY62pLHsACSWnUOeUNdQnE= +github.com/networkservicemesh/api v1.5.0-rc.1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v1.5.0-rc.1 h1:EkMIwIaiRRLZ6C2ytuOQ5wWLIvphebI1EapfyroAYxE= +github.com/networkservicemesh/sdk v1.5.0-rc.1/go.mod h1:wrY9EYfTzyNU6e1r3uV0lDHpzIlm1/XU3/ry7YxN85s= +github.com/networkservicemesh/sdk-sriov v1.5.0-rc.1 h1:zfNgBdKXwb6hbbWFvRMXgW/2wBMkcXxNiz0bdiWITBA= +github.com/networkservicemesh/sdk-sriov v1.5.0-rc.1/go.mod h1:akPuUwO0HrpBfi8JT06yosAwEIK4jsXcmJT0zwkGXmc= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= 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= @@ -545,8 +545,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845 h1:bIVwDExax2ZzN6mYF8Az0ms0wg+v/LYA4VI8x1TSQcs= -github.com/vishvananda/netlink v1.1.1-0.20220118170537-d6b03fdeb845/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= +github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b h1:CyMWBGvc1ZOvUBxW51DVTSIIAeJWWJJs+Ko3ouM/AVI= +github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 h1:gga7acRE695APm9hlsSMoOoE65U4/TcqNj90mc69Rlg= From 5f88f04fed4da08e6025a4274d394c16b88ef45e Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Mon, 1 Aug 2022 10:06:07 +0200 Subject: [PATCH 2/3] NSM uplift to 1.5.0-rc.2 --- deployments/helm/values.yaml | 4 ++-- docs/demo/deployments/nsm/values.yaml | 2 +- go.mod | 8 +++++--- go.sum | 16 ++++++++++------ 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml index 9a71683c..b4eda521 100644 --- a/deployments/helm/values.yaml +++ b/deployments/helm/values.yaml @@ -95,7 +95,7 @@ subnetPool: vlanNSE: image: cmd-nse-remote-vlan - version: v1.5.0-rc.1 + version: v1.5.0-rc.2 probe: addr: :5003 spiffe: true @@ -103,7 +103,7 @@ vlanNSE: vlanNSC: image: cmd-nsc - version: v1.5.0-rc.1 + version: v1.5.0-rc.2 userId: 10000 vlan: diff --git a/docs/demo/deployments/nsm/values.yaml b/docs/demo/deployments/nsm/values.yaml index 7891ac66..945e8352 100644 --- a/docs/demo/deployments/nsm/values.yaml +++ b/docs/demo/deployments/nsm/values.yaml @@ -3,7 +3,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -tag: v1.5.0-rc.1 +tag: v1.5.0-rc.2 pullPolicy: IfNotPresent registry: ghcr.io diff --git a/go.mod b/go.mod index c8b0f8ce..e803e8e7 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/google/nftables v0.0.0-20210916140115-16a134723a96 github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.5.0-rc.1 - github.com/networkservicemesh/sdk v1.5.0-rc.1 - github.com/networkservicemesh/sdk-sriov v1.5.0-rc.1 + github.com/networkservicemesh/api v1.5.0-rc.2 + github.com/networkservicemesh/sdk v1.5.0-rc.2 + github.com/networkservicemesh/sdk-sriov v1.5.0-rc.2 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.17.0 github.com/pkg/errors v0.9.1 @@ -39,6 +39,7 @@ require ( github.com/bytecodealliance/wasmtime-go v0.28.0 // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect + github.com/edwarnicke/exechelper v1.0.2 // indirect github.com/edwarnicke/serialize v1.0.7 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -49,6 +50,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.1.0 // indirect github.com/google/go-cmp v0.5.6 // indirect github.com/google/gofuzz v1.2.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect github.com/imdario/mergo v0.3.12 // indirect diff --git a/go.sum b/go.sum index 29a9117a..165e544e 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,8 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/edwarnicke/exechelper v1.0.2 h1:dD49Ui2U0FBFxxhalnKw6vLS0P0TkgnXBRvKL/xmC5w= +github.com/edwarnicke/exechelper v1.0.2/go.mod h1:/T271jtNX/ND4De6pa2aRy2+8sNtyCDB1A2pp4M+fUs= github.com/edwarnicke/grpcfd v1.1.2 h1:2b8kCABQ1+JjSKGDoHadqSW7whCeTXMqtyo6jmB5B8k= github.com/edwarnicke/grpcfd v1.1.2/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA= github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw= @@ -268,6 +270,8 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= @@ -407,12 +411,12 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/networkservicemesh/api v1.5.0-rc.1 h1:PAsunsktICufmAVovspCofY62pLHsACSWnUOeUNdQnE= -github.com/networkservicemesh/api v1.5.0-rc.1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v1.5.0-rc.1 h1:EkMIwIaiRRLZ6C2ytuOQ5wWLIvphebI1EapfyroAYxE= -github.com/networkservicemesh/sdk v1.5.0-rc.1/go.mod h1:wrY9EYfTzyNU6e1r3uV0lDHpzIlm1/XU3/ry7YxN85s= -github.com/networkservicemesh/sdk-sriov v1.5.0-rc.1 h1:zfNgBdKXwb6hbbWFvRMXgW/2wBMkcXxNiz0bdiWITBA= -github.com/networkservicemesh/sdk-sriov v1.5.0-rc.1/go.mod h1:akPuUwO0HrpBfi8JT06yosAwEIK4jsXcmJT0zwkGXmc= +github.com/networkservicemesh/api v1.5.0-rc.2 h1:Py32Aq9puXOelDSiy5/5htNcYUrr4jLwhEHbbpyEo6M= +github.com/networkservicemesh/api v1.5.0-rc.2/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v1.5.0-rc.2 h1:In1mpR47eaVr0JgaYq9tN1qe9lq5RPWP4fVQ4wppjbM= +github.com/networkservicemesh/sdk v1.5.0-rc.2/go.mod h1:V99zu3nh0n5gMSMOG4bdeVt/o8RbY8T8+WuuPzMqN7Q= +github.com/networkservicemesh/sdk-sriov v1.5.0-rc.2 h1:d2yU5vLSRuaqemURBCGDQqFcehSF141rBJ4SyzukNPo= +github.com/networkservicemesh/sdk-sriov v1.5.0-rc.2/go.mod h1:cE/DWHlvYeUNPYyMTewDPUBVaSWuBIlpa71MkgdAHk4= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= 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= From 0fc0087dc151385b01043e3669ee84794beb2052 Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Tue, 2 Aug 2022 10:41:01 +0200 Subject: [PATCH 3/3] NSM uplift to 1.5.0 --- deployments/helm/values.yaml | 4 ++-- docs/demo/deployments/nsm/values.yaml | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml index b4eda521..74c475ce 100644 --- a/deployments/helm/values.yaml +++ b/deployments/helm/values.yaml @@ -95,7 +95,7 @@ subnetPool: vlanNSE: image: cmd-nse-remote-vlan - version: v1.5.0-rc.2 + version: v1.5.0 probe: addr: :5003 spiffe: true @@ -103,7 +103,7 @@ vlanNSE: vlanNSC: image: cmd-nsc - version: v1.5.0-rc.2 + version: v1.5.0 userId: 10000 vlan: diff --git a/docs/demo/deployments/nsm/values.yaml b/docs/demo/deployments/nsm/values.yaml index 945e8352..01c77d11 100644 --- a/docs/demo/deployments/nsm/values.yaml +++ b/docs/demo/deployments/nsm/values.yaml @@ -3,7 +3,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. -tag: v1.5.0-rc.2 +tag: v1.5.0 pullPolicy: IfNotPresent registry: ghcr.io diff --git a/go.mod b/go.mod index e803e8e7..80576445 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,9 @@ require ( github.com/google/nftables v0.0.0-20210916140115-16a134723a96 github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.5.0-rc.2 - github.com/networkservicemesh/sdk v1.5.0-rc.2 - github.com/networkservicemesh/sdk-sriov v1.5.0-rc.2 + github.com/networkservicemesh/api v1.5.0 + github.com/networkservicemesh/sdk v1.5.0 + github.com/networkservicemesh/sdk-sriov v1.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.17.0 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 165e544e..6466f804 100644 --- a/go.sum +++ b/go.sum @@ -411,12 +411,12 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/networkservicemesh/api v1.5.0-rc.2 h1:Py32Aq9puXOelDSiy5/5htNcYUrr4jLwhEHbbpyEo6M= -github.com/networkservicemesh/api v1.5.0-rc.2/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v1.5.0-rc.2 h1:In1mpR47eaVr0JgaYq9tN1qe9lq5RPWP4fVQ4wppjbM= -github.com/networkservicemesh/sdk v1.5.0-rc.2/go.mod h1:V99zu3nh0n5gMSMOG4bdeVt/o8RbY8T8+WuuPzMqN7Q= -github.com/networkservicemesh/sdk-sriov v1.5.0-rc.2 h1:d2yU5vLSRuaqemURBCGDQqFcehSF141rBJ4SyzukNPo= -github.com/networkservicemesh/sdk-sriov v1.5.0-rc.2/go.mod h1:cE/DWHlvYeUNPYyMTewDPUBVaSWuBIlpa71MkgdAHk4= +github.com/networkservicemesh/api v1.5.0 h1:ewAXJJyY0XlI+fGyGxa8mU4/z3Ro37+BTnE0VHMn8g0= +github.com/networkservicemesh/api v1.5.0/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v1.5.0 h1:b5z4ITqg6GWFQx19+Pq16x1mB7baLnmId7apLypDakM= +github.com/networkservicemesh/sdk v1.5.0/go.mod h1:2CgyusmM91WwTZviI0EECs6akAS/1etrzxcZwoYWHKU= +github.com/networkservicemesh/sdk-sriov v1.5.0 h1:jrvB+PLPZqZqVNrIXZKilq56RROobvBDJMY3r3F25b4= +github.com/networkservicemesh/sdk-sriov v1.5.0/go.mod h1:X73vpS9cuSsJ6lk6cwt+z2KPQoWrgHah8RQhaJTmk4I= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= 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=