github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update storageos vendor for FilteredDial change

Browse Source
This commit is contained in:
Matthew Cary 2020-06-10 01:02:40 +00:00
parent 2aa1cd25f3
commit 74dbf274d9
58 changed files with 239 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/images/etcd/migrate/BUILD
View File

@ -40,9 +40,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/github.com/mrunalp/fileutils:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/mrunalp/fileutils:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/mrunalp/fileutils:go_default_library",
],

20
cmd/kube-proxy/app/BUILD
View File

@ -137,18 +137,6 @@ go_library(
"//staging/src/k8s.io/component-base/metrics:go_default_library",
"//vendor/k8s.io/utils/net:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/proxy/metrics:go_default_library",
"//pkg/proxy/util/iptables:go_default_library",
"//pkg/util/node:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/util/net:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
"//staging/src/k8s.io/client-go/tools/watch:go_default_library",
"//staging/src/k8s.io/component-base/metrics:go_default_library",
"//vendor/k8s.io/utils/net:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/proxy/metrics:go_default_library",
"//pkg/proxy/util/iptables:go_default_library",
@ -315,14 +303,6 @@ go_test(
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/proxy/ipvs:go_default_library",
"//pkg/proxy/util/iptables:go_default_library",
"//pkg/util/iptables:go_default_library",
"//pkg/util/iptables/testing:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/proxy/ipvs:go_default_library",
"//pkg/proxy/util/iptables:go_default_library",

4
go.mod
View File

@ -91,7 +91,7 @@ require (
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.4.0
github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc
github.com/storageos/go-api v2.2.0+incompatible
github.com/stretchr/testify v1.4.0
github.com/thecodeteam/goscaleio v0.1.0
github.com/urfave/negroni v1.0.0 // indirect
@ -397,7 +397,7 @@ replace (
github.com/spf13/jwalterweatherman => github.com/spf13/jwalterweatherman v1.1.0
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
github.com/spf13/viper => github.com/spf13/viper v1.4.0
github.com/storageos/go-api => github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc
github.com/storageos/go-api => github.com/storageos/go-api v2.2.0+incompatible
github.com/stretchr/objx => github.com/stretchr/objx v0.2.0
github.com/stretchr/testify => github.com/stretchr/testify v1.4.0
github.com/syndtr/gocapability => github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2

4
go.sum
View File

@ -436,8 +436,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc h1:n+WYaU0kQ6WIiuEyWSgbXqkBx16irO69kYCtwVYoO5s=
github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
github.com/storageos/go-api v2.2.0+incompatible h1:U0SablXoZIg06gvSlg8BCdzq1C/SkHVygOVX95Z2MU0=
github.com/storageos/go-api v2.2.0+incompatible/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=

5
pkg/kubelet/cm/BUILD
View File

@ -96,11 +96,6 @@ go_library(
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//vendor/k8s.io/utils/mount:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/kubelet/cadvisor:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//vendor/k8s.io/utils/mount:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/kubelet/cadvisor:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",

3
pkg/kubelet/dockershim/cm/BUILD
View File

@ -37,9 +37,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//pkg/kubelet/dockershim/libdocker:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/kubelet/dockershim/libdocker:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/kubelet/dockershim/libdocker:go_default_library",
],

5
pkg/kubelet/dockershim/network/kubenet/BUILD
View File

@ -58,11 +58,6 @@ go_library(
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/dockershim/network:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/container:go_default_library",
"//pkg/kubelet/dockershim/network:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/container:go_default_library",

3
pkg/kubelet/oom/BUILD
View File

@ -30,9 +30,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
],

4
pkg/kubelet/server/stats/BUILD
View File

@ -70,10 +70,6 @@ go_test(
"//pkg/kubelet/cm:go_default_library",
"//vendor/github.com/google/gofuzz:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/kubelet/cm:go_default_library",
"//vendor/github.com/google/gofuzz:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/kubelet/cm:go_default_library",
"//vendor/github.com/google/gofuzz:go_default_library",

3
pkg/kubelet/stats/pidlimit/BUILD
View File

@ -28,9 +28,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
],

3
pkg/proxy/userspace/BUILD
View File

@ -53,9 +53,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],

3
pkg/util/ipvs/BUILD
View File

@ -56,9 +56,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/k8s.io/utils/exec:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/k8s.io/utils/exec:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/k8s.io/utils/exec:go_default_library",
],

3
pkg/util/resizefs/BUILD
View File

@ -25,9 +25,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/k8s.io/utils/mount:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/k8s.io/utils/mount:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/k8s.io/utils/mount:go_default_library",
],

3
pkg/volume/azuredd/BUILD
View File

@ -57,9 +57,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/k8s.io/utils/exec:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/k8s.io/utils/exec:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/k8s.io/utils/exec:go_default_library",
],

3
pkg/volume/util/fs/BUILD
View File

@ -29,9 +29,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//pkg/volume/util/fsquota:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library",

4
pkg/volume/util/subpath/BUILD
View File

@ -33,10 +33,6 @@ go_library(
"//vendor/k8s.io/utils/mount:go_default_library",
"//vendor/k8s.io/utils/nsenter:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/k8s.io/utils/mount:go_default_library",
"//vendor/k8s.io/utils/nsenter:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/k8s.io/utils/mount:go_default_library",
"//vendor/k8s.io/utils/nsenter:go_default_library",

3
staging/src/k8s.io/apiserver/pkg/server/options/BUILD
View File

@ -103,9 +103,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],

4
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/BUILD
View File

@ -58,10 +58,6 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing:go_default_library",

8
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing/BUILD
View File

@ -47,14 +47,6 @@ go_library(
"//vendor/google.golang.org/grpc/status:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library",
"//vendor/google.golang.org/grpc:go_default_library",
"//vendor/google.golang.org/grpc/codes:go_default_library",
"//vendor/google.golang.org/grpc/status:go_default_library",
"//vendor/k8s.io/klog/v2:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library",

3
staging/src/k8s.io/kubectl/pkg/util/BUILD
View File

@ -35,9 +35,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],

3
staging/src/k8s.io/kubectl/pkg/util/term/BUILD
View File

@ -34,9 +34,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],

4
test/integration/master/BUILD
View File

@ -87,10 +87,6 @@ go_test(
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/testing:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/v1beta1:go_default_library",

3
vendor/github.com/coreos/pkg/capnslog/BUILD generated vendored
View File

@ -32,9 +32,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/github.com/coreos/go-systemd/journal:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/coreos/go-systemd/journal:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/coreos/go-systemd/journal:go_default_library",
],

3
vendor/github.com/docker/docker/pkg/term/BUILD generated vendored
View File

@ -31,9 +31,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],

4
vendor/github.com/miekg/dns/BUILD generated vendored
View File

@ -77,10 +77,6 @@ go_library(
"//vendor/golang.org/x/net/ipv6:go_default_library",
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/net/ipv4:go_default_library",
"//vendor/golang.org/x/net/ipv6:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/net/ipv4:go_default_library",
"//vendor/golang.org/x/net/ipv6:go_default_library",

3
vendor/github.com/moby/term/BUILD generated vendored
View File

@ -31,9 +31,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/golang.org/x/sys/unix:go_default_library",
],

1
vendor/github.com/onsi/ginkgo/internal/remote/BUILD generated vendored
View File

@ -10,7 +10,6 @@ go_library(
"output_interceptor_win.go",
"server.go",
"syscall_dup_linux_arm64.go",
"syscall_dup_linux_riscv64.go",
"syscall_dup_solaris.go",
"syscall_dup_unix.go",
],

3
vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd/BUILD generated vendored
View File

@ -39,9 +39,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups:go_default_library",
],

3
vendor/github.com/opencontainers/runc/libcontainer/system/BUILD generated vendored
View File

@ -29,9 +29,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/github.com/opencontainers/runc/libcontainer/user:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/opencontainers/runc/libcontainer/user:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/opencontainers/runc/libcontainer/user:go_default_library",
],

3
vendor/github.com/prometheus/client_golang/prometheus/BUILD generated vendored
View File

@ -56,9 +56,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/github.com/prometheus/procfs:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/prometheus/procfs:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/prometheus/procfs:go_default_library",
],

2
vendor/github.com/storageos/go-api/BUILD generated vendored
View File

@ -4,7 +4,9 @@ go_library(
name = "go_default_library",
srcs = [
"client.go",
"cluster.go",
"health.go",
"licence.go",
"logger.go",
"login.go",
"namespace.go",

53
vendor/github.com/storageos/go-api/client.go generated vendored
View File

@ -44,6 +44,9 @@ var (
// ErrProxyNotSupported is returned when a client is unable to set a proxy for http requests.
ErrProxyNotSupported = errors.New("client does not support http proxy")
// ErrDialerNotSupported is returned when a client is unable to set a DialContext for http requests.
ErrDialerNotSupported = errors.New("client does not support setting DialContext")
// DefaultPort is the default API port.
DefaultPort = "5705"
@ -107,6 +110,8 @@ type Dialer interface {
Dial(network, address string) (net.Conn, error)
}
type dialContext = func(ctx context.Context, network, address string) (net.Conn, error)
// NewClient returns a Client instance ready for communication with the given
// server endpoint. It will use the latest remote API version available in the
// server.
@ -203,6 +208,36 @@ func (c *Client) SetTimeout(t time.Duration) {
}
}
// GetDialContext returns the current DialContext function, or nil if there is none.
func (c *Client) GetDialContext() dialContext {
c.configLock.RLock()
defer c.configLock.RUnlock()
if c.httpClient == nil {
return nil
}
transport, supported := c.httpClient.Transport.(*http.Transport)
if !supported {
return nil
}
return transport.DialContext
}
// SetDialContext uses the given dial function to establish TCP connections in the HTTPClient.
func (c *Client) SetDialContext(dial dialContext) error {
c.configLock.Lock()
defer c.configLock.Unlock()
if client := c.httpClient; client != nil {
transport, supported := client.Transport.(*http.Transport)
if !supported {
return ErrDialerNotSupported
}
transport.DialContext = dial
}
return nil
}
func (c *Client) checkAPIVersion() error {
serverAPIVersionString, err := c.getServerAPIVersionString()
if err != nil {
@ -259,6 +294,8 @@ type doOptions struct {
forceJSON bool
force bool
unversioned bool
retryOn []int // http.status codes
}
func (c *Client) do(method, urlpath string, doOptions doOptions) (*http.Response, error) {
@ -338,6 +375,7 @@ func (c *Client) do(method, urlpath string, doOptions doOptions) (*http.Response
resp, err := httpClient.Do(req.WithContext(ctx))
if err != nil {
// If it is a custom error, return it. It probably knows more than us
if serror.IsStorageOSError(err) {
switch serror.ErrorKind(err) {
@ -366,6 +404,17 @@ func (c *Client) do(method, urlpath string, doOptions doOptions) (*http.Response
}
}
var shouldretry bool
if doOptions.retryOn != nil {
for _, code := range doOptions.retryOn {
if resp.StatusCode == code {
failedAddresses[address] = struct{}{}
shouldretry = true
}
}
}
// If we get to the point of response, we should move any failed
// addresses to the back.
failed := len(failedAddresses)
@ -388,6 +437,10 @@ func (c *Client) do(method, urlpath string, doOptions doOptions) (*http.Response
c.addressLock.Unlock()
}
if shouldretry {
continue
}
if resp.StatusCode < 200 || resp.StatusCode >= 400 {
return nil, newError(resp) // These status codes are likely to be fatal
}

48
vendor/github.com/storageos/go-api/cluster.go generated vendored Normal file
View File

@ -0,0 +1,48 @@
package storageos
import (
"encoding/json"
"github.com/storageos/go-api/types"
)
var (
// ClusterMaintenanceAPIPrefix is a path to the HTTP endpoint for managing
// the cluster maintenance mode.
ClusterMaintenanceAPIPrefix = "cluster/maintenance"
)
// Maintenance returns the maintenance status of the cluster
func (c *Client) Maintenance() (*types.Maintenance, error) {
resp, err := c.do("GET", ClusterMaintenanceAPIPrefix, doOptions{})
if err != nil {
return nil, err
}
defer resp.Body.Close()
res := &types.Maintenance{}
if err := json.NewDecoder(resp.Body).Decode(res); err != nil {
return nil, err
}
return res, nil
}
// EnableMaintenance enables maintenance mode in the cluster
func (c *Client) EnableMaintenance() error {
resp, err := c.do("POST", ClusterMaintenanceAPIPrefix, doOptions{})
if err != nil {
return err
}
defer resp.Body.Close()
return nil
}
// DisableMaintenance disables maintenance mode in the cluster
func (c *Client) DisableMaintenance() error {
resp, err := c.do("DELETE", ClusterMaintenanceAPIPrefix, doOptions{})
if err != nil {
return err
}
defer resp.Body.Close()
return nil
}

16
vendor/github.com/storageos/go-api/health.go generated vendored
View File

@ -14,6 +14,22 @@ var (
HealthAPIPrefix = "health"
)
func (c *Client) ClusterHealth(ctx context.Context) ([]*types.ClusterHealthNode, error) {
status := []*types.ClusterHealthNode{}
url := fmt.Sprintf("/cluster/%s", HealthAPIPrefix)
resp, err := c.do("GET", url, doOptions{context: ctx, retryOn: []int{http.StatusNotFound}})
if err != nil {
return nil, err
}
defer resp.Body.Close()
if err := json.NewDecoder(resp.Body).Decode(&status); err != nil {
return nil, err
}
return status, nil
}
// CPHealth returns the health of the control plane server at a given url.
func (c *Client) CPHealth(ctx context.Context, hostname string) (*types.CPHealthStatus, error) {

43
vendor/github.com/storageos/go-api/licence.go generated vendored Normal file
View File

@ -0,0 +1,43 @@
package storageos
import (
"encoding/json"
"github.com/storageos/go-api/types"
)
const (
// licenceAPIPrefix is a partial path to the HTTP endpoint.
licenceAPIPrefix = "licencing"
)
// Licence returns the current licence on the server.
func (c *Client) Licence() (*types.Licence, error) {
resp, err := c.do("GET", licenceAPIPrefix, doOptions{})
if err != nil {
return nil, err
}
defer resp.Body.Close()
licence := &types.Licence{}
if err := json.NewDecoder(resp.Body).Decode(&licence); err != nil {
return nil, err
}
return licence, nil
}
// LicenceApply applies a licence on the server.
func (c *Client) LicenceApply(licenceKey string) error {
_, err := c.do("POST", licenceAPIPrefix, doOptions{
data: &types.LicenceKeyContainer{Key: licenceKey},
})
return err
}
// LicenceDelete removes the current licence.
func (c *Client) LicenceDelete() error {
resp, err := c.do("DELETE", licenceAPIPrefix, doOptions{})
if err != nil {
return err
}
return resp.Body.Close()
}

6
vendor/github.com/storageos/go-api/netutil/parsers.go generated vendored
View File

@ -55,6 +55,12 @@ func AddressesFromNodes(nodes []string) ([]string, error) {
return nil, newInvalidNodeError(errInvalidHostName)
}
// Given input like "http://localhost:8080:8383", url.Parse() will
// return host as "localhost:8000", which isn't a vaild DNS name.
if strings.Contains(host, ":") {
return nil, newInvalidNodeError(errInvalidHostName)
}
port := url.Port()
if port == "" {
port = DefaultDialPort

2
vendor/github.com/storageos/go-api/policy.go generated vendored
View File

@ -29,7 +29,7 @@ func (n *nopMarshaler) MarshalJSON() ([]byte, error) {
}
// PolicyCreate creates a policy on the server.
func (c *Client) PolicyCreate(jsonl []byte, ctx context.Context) error {
func (c *Client) PolicyCreate(ctx context.Context, jsonl []byte) error {
nopm := nopMarshaler(jsonl)
_, err := c.do("POST", PolicyAPIPrefix, doOptions{
data: &nopm,

2
vendor/github.com/storageos/go-api/pool.go generated vendored
View File

@ -110,7 +110,7 @@ func (c *Client) PoolDelete(opts types.DeleteOptions) error {
return ErrPoolInUse
}
}
return nil
return err
}
defer resp.Body.Close()
return nil

2
vendor/github.com/storageos/go-api/rule.go generated vendored
View File

@ -134,7 +134,7 @@ func (c *Client) RuleDelete(opts types.DeleteOptions) error {
return ErrRuleInUse
}
}
return nil
return err
}
defer resp.Body.Close()
return nil

2
vendor/github.com/storageos/go-api/types/BUILD generated vendored
View File

@ -5,6 +5,7 @@ go_library(
srcs = [
"auth.go",
"capacity_stats.go",
"cluster.go",
"connectivity.go",
"delete_options.go",
"deployment.go",
@ -12,6 +13,7 @@ go_library(
"error_response.go",
"events.go",
"health.go",
"licence.go",
"list_options.go",
"logger.go",
"namespace.go",

10
vendor/github.com/storageos/go-api/types/cluster.go generated vendored Normal file
View File

@ -0,0 +1,10 @@
package types
import "time"
// Maintenance is used to place the cluster in maintenance mode.
type Maintenance struct {
Enabled bool `json:"enabled"`
UpdatedBy string `json:"updatedBy"`
UpdatedAt time.Time `json:"updatedAt"`
}

14
vendor/github.com/storageos/go-api/types/health.go generated vendored
View File

@ -14,6 +14,20 @@ type NamedSubModuleStatus struct {
SubModuleStatus
}
type ClusterHealthNode struct {
NodeID string `json:"nodeID"`
NodeName string `json:"nodeName"`
Submodules struct {
DirectFSInitiator SubModuleStatus `json:"directfs_initiator"`
Director SubModuleStatus `json:"director"`
KV SubModuleStatus `json:"kv"`
KVWrite SubModuleStatus `json:"kv_write"`
NATS SubModuleStatus `json:"nats"`
Presentation SubModuleStatus `json:"presentation"`
RDB SubModuleStatus `json:"rdb"`
} `json:"submodules"`
}
type CPHealthStatus struct {
KV SubModuleStatus
KVWrite SubModuleStatus

35
vendor/github.com/storageos/go-api/types/licence.go generated vendored Normal file
View File

@ -0,0 +1,35 @@
package types
import "time"
// FeatureType store features types
type FeatureType string
const (
// HA means High Availability
HA = FeatureType("HA")
// DEV means developer licence
DEV = FeatureType("DEV")
// TRIAL means trial licence
TRIAL = FeatureType("TRIAL")
)
// Licence holds the information to be encoded in the licence key. It needs to be synced across
// the django server running on portal-API as well as the corresponding decoding package on the
// storageOS control plane
type Licence struct {
ArrayUUID string `json:"arrayUUID,omitempty"`
ClusterID string `json:"clusterID,omitempty"`
CustomerID string `json:"customerID"`
CustomerName string `json:"customerName"`
Storage int `json:"storage"`
ValidUntil time.Time `json:"validUntil"`
LicenceType string `json:"licenceType"`
Features map[FeatureType]bool `json:"features"`
Unregistered bool `json:"unregistered"`
}
// LicenceKeyContainer - stores a licence key
type LicenceKeyContainer struct {
Key string `json:"key"`
}

3
vendor/github.com/storageos/go-api/user.go generated vendored
View File

@ -12,7 +12,6 @@ import (
)
var (
// UserAPIPrefix is a partial path to the HTTP endpoint.
UserAPIPrefix = "users"
@ -77,7 +76,7 @@ func (c *Client) UserCreate(opts types.UserCreateOptions) error {
}
// UserUpdate updates a user on the server.
func (c *Client) UserUpdate(user *types.User, ctx context.Context) error {
func (c *Client) UserUpdate(ctx context.Context, user *types.User) error {
var ref string
switch {
case user.UUID != "":

3
vendor/github.com/vishvananda/netlink/BUILD generated vendored
View File

@ -75,9 +75,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/github.com/vishvananda/netns:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/vishvananda/netns:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/vishvananda/netns:go_default_library",
],

1
vendor/go.etcd.io/bbolt/BUILD generated vendored
View File

@ -13,7 +13,6 @@ go_library(
"bolt_openbsd.go",
"bolt_ppc64.go",
"bolt_ppc64le.go",
"bolt_riscv64.go",
"bolt_s390x.go",
"bolt_unix.go",
"bolt_unix_aix.go",

4
vendor/go.etcd.io/etcd/pkg/logutil/BUILD generated vendored
View File

@ -44,10 +44,6 @@ go_library(
"//vendor/github.com/coreos/go-systemd/journal:go_default_library",
"//vendor/go.etcd.io/etcd/pkg/systemd:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/github.com/coreos/go-systemd/journal:go_default_library",
"//vendor/go.etcd.io/etcd/pkg/systemd:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/github.com/coreos/go-systemd/journal:go_default_library",
"//vendor/go.etcd.io/etcd/pkg/systemd:go_default_library",

6
vendor/golang.org/x/net/internal/socket/BUILD generated vendored
View File

@ -54,7 +54,6 @@ go_library(
"sys_linux_mipsle.go",
"sys_linux_ppc64.go",
"sys_linux_ppc64le.go",
"sys_linux_riscv64.go",
"sys_linux_s390x.go",
"sys_linux_s390x.s",
"sys_netbsd.go",
@ -64,7 +63,6 @@ go_library(
"sys_stub.go",
"sys_unix.go",
"sys_windows.go",
"zsys_aix_ppc64.go",
"zsys_darwin_386.go",
"zsys_darwin_amd64.go",
"zsys_darwin_arm.go",
@ -73,7 +71,6 @@ go_library(
"zsys_freebsd_386.go",
"zsys_freebsd_amd64.go",
"zsys_freebsd_arm.go",
"zsys_freebsd_arm64.go",
"zsys_linux_386.go",
"zsys_linux_amd64.go",
"zsys_linux_arm.go",
@ -84,16 +81,13 @@ go_library(
"zsys_linux_mipsle.go",
"zsys_linux_ppc64.go",
"zsys_linux_ppc64le.go",
"zsys_linux_riscv64.go",
"zsys_linux_s390x.go",
"zsys_netbsd_386.go",
"zsys_netbsd_amd64.go",
"zsys_netbsd_arm.go",
"zsys_netbsd_arm64.go",
"zsys_openbsd_386.go",
"zsys_openbsd_amd64.go",
"zsys_openbsd_arm.go",
"zsys_openbsd_arm64.go",
"zsys_solaris_amd64.go",
],
importmap = "k8s.io/kubernetes/vendor/golang.org/x/net/internal/socket",

3
vendor/golang.org/x/net/ipv4/BUILD generated vendored
View File

@ -44,13 +44,11 @@ go_library(
"sys_ssmreq_stub.go",
"sys_stub.go",
"sys_windows.go",
"zsys_aix_ppc64.go",
"zsys_darwin.go",
"zsys_dragonfly.go",
"zsys_freebsd_386.go",
"zsys_freebsd_amd64.go",
"zsys_freebsd_arm.go",
"zsys_freebsd_arm64.go",
"zsys_linux_386.go",
"zsys_linux_amd64.go",
"zsys_linux_arm.go",
@ -62,7 +60,6 @@ go_library(
"zsys_linux_ppc.go",
"zsys_linux_ppc64.go",
"zsys_linux_ppc64le.go",
"zsys_linux_riscv64.go",
"zsys_linux_s390x.go",
"zsys_netbsd.go",
"zsys_openbsd.go",

3
vendor/golang.org/x/net/ipv6/BUILD generated vendored
View File

@ -43,13 +43,11 @@ go_library(
"sys_ssmreq_stub.go",
"sys_stub.go",
"sys_windows.go",
"zsys_aix_ppc64.go",
"zsys_darwin.go",
"zsys_dragonfly.go",
"zsys_freebsd_386.go",
"zsys_freebsd_amd64.go",
"zsys_freebsd_arm.go",
"zsys_freebsd_arm64.go",
"zsys_linux_386.go",
"zsys_linux_amd64.go",
"zsys_linux_arm.go",
@ -61,7 +59,6 @@ go_library(
"zsys_linux_ppc.go",
"zsys_linux_ppc64.go",
"zsys_linux_ppc64le.go",
"zsys_linux_riscv64.go",
"zsys_linux_s390x.go",
"zsys_netbsd.go",
"zsys_openbsd.go",

3
vendor/golang.org/x/sys/cpu/BUILD generated vendored
View File

@ -3,7 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = [
"asm_aix_ppc64.s",
"byteorder.go",
"cpu.go",
"cpu_aix.go",
@ -23,13 +22,11 @@ go_library(
"cpu_mips64x.go",
"cpu_mipsx.go",
"cpu_other_arm64.go",
"cpu_riscv64.go",
"cpu_s390x.s",
"cpu_wasm.go",
"cpu_x86.go",
"cpu_x86.s",
"hwcap_linux.go",
"syscall_aix_ppc64_gc.go",
],
importmap = "k8s.io/kubernetes/vendor/golang.org/x/sys/cpu",
importpath = "golang.org/x/sys/cpu",

35
vendor/golang.org/x/sys/unix/BUILD generated vendored
View File

@ -5,7 +5,6 @@ go_library(
srcs = [
"affinity_linux.go",
"aliases.go",
"asm_aix_ppc64.s",
"asm_darwin_386.s",
"asm_darwin_amd64.s",
"asm_darwin_arm.s",
@ -14,7 +13,6 @@ go_library(
"asm_freebsd_386.s",
"asm_freebsd_amd64.s",
"asm_freebsd_arm.s",
"asm_freebsd_arm64.s",
"asm_linux_386.s",
"asm_linux_amd64.s",
"asm_linux_arm.s",
@ -22,21 +20,17 @@ go_library(
"asm_linux_mips64x.s",
"asm_linux_mipsx.s",
"asm_linux_ppc64x.s",
"asm_linux_riscv64.s",
"asm_linux_s390x.s",
"asm_netbsd_386.s",
"asm_netbsd_amd64.s",
"asm_netbsd_arm.s",
"asm_netbsd_arm64.s",
"asm_openbsd_386.s",
"asm_openbsd_amd64.s",
"asm_openbsd_arm.s",
"asm_openbsd_arm64.s",
"asm_solaris_amd64.s",
"bluetooth_linux.go",
"cap_freebsd.go",
"constants.go",
"dev_aix_ppc64.go",
"dev_darwin.go",
"dev_dragonfly.go",
"dev_freebsd.go",
@ -50,7 +44,6 @@ go_library(
"errors_freebsd_386.go",
"errors_freebsd_amd64.go",
"errors_freebsd_arm.go",
"errors_freebsd_arm64.go",
"fcntl.go",
"fcntl_darwin.go",
"fcntl_linux_32bit.go",
@ -69,7 +62,6 @@ go_library(
"str.go",
"syscall.go",
"syscall_aix.go",
"syscall_aix_ppc64.go",
"syscall_bsd.go",
"syscall_darwin.1_12.go",
"syscall_darwin.1_13.go",
@ -89,8 +81,6 @@ go_library(
"syscall_freebsd_386.go",
"syscall_freebsd_amd64.go",
"syscall_freebsd_arm.go",
"syscall_freebsd_arm64.go",
"syscall_illumos.go",
"syscall_linux.go",
"syscall_linux_386.go",
"syscall_linux_amd64.go",
@ -102,18 +92,15 @@ go_library(
"syscall_linux_mips64x.go",
"syscall_linux_mipsx.go",
"syscall_linux_ppc64x.go",
"syscall_linux_riscv64.go",
"syscall_linux_s390x.go",
"syscall_netbsd.go",
"syscall_netbsd_386.go",
"syscall_netbsd_amd64.go",
"syscall_netbsd_arm.go",
"syscall_netbsd_arm64.go",
"syscall_openbsd.go",
"syscall_openbsd_386.go",
"syscall_openbsd_amd64.go",
"syscall_openbsd_arm.go",
"syscall_openbsd_arm64.go",
"syscall_solaris.go",
"syscall_solaris_amd64.go",
"syscall_unix.go",
@ -122,7 +109,6 @@ go_library(
"timestruct.go",
"unveil_openbsd.go",
"xattr_bsd.go",
"zerrors_aix_ppc64.go",
"zerrors_darwin_386.go",
"zerrors_darwin_amd64.go",
"zerrors_darwin_arm.go",
@ -131,7 +117,6 @@ go_library(
"zerrors_freebsd_386.go",
"zerrors_freebsd_amd64.go",
"zerrors_freebsd_arm.go",
"zerrors_freebsd_arm64.go",
"zerrors_linux.go",
"zerrors_linux_386.go",
"zerrors_linux_amd64.go",
@ -143,24 +128,19 @@ go_library(
"zerrors_linux_mipsle.go",
"zerrors_linux_ppc64.go",
"zerrors_linux_ppc64le.go",
"zerrors_linux_riscv64.go",
"zerrors_linux_s390x.go",
"zerrors_netbsd_386.go",
"zerrors_netbsd_amd64.go",
"zerrors_netbsd_arm.go",
"zerrors_netbsd_arm64.go",
"zerrors_openbsd_386.go",
"zerrors_openbsd_amd64.go",
"zerrors_openbsd_arm.go",
"zerrors_openbsd_arm64.go",
"zerrors_solaris_amd64.go",
"zptrace_armnn_linux.go",
"zptrace_linux_arm64.go",
"zptrace_mipsnn_linux.go",
"zptrace_mipsnnle_linux.go",
"zptrace_x86_linux.go",
"zsyscall_aix_ppc64.go",
"zsyscall_aix_ppc64_gc.go",
"zsyscall_darwin_386.1_11.go",
"zsyscall_darwin_386.1_13.go",
"zsyscall_darwin_386.1_13.s",
@ -185,8 +165,6 @@ go_library(
"zsyscall_freebsd_386.go",
"zsyscall_freebsd_amd64.go",
"zsyscall_freebsd_arm.go",
"zsyscall_freebsd_arm64.go",
"zsyscall_illumos_amd64.go",
"zsyscall_linux.go",
"zsyscall_linux_386.go",
"zsyscall_linux_amd64.go",
@ -198,21 +176,17 @@ go_library(
"zsyscall_linux_mipsle.go",
"zsyscall_linux_ppc64.go",
"zsyscall_linux_ppc64le.go",
"zsyscall_linux_riscv64.go",
"zsyscall_linux_s390x.go",
"zsyscall_netbsd_386.go",
"zsyscall_netbsd_amd64.go",
"zsyscall_netbsd_arm.go",
"zsyscall_netbsd_arm64.go",
"zsyscall_openbsd_386.go",
"zsyscall_openbsd_amd64.go",
"zsyscall_openbsd_arm.go",
"zsyscall_openbsd_arm64.go",
"zsyscall_solaris_amd64.go",
"zsysctl_openbsd_386.go",
"zsysctl_openbsd_amd64.go",
"zsysctl_openbsd_arm.go",
"zsysctl_openbsd_arm64.go",
"zsysnum_darwin_386.go",
"zsysnum_darwin_amd64.go",
"zsysnum_darwin_arm.go",
@ -221,7 +195,6 @@ go_library(
"zsysnum_freebsd_386.go",
"zsysnum_freebsd_amd64.go",
"zsysnum_freebsd_arm.go",
"zsysnum_freebsd_arm64.go",
"zsysnum_linux_386.go",
"zsysnum_linux_amd64.go",
"zsysnum_linux_arm.go",
@ -232,17 +205,13 @@ go_library(
"zsysnum_linux_mipsle.go",
"zsysnum_linux_ppc64.go",
"zsysnum_linux_ppc64le.go",
"zsysnum_linux_riscv64.go",
"zsysnum_linux_s390x.go",
"zsysnum_netbsd_386.go",
"zsysnum_netbsd_amd64.go",
"zsysnum_netbsd_arm.go",
"zsysnum_netbsd_arm64.go",
"zsysnum_openbsd_386.go",
"zsysnum_openbsd_amd64.go",
"zsysnum_openbsd_arm.go",
"zsysnum_openbsd_arm64.go",
"ztypes_aix_ppc64.go",
"ztypes_darwin_386.go",
"ztypes_darwin_amd64.go",
"ztypes_darwin_arm.go",
@ -251,7 +220,6 @@ go_library(
"ztypes_freebsd_386.go",
"ztypes_freebsd_amd64.go",
"ztypes_freebsd_arm.go",
"ztypes_freebsd_arm64.go",
"ztypes_linux.go",
"ztypes_linux_386.go",
"ztypes_linux_amd64.go",
@ -263,16 +231,13 @@ go_library(
"ztypes_linux_mipsle.go",
"ztypes_linux_ppc64.go",
"ztypes_linux_ppc64le.go",
"ztypes_linux_riscv64.go",
"ztypes_linux_s390x.go",
"ztypes_netbsd_386.go",
"ztypes_netbsd_amd64.go",
"ztypes_netbsd_arm.go",
"ztypes_netbsd_arm64.go",
"ztypes_openbsd_386.go",
"ztypes_openbsd_amd64.go",
"ztypes_openbsd_arm.go",
"ztypes_openbsd_arm64.go",
"ztypes_solaris_amd64.go",
],
cgo = True,

1
vendor/golang.org/x/sys/windows/BUILD generated vendored
View File

@ -20,7 +20,6 @@ go_library(
"types_windows.go",
"types_windows_386.go",
"types_windows_amd64.go",
"types_windows_arm.go",
"zerrors_windows.go",
"zknownfolderids_windows.go",
"zsyscall_windows.go",

1
vendor/golang.org/x/sys/windows/svc/BUILD generated vendored
View File

@ -10,7 +10,6 @@ go_library(
"service.go",
"sys_386.s",
"sys_amd64.s",
"sys_arm.s",
],
importmap = "k8s.io/kubernetes/vendor/golang.org/x/sys/windows/svc",
importpath = "golang.org/x/sys/windows/svc",

3
vendor/google.golang.org/grpc/internal/syscall/BUILD generated vendored
View File

@ -26,9 +26,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/google.golang.org/grpc/grpclog:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/google.golang.org/grpc/grpclog:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/google.golang.org/grpc/grpclog:go_default_library",
],

3
vendor/k8s.io/utils/mount/BUILD generated vendored
View File

@ -35,9 +35,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/k8s.io/utils/io:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/k8s.io/utils/io:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/k8s.io/utils/io:go_default_library",
],

3
vendor/k8s.io/utils/nsenter/BUILD generated vendored
View File

@ -26,9 +26,6 @@ go_library(
"@io_bazel_rules_go//go/platform:freebsd": [
"//vendor/k8s.io/utils/exec:go_default_library",
],
"@io_bazel_rules_go//go/platform:illumos": [
"//vendor/k8s.io/utils/exec:go_default_library",
],
"@io_bazel_rules_go//go/platform:ios": [
"//vendor/k8s.io/utils/exec:go_default_library",
],

4
vendor/modules.txt vendored
View File

@ -1010,10 +1010,10 @@ github.com/spf13/pflag
## explicit
github.com/spf13/viper
# github.com/spf13/viper => github.com/spf13/viper v1.4.0
# github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc => github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc
# github.com/storageos/go-api v2.2.0+incompatible => github.com/storageos/go-api v2.2.0+incompatible
## explicit
github.com/storageos/go-api
# github.com/storageos/go-api => github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc
# github.com/storageos/go-api => github.com/storageos/go-api v2.2.0+incompatible
github.com/storageos/go-api/netutil
github.com/storageos/go-api/serror
github.com/storageos/go-api/types