diff options
| author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2021-03-31 07:34:00 +0000 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-04-03 06:34:41 -0400 |
| commit | 5bc6bf8ecd4a59826245057aaf9fc2d3b5b423b1 (patch) | |
| tree | 57415a171ead856b1bdaeee5a9caced35a2745be /vendor | |
| parent | 1db9053add6501f2c234a6f63bb1e74b5eb89cb0 (diff) | |
| download | podman-5bc6bf8ecd4a59826245057aaf9fc2d3b5b423b1.tar.gz podman-5bc6bf8ecd4a59826245057aaf9fc2d3b5b423b1.tar.bz2 podman-5bc6bf8ecd4a59826245057aaf9fc2d3b5b423b1.zip | |
Bump github.com/rootless-containers/rootlesskit from 0.14.0 to 0.14.1
Bumps [github.com/rootless-containers/rootlesskit](https://github.com/rootless-containers/rootlesskit) from 0.14.0 to 0.14.1.
- [Release notes](https://github.com/rootless-containers/rootlesskit/releases)
- [Commits](https://github.com/rootless-containers/rootlesskit/compare/v0.14.0...v0.14.1)
Signed-off-by: dependabot[bot] <support@github.com>
Diffstat (limited to 'vendor')
4 files changed, 23 insertions, 9 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/api/api.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/api/api.go index b6779bf70..5d74cae49 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/api/api.go +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/api/api.go @@ -5,7 +5,7 @@ import "net" const ( // Version of the REST API, not implementation version. // See openapi.yaml for the definition. - Version = "1.1.0" + Version = "1.1.1" ) // ErrorJSON is returned with "application/json" content type and non-2XX status code @@ -25,12 +25,15 @@ type Info struct { // NetworkDriverInfo in Info type NetworkDriverInfo struct { - Driver string `json:"driver"` - DNS []net.IP `json:"dns,omitempty"` + Driver string `json:"driver"` + DNS []net.IP `json:"dns,omitempty"` + ChildIP net.IP `json:"childIP,omitempty"` // since API v1.1.1 (RootlessKit v0.14.1) + DynamicChildIP bool `json:"dynamicChildIP,omitempty"` // since API v1.1.1 } // PortDriverInfo in Info type PortDriverInfo struct { - Driver string `json:"driver"` - Protos []string `json:"protos"` + Driver string `json:"driver"` + Protos []string `json:"protos"` + DisallowLoopbackChildIP bool `json:"disallowLoopbackChildIP,omitempty"` // since API v1.1.1 } diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/api/openapi.yaml b/vendor/github.com/rootless-containers/rootlesskit/pkg/api/openapi.yaml index 6a6550c33..dffc49680 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/api/openapi.yaml +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/api/openapi.yaml @@ -1,7 +1,7 @@ # When you made a change to this YAML, please validate with https://editor.swagger.io openapi: 3.0.3 info: - version: 1.1.0 + version: 1.1.1 title: RootlessKit API servers: - url: 'http://rootlesskit/v1' @@ -144,6 +144,13 @@ components: items: type: string example: ["10.0.2.3"] + childIP: + type: string + description: "Child IP (v4)" + example: "10.0.2.100" + dynamicChildIP: + type: boolean + description: "Child IP may change" PortDriverInfo: required: - driver @@ -159,3 +166,6 @@ components: example: ["tcp","udp"] items: $ref: '#/components/schemas/Proto' + disallowLoopbackChildIP: + type: boolean + description: "If this field is set to true, loopback IP such as 127.0.0.1 cannot be specified as a child IP" diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go index e7ce641e1..2895a8f07 100644 --- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go +++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go @@ -59,8 +59,9 @@ type driver struct { func (d *driver) Info(ctx context.Context) (*api.PortDriverInfo, error) { info := &api.PortDriverInfo{ - Driver: "builtin", - Protos: []string{"tcp", "tcp4", "tcp6", "udp", "udp4", "udp6"}, + Driver: "builtin", + Protos: []string{"tcp", "tcp4", "tcp6", "udp", "udp4", "udp6"}, + DisallowLoopbackChildIP: false, } return info, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2b9908ca4..1ada882a3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -530,7 +530,7 @@ github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util # github.com/rivo/uniseg v0.2.0 github.com/rivo/uniseg -# github.com/rootless-containers/rootlesskit v0.14.0 +# github.com/rootless-containers/rootlesskit v0.14.1 github.com/rootless-containers/rootlesskit/pkg/api github.com/rootless-containers/rootlesskit/pkg/msgutil github.com/rootless-containers/rootlesskit/pkg/port |