NSM Uplift to 1.4.0-rc.1

Nordix · Jun 1, 2022 · f1785e6 · f1785e6
1 parent 9cdba75
commit f1785e6
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/deployments/helm/templates/load-balancer.yaml b/deployments/helm/templates/load-balancer.yaml
@@ -98,6 +98,8 @@ spec:
               value: {{ .Values.maxTokenLifetime }}
             - name: NSM_LOG_LEVEL
               value: "TRACE"
+            - name: NSM_LIVENESSCHECK
+              value: "disabled"
           volumeMounts:
             - name: spire-agent-socket
               mountPath: /run/spire/sockets

diff --git a/deployments/helm/templates/nse-vlan.yaml b/deployments/helm/templates/nse-vlan.yaml
@@ -40,9 +40,7 @@ spec:
             - name: NSM_SERVICES
               value: "{{ template "meridio.vlan.networkServiceName" . }} { vlan: {{ .Values.vlan.id }}; via: {{ .Values.vlan.interface }} }"
             - name: NSM_CIDR_PREFIX
-              value: "{{ .Values.vlan.ipv4Prefix }}"
-            - name: NSM_IPV6_PREFIX
-              value: "{{ .Values.vlan.ipv6Prefix }}"
+              value: "{{ .Values.vlan.ipv4Prefix }},{{ .Values.vlan.ipv6Prefix }}"
             - name: NSM_POINT2POINT
               value: "False"
             - name: NSM_REGISTER_SERVICE
@@ -62,10 +60,10 @@ spec:
               readOnly: false
           resources:
             requests:
-              cpu: 100m
-            limits:
-              memory: 40Mi
               cpu: 200m
+            limits:
+              memory: 100Mi
+              cpu: 400m
       volumes:
         - name: spire-agent-socket
           hostPath:

diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml
@@ -94,14 +94,14 @@ subnetPool:
 
 vlanNSE:
   image: cmd-nse-remote-vlan
-  version: v1.3.1
+  version: v1.4.0-rc.1
   probe:
     addr: :5003
     spiffe: true
 
 vlanNSC:
   image: cmd-nsc
-  version: v1.3.1
+  version: v1.4.0-rc.1
 
 vlan:
   networkServiceName: external-vlan

diff --git 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.3.1
+tag: v1.4.0-rc.1
 pullPolicy: IfNotPresent
 
 registry: ghcr.io

diff --git 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.3.1
-	github.com/networkservicemesh/sdk v1.3.1
-	github.com/networkservicemesh/sdk-sriov v1.3.1
+	github.com/networkservicemesh/api v1.4.0-rc.1
+	github.com/networkservicemesh/sdk v1.4.0-rc.1
+	github.com/networkservicemesh/sdk-sriov v1.4.0-rc.1
 	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
@@ -225,6 +225,7 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-ping/ping v1.0.0/go.mod h1:35JbSyV/BYqHwwRA6Zr1uVDm1637YlNOU61wI797NPI=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -511,13 +512,13 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0=
-github.com/networkservicemesh/api v1.3.1 h1:dxe+6ezXle0TczQpfZJztHf1+3UcQkj0kyfzirXfL4s=
-github.com/networkservicemesh/api v1.3.1/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
-github.com/networkservicemesh/sdk v1.3.1 h1:SGuhONUtEvRvNyHtYIJGnyIvW1bZ6yQHPHoTCsYOdKg=
-github.com/networkservicemesh/sdk v1.3.1/go.mod h1:E7EduCLfioJBrMyucSFiTZSkZjwxAQVByb5rtcCmjWM=
-github.com/networkservicemesh/sdk-kernel v1.3.1/go.mod h1:iDh5SbUN6IYzhhnwjqdbk9PRRNdpySeyrbyrOQcV9gE=
-github.com/networkservicemesh/sdk-sriov v1.3.1 h1:sW54Vyhu5Pa9hVD5dO/c5c0CvYo40WCGbWxglSr58XM=
-github.com/networkservicemesh/sdk-sriov v1.3.1/go.mod h1:xmZn7irt7X0oYBIP/d/txlLkDaYdRoVVkW3y4ujWfIw=
+github.com/networkservicemesh/api v1.4.0-rc.1 h1:Z4caiVW6sPsazhzTIMinCSx4bssbw2R9NLaEjspw5AE=
+github.com/networkservicemesh/api v1.4.0-rc.1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
+github.com/networkservicemesh/sdk v1.4.0-rc.1 h1:3JKoWnqmmhgm7NvoW+Y6tCFO9qWjPJ5hanavh6QcJww=
+github.com/networkservicemesh/sdk v1.4.0-rc.1/go.mod h1:E6qqvRsJX010ja4/6CVxpdLyFGGPCuAzsXoSMDw4nZE=
+github.com/networkservicemesh/sdk-kernel v1.4.0-rc.1/go.mod h1:+byCoOjqE8v2C+GEm4Szg2MFGpJyl/BhVLXpd2c8haI=
+github.com/networkservicemesh/sdk-sriov v1.4.0-rc.1 h1:Ax++upUuQo1ujgJOKYNHGpXvejbqGng+JnKRyHrpq/o=
+github.com/networkservicemesh/sdk-sriov v1.4.0-rc.1/go.mod h1:qxqsE7T3sv9hQKhpuv0hMfGuMjscuoQnAMUKAHeNhHQ=
 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 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
@@ -892,6 +893,7 @@ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=

diff --git a/pkg/nsm/client.go b/pkg/nsm/client.go
@@ -23,7 +23,7 @@ import (
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/api/pkg/api/registry"
 	registryclient "github.com/networkservicemesh/sdk/pkg/registry/chains/client"
-	registrysendfd "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
+	"github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
 	"github.com/networkservicemesh/sdk/pkg/tools/grpcutils"
 	"github.com/networkservicemesh/sdk/pkg/tools/spiffejwt"
 	"github.com/networkservicemesh/sdk/pkg/tools/token"
@@ -85,18 +85,18 @@ func (apiClient *APIClient) setNetworkServiceEndpointRegistryClient() {
 	clientOptions := apiClient.GetClientOptions()
 	apiClient.NetworkServiceEndpointRegistryClient = registryclient.NewNetworkServiceEndpointRegistryClient(
 		apiClient.context,
-		&apiClient.Config.ConnectTo,
+		registryclient.WithClientURL(&apiClient.Config.ConnectTo),
 		registryclient.WithDialOptions(clientOptions...),
 		registryclient.WithNSEAdditionalFunctionality(
-			registrysendfd.NewNetworkServiceEndpointRegistryClient(),
+			sendfd.NewNetworkServiceEndpointRegistryClient(),
 		))
 }
 
 func (apiClient *APIClient) setNetworkServiceRegistryClient() {
 	clientOptions := apiClient.GetClientOptions()
 	apiClient.NetworkServiceRegistryClient = registryclient.NewNetworkServiceRegistryClient(
 		apiClient.context,
-		&apiClient.Config.ConnectTo,
+		registryclient.WithClientURL(&apiClient.Config.ConnectTo),
 		registryclient.WithDialOptions(clientOptions...))
 }