mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 19:01:49 +00:00
Update quobyte client API to v0.1.8
This update picks up https://github.com/quobyte/api/pull/19 which adds the needed `SetTransport` option. With this update, we can add the IP deny list into quobyte operations.
This commit is contained in:
parent
0ad06e991a
commit
40bb82a5b8
4
go.mod
4
go.mod
@ -82,7 +82,7 @@ require (
|
|||||||
github.com/prometheus/client_golang v1.7.1
|
github.com/prometheus/client_golang v1.7.1
|
||||||
github.com/prometheus/client_model v0.2.0
|
github.com/prometheus/client_model v0.2.0
|
||||||
github.com/prometheus/common v0.10.0
|
github.com/prometheus/common v0.10.0
|
||||||
github.com/quobyte/api v0.1.2
|
github.com/quobyte/api v0.1.8
|
||||||
github.com/robfig/cron v1.1.0
|
github.com/robfig/cron v1.1.0
|
||||||
github.com/spf13/afero v1.2.2
|
github.com/spf13/afero v1.2.2
|
||||||
github.com/spf13/cobra v1.1.1
|
github.com/spf13/cobra v1.1.1
|
||||||
@ -401,7 +401,7 @@ replace (
|
|||||||
github.com/prometheus/client_model => github.com/prometheus/client_model v0.2.0
|
github.com/prometheus/client_model => github.com/prometheus/client_model v0.2.0
|
||||||
github.com/prometheus/common => github.com/prometheus/common v0.10.0
|
github.com/prometheus/common => github.com/prometheus/common v0.10.0
|
||||||
github.com/prometheus/procfs => github.com/prometheus/procfs v0.1.3
|
github.com/prometheus/procfs => github.com/prometheus/procfs v0.1.3
|
||||||
github.com/quobyte/api => github.com/quobyte/api v0.1.2
|
github.com/quobyte/api => github.com/quobyte/api v0.1.8
|
||||||
github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446
|
github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446
|
||||||
github.com/robfig/cron => github.com/robfig/cron v1.1.0
|
github.com/robfig/cron => github.com/robfig/cron v1.1.0
|
||||||
github.com/rogpeppe/fastuuid => github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af
|
github.com/rogpeppe/fastuuid => github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af
|
||||||
|
4
go.sum
4
go.sum
@ -425,8 +425,8 @@ github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lN
|
|||||||
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
|
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
|
||||||
github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
|
github.com/prometheus/procfs v0.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8=
|
||||||
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
||||||
github.com/quobyte/api v0.1.2 h1:lPHLsuvtjFyk8WhC4uHoHRkScijIHcffTWBBP+YpzYo=
|
github.com/quobyte/api v0.1.8 h1:+sOX1gIlC/OaLipqVZWrHgly9Kh9Qo8OygeS0mWAg30=
|
||||||
github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
|
github.com/quobyte/api v0.1.8/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
|
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
|
||||||
github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY=
|
github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY=
|
||||||
github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
|
github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
|
||||||
|
4
vendor/github.com/quobyte/api/README.md
generated
vendored
4
vendor/github.com/quobyte/api/README.md
generated
vendored
@ -24,6 +24,10 @@ func main() {
|
|||||||
RootUserID: "root",
|
RootUserID: "root",
|
||||||
RootGroupID: "root",
|
RootGroupID: "root",
|
||||||
ConfigurationName: "BASE",
|
ConfigurationName: "BASE",
|
||||||
|
Labels: []quobyte_api.Label{
|
||||||
|
{Name: "label1", Value: "value1"},
|
||||||
|
{Name: "label2", Value: "value2"},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
volumeUUID, err := client.CreateVolume(req)
|
volumeUUID, err := client.CreateVolume(req)
|
||||||
|
4
vendor/github.com/quobyte/api/quobyte.go
generated
vendored
4
vendor/github.com/quobyte/api/quobyte.go
generated
vendored
@ -32,6 +32,10 @@ func (client *QuobyteClient) GetAPIRetryPolicy() string {
|
|||||||
return client.apiRetryPolicy
|
return client.apiRetryPolicy
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (client *QuobyteClient) SetTransport(t http.RoundTripper) {
|
||||||
|
client.client.Transport = t
|
||||||
|
}
|
||||||
|
|
||||||
// NewQuobyteClient creates a new Quobyte API client
|
// NewQuobyteClient creates a new Quobyte API client
|
||||||
func NewQuobyteClient(url string, username string, password string) *QuobyteClient {
|
func NewQuobyteClient(url string, username string, password string) *QuobyteClient {
|
||||||
return &QuobyteClient{
|
return &QuobyteClient{
|
||||||
|
8
vendor/github.com/quobyte/api/rpc_client.go
generated
vendored
8
vendor/github.com/quobyte/api/rpc_client.go
generated
vendored
@ -4,6 +4,7 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
@ -112,7 +113,12 @@ func (client QuobyteClient) sendRequest(method string, request interface{}, resp
|
|||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
if resp.StatusCode < 200 || resp.StatusCode > 299 {
|
if resp.StatusCode < 200 || resp.StatusCode > 299 {
|
||||||
log.Printf("Warning: HTTP status code for request is %s\n", strconv.Itoa(resp.StatusCode))
|
log.Printf("Warning: HTTP status code for request is %s\n",
|
||||||
|
strconv.Itoa(resp.StatusCode))
|
||||||
|
if resp.StatusCode == 401 {
|
||||||
|
return errors.New("Unable to authenticate with Quobyte API service")
|
||||||
|
}
|
||||||
|
return fmt.Errorf("JsonRPC failed with error code %d", resp.StatusCode)
|
||||||
}
|
}
|
||||||
return decodeResponse(resp.Body, &response)
|
return decodeResponse(resp.Body, &response)
|
||||||
}
|
}
|
||||||
|
8
vendor/github.com/quobyte/api/types.go
generated
vendored
8
vendor/github.com/quobyte/api/types.go
generated
vendored
@ -11,11 +11,17 @@ type CreateVolumeRequest struct {
|
|||||||
RootGroupID string `json:"root_group_id,omitempty"`
|
RootGroupID string `json:"root_group_id,omitempty"`
|
||||||
ReplicaDeviceIDS []uint64 `json:"replica_device_ids,string,omitempty"`
|
ReplicaDeviceIDS []uint64 `json:"replica_device_ids,string,omitempty"`
|
||||||
ConfigurationName string `json:"configuration_name,omitempty"`
|
ConfigurationName string `json:"configuration_name,omitempty"`
|
||||||
AccessMode uint32 `json:"access_mode,string,omitempty"`
|
Labels []Label `json:"label,omitempty"`
|
||||||
|
AccessMode uint32 `json:"access_mode,uint32,omitempty"`
|
||||||
TenantID string `json:"tenant_id,omitempty"`
|
TenantID string `json:"tenant_id,omitempty"`
|
||||||
retryPolicy
|
retryPolicy
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Label struct {
|
||||||
|
Name string `json:"name,string,omitempty"`
|
||||||
|
Value string `json:"value,string,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
type resolveVolumeNameRequest struct {
|
type resolveVolumeNameRequest struct {
|
||||||
VolumeName string `json:"volume_name,omitempty"`
|
VolumeName string `json:"volume_name,omitempty"`
|
||||||
TenantDomain string `json:"tenant_domain,omitempty"`
|
TenantDomain string `json:"tenant_domain,omitempty"`
|
||||||
|
4
vendor/modules.txt
vendored
4
vendor/modules.txt
vendored
@ -975,10 +975,10 @@ github.com/prometheus/procfs
|
|||||||
# github.com/prometheus/procfs => github.com/prometheus/procfs v0.1.3
|
# github.com/prometheus/procfs => github.com/prometheus/procfs v0.1.3
|
||||||
github.com/prometheus/procfs/internal/fs
|
github.com/prometheus/procfs/internal/fs
|
||||||
github.com/prometheus/procfs/internal/util
|
github.com/prometheus/procfs/internal/util
|
||||||
# github.com/quobyte/api v0.1.2 => github.com/quobyte/api v0.1.2
|
# github.com/quobyte/api v0.1.8 => github.com/quobyte/api v0.1.8
|
||||||
## explicit
|
## explicit
|
||||||
github.com/quobyte/api
|
github.com/quobyte/api
|
||||||
# github.com/quobyte/api => github.com/quobyte/api v0.1.2
|
# github.com/quobyte/api => github.com/quobyte/api v0.1.8
|
||||||
# github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446
|
# github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446
|
||||||
# github.com/robfig/cron v1.1.0 => github.com/robfig/cron v1.1.0
|
# github.com/robfig/cron v1.1.0 => github.com/robfig/cron v1.1.0
|
||||||
## explicit
|
## explicit
|
||||||
|
Loading…
Reference in New Issue
Block a user