Skip to content

Commit 2791885

Browse files
authored
feat: CNS/CNI async delete changes for azure-ipam (#2201)
* azure-ipam changes for async delete * cilium cnsconfig change for tests * address comments: update config value and add log line * matching ipam changes to #2183 * include containerID in log msg * update addFile args * return on failure to add file * update go.mod
1 parent c2c59db commit 2791885

File tree

4 files changed

+123
-103
lines changed

4 files changed

+123
-103
lines changed

azure-ipam/go.mod

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ module github.com/Azure/azure-container-networking/azure-ipam
33
go 1.20
44

55
require (
6-
github.com/Azure/azure-container-networking v1.5.0
6+
github.com/Azure/azure-container-networking v1.5.12-0.20230919193705-477200881d37
77
github.com/containernetworking/cni v1.1.2
88
github.com/containernetworking/plugins v1.2.0
99
github.com/pkg/errors v0.9.1
10-
github.com/stretchr/testify v1.8.2
11-
go.uber.org/zap v1.24.0
10+
github.com/stretchr/testify v1.8.4
11+
go.uber.org/zap v1.25.0
1212
gopkg.in/natefinch/lumberjack.v2 v2.2.1
1313
)
1414

@@ -31,20 +31,21 @@ require (
3131
github.com/coreos/go-iptables v0.6.0 // indirect
3232
github.com/davecgh/go-spew v1.1.1 // indirect
3333
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
34+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3435
github.com/go-logr/logr v1.2.4 // indirect
35-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
36+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
3637
github.com/go-openapi/jsonreference v0.20.2 // indirect
37-
github.com/go-openapi/swag v0.22.3 // indirect
38+
github.com/go-openapi/swag v0.22.4 // indirect
3839
github.com/gofrs/uuid v4.4.0+incompatible // indirect
3940
github.com/gogo/protobuf v1.3.2 // indirect
4041
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
4142
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4243
github.com/golang/protobuf v1.5.3 // indirect
43-
github.com/google/gnostic v0.6.9 // indirect
44+
github.com/google/gnostic-models v0.6.8 // indirect
4445
github.com/google/go-cmp v0.5.9 // indirect
4546
github.com/google/gofuzz v1.2.0 // indirect
46-
github.com/google/uuid v1.3.0 // indirect
47-
github.com/imdario/mergo v0.3.15 // indirect
47+
github.com/google/uuid v1.3.1 // indirect
48+
github.com/imdario/mergo v0.3.16 // indirect
4849
github.com/josharian/intern v1.0.0 // indirect
4950
github.com/json-iterator/go v1.1.12 // indirect
5051
github.com/kylelemons/godebug v1.1.0 // indirect
@@ -57,37 +58,36 @@ require (
5758
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
5859
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
5960
github.com/pmezard/go-difflib v1.0.0 // indirect
60-
github.com/prometheus/client_golang v1.14.0 // indirect
61-
github.com/prometheus/client_model v0.3.0 // indirect
62-
github.com/prometheus/common v0.42.0 // indirect
63-
github.com/prometheus/procfs v0.9.0 // indirect
61+
github.com/prometheus/client_golang v1.16.0 // indirect
62+
github.com/prometheus/client_model v0.4.0 // indirect
63+
github.com/prometheus/common v0.44.0 // indirect
64+
github.com/prometheus/procfs v0.11.1 // indirect
6465
github.com/sirupsen/logrus v1.9.0 // indirect
6566
github.com/spf13/pflag v1.0.5 // indirect
6667
go.opencensus.io v0.24.0 // indirect
67-
go.uber.org/atomic v1.10.0 // indirect
6868
go.uber.org/multierr v1.11.0 // indirect
69-
golang.org/x/crypto v0.7.0 // indirect
69+
golang.org/x/crypto v0.12.0 // indirect
7070
golang.org/x/mod v0.10.0 // indirect
71-
golang.org/x/net v0.8.0 // indirect
72-
golang.org/x/oauth2 v0.6.0 // indirect
73-
golang.org/x/sys v0.7.0 // indirect
74-
golang.org/x/term v0.7.0 // indirect
75-
golang.org/x/text v0.9.0 // indirect
71+
golang.org/x/net v0.14.0 // indirect
72+
golang.org/x/oauth2 v0.11.0 // indirect
73+
golang.org/x/sys v0.11.0 // indirect
74+
golang.org/x/term v0.11.0 // indirect
75+
golang.org/x/text v0.12.0 // indirect
7676
golang.org/x/time v0.3.0 // indirect
77-
golang.org/x/tools v0.7.0 // indirect
77+
golang.org/x/tools v0.9.3 // indirect
7878
google.golang.org/appengine v1.6.7 // indirect
79-
google.golang.org/protobuf v1.30.0 // indirect
79+
google.golang.org/protobuf v1.31.0 // indirect
8080
gopkg.in/inf.v0 v0.9.1 // indirect
8181
gopkg.in/yaml.v2 v2.4.0 // indirect
8282
gopkg.in/yaml.v3 v3.0.1 // indirect
83-
k8s.io/api v0.26.3 // indirect
84-
k8s.io/apimachinery v0.26.3 // indirect
85-
k8s.io/client-go v0.26.3 // indirect
86-
k8s.io/klog/v2 v2.90.1 // indirect
87-
k8s.io/kube-openapi v0.0.0-20230327201221-f5883ff37f0c // indirect
88-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
89-
sigs.k8s.io/controller-runtime v0.14.6 // indirect
83+
k8s.io/api v0.28.0 // indirect
84+
k8s.io/apimachinery v0.28.0 // indirect
85+
k8s.io/client-go v0.28.0 // indirect
86+
k8s.io/klog/v2 v2.100.1 // indirect
87+
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
88+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
89+
sigs.k8s.io/controller-runtime v0.16.0 // indirect
9090
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
91-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
91+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
9292
sigs.k8s.io/yaml v1.3.0 // indirect
9393
)

0 commit comments

Comments
 (0)