From a8fa438e82fb22c9d79c6439e75e25523cad5976 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 5 Apr 2023 00:14:10 +0000 Subject: [PATCH 1/2] deps: bump github.com/docker/docker from 20.10.8+incompatible to 20.10.24+incompatible (#1891) --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a73bd87b3e..f1ef4e4eae 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/containerd/cgroups v1.0.1 // indirect github.com/coreos/go-iptables v0.6.0 github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/docker v20.10.8+incompatible // indirect + github.com/docker/docker v20.10.24+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/evanphx/json-patch v4.12.0+incompatible // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect diff --git a/go.sum b/go.sum index fa0f96803a..110a06de47 100644 --- a/go.sum +++ b/go.sum @@ -249,8 +249,8 @@ github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TT github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.8+incompatible h1:RVqD337BgQicVCzYrrlhLDWhq6OAD2PJDUg2LsEUvKM= -github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= +github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= From 62aa59649cd35dafdd321ea5628ea9145224c262 Mon Sep 17 00:00:00 2001 From: Ashish Nair Date: Fri, 24 Mar 2023 21:07:21 +0000 Subject: [PATCH 2/2] Added the vnet block mode of operation for the NC Type --- crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go b/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go index 948719344a..bef214ff7d 100644 --- a/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go +++ b/crd/nodenetworkconfig/api/v1alpha/nodenetworkconfig.go @@ -84,8 +84,9 @@ const ( type NCType string const ( - VNET NCType = "vnet" - Overlay NCType = "overlay" + VNET NCType = "vnet" + VNETBlock NCType = "vnetblock" + Overlay NCType = "overlay" ) // NetworkContainer defines the structure of a Network Container as found in NetworkConfigStatus