From 4a317dd5ba8ff45e27b4c25e3c7b852fc19b5214 Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Tue, 13 Dec 2022 09:29:20 +0100 Subject: [PATCH] NSM uplift to v1.7.0-rc.1 --- config/templates/charts/meridio/values.yaml | 2 +- deployments/helm/values.yaml | 4 +-- docs/demo/deployments/nsm/values.yaml | 2 +- examples/target/go.mod | 2 +- examples/target/go.sum | 4 +-- go.mod | 14 ++++----- go.sum | 29 ++++++++++--------- pkg/controllers/attractor/nse-vlan.go | 2 +- .../attractor/stateless-lb-frontend.go | 2 +- .../environment/kind-operator/test-scope.yaml | 1 + 10 files changed, 32 insertions(+), 30 deletions(-) diff --git a/config/templates/charts/meridio/values.yaml b/config/templates/charts/meridio/values.yaml index 648b85a4..c8f161a2 100644 --- a/config/templates/charts/meridio/values.yaml +++ b/config/templates/charts/meridio/values.yaml @@ -5,7 +5,7 @@ organization: cloud-native/meridio nsm: organization: cloud-native/nsm - version: v1.5.0 + version: v1.7.0-rc.1 sysctlInit: image: busybox diff --git a/deployments/helm/values.yaml b/deployments/helm/values.yaml index 6f1287aa..a445ccf2 100644 --- a/deployments/helm/values.yaml +++ b/deployments/helm/values.yaml @@ -89,7 +89,7 @@ subnetPool: vlanNSE: image: cmd-nse-remote-vlan - version: v1.6.1 + version: v1.7.0-rc.1 probe: addr: :5003 spiffe: true @@ -97,7 +97,7 @@ vlanNSE: vlanNSC: image: cmd-nsc - version: v1.6.1 + version: v1.7.0-rc.1 userId: 10000 vlan: diff --git a/docs/demo/deployments/nsm/values.yaml b/docs/demo/deployments/nsm/values.yaml index 021085ff..befea53b 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.6.1 +tag: v1.7.0-rc.1 pullPolicy: IfNotPresent registry: ghcr.io diff --git a/examples/target/go.mod b/examples/target/go.mod index 0a683c29..ce77ff06 100644 --- a/examples/target/go.mod +++ b/examples/target/go.mod @@ -9,7 +9,7 @@ require ( require ( github.com/golang/protobuf v1.5.2 // indirect - golang.org/x/net v0.1.0 // indirect + golang.org/x/net v0.2.0 // indirect golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect google.golang.org/genproto v0.0.0-20220908141613-51c1cc9bc6d0 // indirect diff --git a/examples/target/go.sum b/examples/target/go.sum index 88f24d3c..7e064b4e 100644 --- a/examples/target/go.sum +++ b/examples/target/go.sum @@ -3,8 +3,8 @@ github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= diff --git a/go.mod b/go.mod index 0d60c0fe..18994972 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( github.com/google/nftables v0.0.0-20220808154552-2eca00135732 github.com/google/uuid v1.3.0 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.6.1 - github.com/networkservicemesh/sdk v1.6.1 - github.com/networkservicemesh/sdk-sriov v1.6.1 + github.com/networkservicemesh/api v1.7.0-rc.1 + github.com/networkservicemesh/sdk v1.7.0-rc.1 + github.com/networkservicemesh/sdk-sriov v1.7.0-rc.1 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.5.1 github.com/onsi/gomega v1.24.0 @@ -25,7 +25,7 @@ require ( github.com/vishvananda/netlink v1.2.1-beta.2.0.20220630165224-c591ada0fb2b go.uber.org/goleak v1.1.12 go.uber.org/zap v1.23.0 - golang.org/x/net v0.1.0 + golang.org/x/net v0.2.0 golang.org/x/sys v0.2.0 google.golang.org/grpc v1.49.0 google.golang.org/protobuf v1.28.1 @@ -123,12 +123,12 @@ require ( go.uber.org/atomic v1.8.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/crypto v0.1.0 // indirect - golang.org/x/mod v0.6.0 // indirect + golang.org/x/mod v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect - golang.org/x/term v0.1.0 // indirect + golang.org/x/term v0.2.0 // indirect golang.org/x/text v0.4.0 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/tools v0.2.0 // indirect + golang.org/x/tools v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220908141613-51c1cc9bc6d0 // indirect diff --git a/go.sum b/go.sum index b069e1f2..83ede435 100644 --- a/go.sum +++ b/go.sum @@ -427,12 +427,12 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/networkservicemesh/api v1.6.1 h1:wt5xiZkUPMgwKuCZEYo4BqxqwFIkU9fcRbZgDU09fNY= -github.com/networkservicemesh/api v1.6.1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v1.6.1 h1:V6uKIqm80BErkpwRTD7/OrN4Tss2Y9abSi1NedGDHNk= -github.com/networkservicemesh/sdk v1.6.1/go.mod h1:5WsiyEc2jXNK7Bjes+bYFGR3VqMboQNCz/z+rP0At+I= -github.com/networkservicemesh/sdk-sriov v1.6.1 h1:Q7sb+QjnrGSkE6/9awlQL+h7pglMaVpEH1KUIxYguK8= -github.com/networkservicemesh/sdk-sriov v1.6.1/go.mod h1:xlS/3+Z8dkXSNkjxm4vpHPwDSeLmgEvlNu6WOlpoMSg= +github.com/networkservicemesh/api v1.7.0-rc.1 h1:U94/LBfbn/iFtOeFjdZoogwN5jnVIRiTjNP6I/U8mfc= +github.com/networkservicemesh/api v1.7.0-rc.1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v1.7.0-rc.1 h1:XwMgLs2Qa6ULj0FzfB8vJN7okpd0SASmhXa3tjHlqx8= +github.com/networkservicemesh/sdk v1.7.0-rc.1/go.mod h1:UuJ/gtTxRNR4l0L/I1XMY9rDZTY7l8YGkMUSlTOgE9c= +github.com/networkservicemesh/sdk-sriov v1.7.0-rc.1 h1:kWPDizNnEJ1i671fuaZy0pqi3hE8F7ukgTAt9MuBvIg= +github.com/networkservicemesh/sdk-sriov v1.7.0-rc.1/go.mod h1:26//hE8EggqQZAX3m4WSj7ExWi/ADRAGwZ1B75+jUfA= 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= @@ -671,8 +671,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I= -golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= +golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= +golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -724,8 +724,8 @@ golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0= -golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= +golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU= +golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -751,6 +751,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -829,8 +830,8 @@ golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.1.0 h1:g6Z6vPFA9dYBAF7DWcH6sCcOntplXsDKcliusYijMlw= -golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM= +golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -867,8 +868,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE= -golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= +golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM= +golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/controllers/attractor/nse-vlan.go b/pkg/controllers/attractor/nse-vlan.go index eebe755d..f2ad520e 100644 --- a/pkg/controllers/attractor/nse-vlan.go +++ b/pkg/controllers/attractor/nse-vlan.go @@ -30,7 +30,7 @@ import ( const ( nseImage = "cmd-nse-remote-vlan" - nseImageTag = "v1.6.1" + nseImageTag = "v1.7.0-rc.1" ) type NseDeployment struct { diff --git a/pkg/controllers/attractor/stateless-lb-frontend.go b/pkg/controllers/attractor/stateless-lb-frontend.go index 92bd19aa..2b5cf5e2 100644 --- a/pkg/controllers/attractor/stateless-lb-frontend.go +++ b/pkg/controllers/attractor/stateless-lb-frontend.go @@ -248,7 +248,7 @@ func (l *LoadBalancer) insertParameters(dep *appsv1.Deployment) *appsv1.Deployme } case "nsc": if container.Image == "" { - container.Image = "registry.nordix.org/cloud-native/nsm/cmd-nsc:v1.6.1" + container.Image = "registry.nordix.org/cloud-native/nsm/cmd-nsc:v1.7.0-rc.1" container.ImagePullPolicy = corev1.PullAlways } container.Env = l.getNscEnvVars(container.Env) diff --git a/test/e2e/environment/kind-operator/test-scope.yaml b/test/e2e/environment/kind-operator/test-scope.yaml index 6ff28045..ad598e0b 100644 --- a/test/e2e/environment/kind-operator/test-scope.yaml +++ b/test/e2e/environment/kind-operator/test-scope.yaml @@ -6,6 +6,7 @@ NSM: - v1.5.0 - v1.6.0 - v1.6.1 +- v1.7.0-rc.1 Kubernetes: - v1.26 - v1.25