kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11788 from cardoe/fix-swift 

bump the version of gophercloud
This commit is contained in:
Kubernetes Prow Robot 2021-06-18 22:42:50 -07:00 committed by GitHub
parent 5582e27adb 80da992275
commit 23ab07e7b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 101 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -57,7 +57,7 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/google/go-cmp v0.5.5
github.com/google/uuid v1.2.0
github.com/gophercloud/gophercloud v0.17.0
github.com/gophercloud/gophercloud v0.18.0
github.com/hashicorp/hcl/v2 v2.10.0
github.com/hashicorp/vault/api v1.1.0
github.com/jacksontj/memberlistmesh v0.0.0-20190905163944-93462b9d2bb7

4
go.sum
View File

@ -577,8 +577,8 @@ github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97Dwqy
github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod h1:ozGNgr9KYOVATV5jsgHl/ceCDXGuguqOZAzoQ/2vcNM=
github.com/gophercloud/gophercloud v0.15.1-0.20210105012856-e34a44dc6580/go.mod h1:VX0Ibx85B60B5XOrZr6kaNwrmPUzcmMpwxvQ1WQIIWM=
github.com/gophercloud/gophercloud v0.17.0 h1:BgVw0saxyeHWH5us/SQe1ltp0GRnytjmOLXDA8pO77E=
github.com/gophercloud/gophercloud v0.17.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
github.com/gophercloud/gophercloud v0.18.0 h1:V6hcuMPmjXg+js9flU8T3RIHDCjV7F5CG5GD0MRhP/w=
github.com/gophercloud/gophercloud v0.18.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod h1:ehWUbLQJPqS0Ep+CxeD559hsm9pthPXadJNKwZkp43w=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

4
tests/e2e/go.sum
View File

@ -742,8 +742,8 @@ github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97Dwqy
github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod h1:ozGNgr9KYOVATV5jsgHl/ceCDXGuguqOZAzoQ/2vcNM=
github.com/gophercloud/gophercloud v0.15.1-0.20210105012856-e34a44dc6580/go.mod h1:VX0Ibx85B60B5XOrZr6kaNwrmPUzcmMpwxvQ1WQIIWM=
github.com/gophercloud/gophercloud v0.17.0 h1:BgVw0saxyeHWH5us/SQe1ltp0GRnytjmOLXDA8pO77E=
github.com/gophercloud/gophercloud v0.17.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
github.com/gophercloud/gophercloud v0.18.0 h1:V6hcuMPmjXg+js9flU8T3RIHDCjV7F5CG5GD0MRhP/w=
github.com/gophercloud/gophercloud v0.18.0/go.mod h1:wRtmUelyIIv3CSSDI47aUwbs075O6i+LY+pXsKCBsb4=
github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod h1:ehWUbLQJPqS0Ep+CxeD559hsm9pthPXadJNKwZkp43w=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=

4
vendor/github.com/gophercloud/gophercloud/.zuul.yaml generated vendored
View File

@ -13,7 +13,7 @@
Run gophercloud acceptance test on master branch
run: .zuul/playbooks/gophercloud-acceptance-test/run.yaml
timeout: 18000 # 5 hours
nodeset: ubuntu-bionic
nodeset: ubuntu-focal
- job:
name: gophercloud-acceptance-test-ironic
@ -21,7 +21,7 @@
description: |
Run gophercloud ironic acceptance test on master branch
run: .zuul/playbooks/gophercloud-acceptance-test-ironic/run.yaml
nodeset: ubuntu-bionic
nodeset: ubuntu-focal
- job:
name: gophercloud-acceptance-test-ussuri

42
vendor/github.com/gophercloud/gophercloud/CHANGELOG.md generated vendored
View File

@ -1,4 +1,44 @@
## 0.18.0 (Unreleased)
## 0.19.0 (Unreleased)
## 0.18.0 (June 11, 2021)
NOTES / BREAKING CHANGES
* As of [GH-2160](https://github.com/gophercloud/gophercloud/pull/2160), Gophercloud no longer URL encodes Object Storage containers and object names. You can still encode them yourself before passing the names to the Object Storage functions.
* `baremetal/v1/nodes.ListBIOSSettings` now takes three parameters. The third, new, parameter is `ListBIOSSettingsOptsBuilder` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
BUG FIXES
* Fixed expected OK codes to use default codes [GH-2173](https://github.com/gophercloud/gophercloud/pull/2173)
* Fixed inablity to create sub-containers (objects with `/` in their name) [GH-2160](https://github.com/gophercloud/gophercloud/pull/2160)
IMPROVEMENTS
* Added `orchestration/v1/stacks.ListOpts.ShowHidden` [GH-2104](https://github.com/gophercloud/gophercloud/pull/2104)
* Added `loadbalancer/v2/listeners.ProtocolSCTP` [GH-2149](https://github.com/gophercloud/gophercloud/pull/2149)
* Added `loadbalancer/v2/listeners.CreateOpts.TLSVersions` [GH-2150](https://github.com/gophercloud/gophercloud/pull/2150)
* Added `loadbalancer/v2/listeners.UpdateOpts.TLSVersions` [GH-2150](https://github.com/gophercloud/gophercloud/pull/2150)
* Added `baremetal/v1/nodes.CreateOpts.NetworkData` [GH-2154](https://github.com/gophercloud/gophercloud/pull/2154)
* Added `baremetal/v1/nodes.Node.NetworkData` [GH-2154](https://github.com/gophercloud/gophercloud/pull/2154)
* Added `loadbalancer/v2/pools.ProtocolPROXYV2` [GH-2158](https://github.com/gophercloud/gophercloud/pull/2158)
* Added `loadbalancer/v2/pools.ProtocolSCTP` [GH-2158](https://github.com/gophercloud/gophercloud/pull/2158)
* Added `placement/v1/resourceproviders.GetAllocations` [GH-2162](https://github.com/gophercloud/gophercloud/pull/2162)
* Added `baremetal/v1/nodes.CreateOpts.BIOSInterface` [GH-2164](https://github.com/gophercloud/gophercloud/pull/2164)
* Added `baremetal/v1/nodes.Node.BIOSInterface` [GH-2164](https://github.com/gophercloud/gophercloud/pull/2164)
* Added `baremetal/v1/nodes.NodeValidation.BIOS` [GH-2164](https://github.com/gophercloud/gophercloud/pull/2164)
* Added `baremetal/v1/nodes.ListBIOSSettings` [GH-2171](https://github.com/gophercloud/gophercloud/pull/2171)
* Added `baremetal/v1/nodes.GetBIOSSetting` [GH-2171](https://github.com/gophercloud/gophercloud/pull/2171)
* Added `baremetal/v1/nodes.ListBIOSSettingsOpts` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.AttributeType` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.AllowableValues` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.LowerBound` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.UpperBound` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.MinLength` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.MaxLength` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.ReadOnly` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.ResetRequired` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
* Added `baremetal/v1/nodes.BIOSSetting.Unique` [GH-2174](https://github.com/gophercloud/gophercloud/pull/2174)
## 0.17.0 (April 9, 2021)

21
vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/requests.go generated vendored
View File

@ -17,9 +17,22 @@ const (
ProtocolPROXY Protocol = "PROXY"
ProtocolHTTP Protocol = "HTTP"
ProtocolHTTPS Protocol = "HTTPS"
// Protocol SCTP requires octavia microversion 2.23
ProtocolSCTP Protocol = "SCTP"
ProtocolTerminatedHTTPS Protocol = "TERMINATED_HTTPS"
)
// Type TLSVersion represents a tls version
type TLSVersion string
const (
TLSVersionSSLv3 TLSVersion = "SSLv3"
TLSVersionTLSv1 TLSVersion = "TLSv1"
TLSVersionTLSv1_1 TLSVersion = "TLSv1.1"
TLSVersionTLSv1_2 TLSVersion = "TLSv1.2"
TLSVersionTLSv1_3 TLSVersion = "TLSv1.3"
)
// ListOptsBuilder allows extensions to add additional parameters to the
// List request.
type ListOptsBuilder interface {
@ -88,7 +101,7 @@ type CreateOpts struct {
// The load balancer on which to provision this listener.
LoadbalancerID string `json:"loadbalancer_id,omitempty"`
// The protocol - can either be TCP, HTTP, HTTPS or TERMINATED_HTTPS.
// The protocol - can either be TCP, SCTP, HTTP, HTTPS or TERMINATED_HTTPS.
Protocol Protocol `json:"protocol" required:"true"`
// The port on which to listen for client traffic.
@ -151,6 +164,9 @@ type CreateOpts struct {
// A list of IPv4, IPv6 or mix of both CIDRs
AllowedCIDRs []string `json:"allowed_cidrs,omitempty"`
// A list of TLS protocol versions. Available from microversion 2.17
TLSVersions []TLSVersion `json:"tls_versions,omitempty"`
}
// ToListenerCreateMap builds a request body from CreateOpts.
@ -230,6 +246,9 @@ type UpdateOpts struct {
// A list of IPv4, IPv6 or mix of both CIDRs
AllowedCIDRs *[]string `json:"allowed_cidrs,omitempty"`
// A list of TLS protocol versions. Available from microversion 2.17
TLSVersions *[]TLSVersion `json:"tls_versions,omitempty"`
}
// ToListenerUpdateMap builds a request body from UpdateOpts.

5
vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/listeners/results.go generated vendored
View File

@ -27,7 +27,7 @@ type Listener struct {
// Human-readable description for the Listener.
Description string `json:"description"`
// The protocol to loadbalance. A valid value is TCP, HTTP, or HTTPS.
// The protocol to loadbalance. A valid value is TCP, SCTP, HTTP, HTTPS or TERMINATED_HTTPS.
Protocol string `json:"protocol"`
// The port on which to listen to client traffic that is associated with the
@ -83,6 +83,9 @@ type Listener struct {
// A list of IPv4, IPv6 or mix of both CIDRs
AllowedCIDRs []string `json:"allowed_cidrs"`
// A list of TLS protocol versions. Available from microversion 2.17
TLSVersions []string `json:"tls_versions"`
}
type Stats struct {

7
vendor/github.com/gophercloud/gophercloud/openstack/loadbalancer/v2/pools/requests.go generated vendored
View File

@ -71,6 +71,10 @@ const (
ProtocolPROXY Protocol = "PROXY"
ProtocolHTTP Protocol = "HTTP"
ProtocolHTTPS Protocol = "HTTPS"
// Protocol PROXYV2 requires octavia microversion 2.22
ProtocolPROXYV2 Protocol = "PROXYV2"
// Protocol SCTP requires octavia microversion 2.23
ProtocolSCTP Protocol = "SCTP"
)
// CreateOptsBuilder allows extensions to add additional parameters to the
@ -88,7 +92,8 @@ type CreateOpts struct {
LBMethod LBMethod `json:"lb_algorithm" required:"true"`
// The protocol used by the pool members, you can use either
// ProtocolTCP, ProtocolUDP, ProtocolPROXY, ProtocolHTTP, or ProtocolHTTPS.
// ProtocolTCP, ProtocolUDP, ProtocolPROXY, ProtocolHTTP, ProtocolHTTPS,
// ProtocolSCTP or ProtocolPROXYV2.
Protocol Protocol `json:"protocol" required:"true"`
// The Loadbalancer on which the members of the pool will be associated with.

2
vendor/github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/rules/results.go generated vendored
View File

@ -17,7 +17,7 @@ type SecGroupRule struct {
// instance. An egress rule is applied to traffic leaving the instance.
Direction string
// Descripton of the rule
// Description of the rule
Description string `json:"description"`
// Must be IPv4 or IPv6, and addresses represented in CIDR must match the

11
vendor/github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers/requests.go generated vendored
View File

@ -1,7 +1,6 @@
package containers
import (
"net/url"
"strings"
"github.com/gophercloud/gophercloud"
@ -108,7 +107,7 @@ func Create(c *gophercloud.ServiceClient, containerName string, opts CreateOptsB
h[k] = v
}
}
resp, err := c.Request("PUT", createURL(c, url.QueryEscape(containerName)), &gophercloud.RequestOpts{
resp, err := c.Request("PUT", createURL(c, containerName), &gophercloud.RequestOpts{
MoreHeaders: h,
OkCodes: []int{201, 202, 204},
})
@ -123,7 +122,7 @@ func BulkDelete(c *gophercloud.ServiceClient, containers []string) (r BulkDelete
// https://github.com/openstack/swift/blob/stable/train/swift/common/swob.py#L302
encodedContainers := make([]string, len(containers))
for i, v := range containers {
encodedContainers[i] = url.QueryEscape(v)
encodedContainers[i] = v
}
b := strings.NewReader(strings.Join(encodedContainers, "\n") + "\n")
resp, err := c.Post(bulkDeleteURL(c), b, &r.Body, &gophercloud.RequestOpts{
@ -139,7 +138,7 @@ func BulkDelete(c *gophercloud.ServiceClient, containers []string) (r BulkDelete
// Delete is a function that deletes a container.
func Delete(c *gophercloud.ServiceClient, containerName string) (r DeleteResult) {
resp, err := c.Delete(deleteURL(c, url.QueryEscape(containerName)), nil)
resp, err := c.Delete(deleteURL(c, containerName), nil)
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
return
}
@ -202,7 +201,7 @@ func Update(c *gophercloud.ServiceClient, containerName string, opts UpdateOptsB
h[k] = v
}
}
resp, err := c.Request("POST", updateURL(c, url.QueryEscape(containerName)), &gophercloud.RequestOpts{
resp, err := c.Request("POST", updateURL(c, containerName), &gophercloud.RequestOpts{
MoreHeaders: h,
OkCodes: []int{201, 202, 204},
})
@ -242,7 +241,7 @@ func Get(c *gophercloud.ServiceClient, containerName string, opts GetOptsBuilder
h[k] = v
}
}
resp, err := c.Head(getURL(c, url.QueryEscape(containerName)), &gophercloud.RequestOpts{
resp, err := c.Head(getURL(c, containerName), &gophercloud.RequestOpts{
MoreHeaders: h,
OkCodes: []int{200, 204},
})

2
vendor/github.com/gophercloud/gophercloud/openstack/objectstorage/v1/containers/results.go generated vendored
View File

@ -72,7 +72,7 @@ func ExtractNames(page pagination.Page) ([]string, error) {
names = append(names, container.Name)
}
return names, nil
case strings.HasPrefix(ct, "text/plain"):
case strings.HasPrefix(ct, "text/plain") || ct == "":
names := make([]string, 0, 50)
body := string(page.(ContainerPage).Body.([]uint8))

22
vendor/github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects/requests.go generated vendored
View File

@ -8,7 +8,6 @@ import (
"fmt"
"io"
"io/ioutil"
"net/url"
"strings"
"time"
@ -54,7 +53,7 @@ func (opts ListOpts) ToObjectListParams() (bool, string, error) {
func List(c *gophercloud.ServiceClient, containerName string, opts ListOptsBuilder) pagination.Pager {
headers := map[string]string{"Accept": "text/plain", "Content-Type": "text/plain"}
url := listURL(c, url.QueryEscape(containerName))
url := listURL(c, containerName)
if opts != nil {
full, query, err := opts.ToObjectListParams()
if err != nil {
@ -119,7 +118,7 @@ func (opts DownloadOpts) ToObjectDownloadParams() (map[string]string, string, er
// To extract just the content, pass the DownloadResult response to the
// ExtractContent function.
func Download(c *gophercloud.ServiceClient, containerName, objectName string, opts DownloadOptsBuilder) (r DownloadResult) {
url := downloadURL(c, url.QueryEscape(containerName), url.QueryEscape(objectName))
url := downloadURL(c, containerName, objectName)
h := make(map[string]string)
if opts != nil {
headers, query, err := opts.ToObjectDownloadParams()
@ -225,7 +224,7 @@ func (opts CreateOpts) ToObjectCreateParams() (io.Reader, map[string]string, str
// checksum, the failed request will automatically be retried up to a maximum
// of 3 times.
func Create(c *gophercloud.ServiceClient, containerName, objectName string, opts CreateOptsBuilder) (r CreateResult) {
url := createURL(c, url.QueryEscape(containerName), url.QueryEscape(objectName))
url := createURL(c, containerName, objectName)
h := make(map[string]string)
var b io.Reader
if opts != nil {
@ -289,7 +288,7 @@ func Copy(c *gophercloud.ServiceClient, containerName, objectName string, opts C
h[k] = v
}
url := copyURL(c, url.QueryEscape(containerName), url.QueryEscape(objectName))
url := copyURL(c, containerName, objectName)
resp, err := c.Request("COPY", url, &gophercloud.RequestOpts{
MoreHeaders: h,
OkCodes: []int{201},
@ -317,7 +316,7 @@ func (opts DeleteOpts) ToObjectDeleteQuery() (string, error) {
// Delete is a function that deletes an object.
func Delete(c *gophercloud.ServiceClient, containerName, objectName string, opts DeleteOptsBuilder) (r DeleteResult) {
url := deleteURL(c, url.QueryEscape(containerName), url.QueryEscape(objectName))
url := deleteURL(c, containerName, objectName)
if opts != nil {
query, err := opts.ToObjectDeleteQuery()
if err != nil {
@ -362,7 +361,7 @@ func (opts GetOpts) ToObjectGetParams() (map[string]string, string, error) {
// the custom metadata, pass the GetResult response to the ExtractMetadata
// function.
func Get(c *gophercloud.ServiceClient, containerName, objectName string, opts GetOptsBuilder) (r GetResult) {
url := getURL(c, url.QueryEscape(containerName), url.QueryEscape(objectName))
url := getURL(c, containerName, objectName)
h := make(map[string]string)
if opts != nil {
headers, query, err := opts.ToObjectGetParams()
@ -434,7 +433,7 @@ func Update(c *gophercloud.ServiceClient, containerName, objectName string, opts
h[k] = v
}
}
url := updateURL(c, url.QueryEscape(containerName), url.QueryEscape(objectName))
url := updateURL(c, containerName, objectName)
resp, err := c.Post(url, nil, nil, &gophercloud.RequestOpts{
MoreHeaders: h,
})
@ -489,7 +488,7 @@ func CreateTempURL(c *gophercloud.ServiceClient, containerName, objectName strin
duration := time.Duration(opts.TTL) * time.Second
expiry := date.Add(duration).Unix()
getHeader, err := containers.Get(c, url.QueryEscape(containerName), nil).Extract()
getHeader, err := containers.Get(c, containerName, nil).Extract()
if err != nil {
return "", err
}
@ -521,10 +520,7 @@ func BulkDelete(c *gophercloud.ServiceClient, container string, objects []string
// https://github.com/openstack/swift/blob/stable/train/swift/common/swob.py#L302
encodedObjects := make([]string, len(objects))
for i, v := range objects {
encodedObjects[i] = strings.Join([]string{
url.QueryEscape(container),
url.QueryEscape(v)},
"/")
encodedObjects[i] = strings.Join([]string{container, v}, "/")
}
b := strings.NewReader(strings.Join(encodedObjects, "\n") + "\n")
resp, err := c.Post(bulkDeleteURL(c), b, &r.Body, &gophercloud.RequestOpts{

2
vendor/github.com/gophercloud/gophercloud/provider_client.go generated vendored
View File

@ -440,7 +440,7 @@ func (client *ProviderClient) doRequest(method, url string, options *RequestOpts
respErr := ErrUnexpectedResponseCode{
URL: url,
Method: method,
Expected: options.OkCodes,
Expected: okc,
Actual: resp.StatusCode,
Body: body,
ResponseHeader: resp.Header,

2
vendor/modules.txt generated vendored
View File

@ -369,7 +369,7 @@ github.com/googleapis/gnostic/compiler
github.com/googleapis/gnostic/extensions
github.com/googleapis/gnostic/jsonschema
github.com/googleapis/gnostic/openapiv2
# github.com/gophercloud/gophercloud v0.17.0
# github.com/gophercloud/gophercloud v0.18.0
## explicit
github.com/gophercloud/gophercloud
github.com/gophercloud/gophercloud/openstack