diff --git a/glide.lock b/glide.lock index 1ea419850..7933f27bc 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 2cd40927816fe87ecd00dc1977f102c134d814efdaab8cda7b0f9109fba38c4f -updated: 2018-09-10T16:30:33.576212392-07:00 +hash: 31bf17f8455b134a865b129ae6400112b853917d7bfd2aa0fb8ad47c0dd53752 +updated: 2018-09-20T15:33:35.302863246-07:00 imports: - name: cloud.google.com/go version: fe3d41e1ecb2ce36ad3a979037c9b9a2b726226f @@ -21,9 +21,9 @@ imports: - name: github.com/appscode/go-version version: 0dcf3ac121c7c30e035b41ba9f652d1ce5994242 - name: github.com/appscode/jsonpatch - version: 1359b374de83fa14fd58ab10aa8ea4935f84d249 + version: 5af499cf01c842bfdd7761a433fc90525ccd6836 - name: github.com/appscode/kutil - version: 6a61b0d2df81e2d5b4764bee574eb43a9a954a5a + version: bd70cefb33397b4c196aca7e33cab656755e195e subpackages: - apiextensions/v1beta1 - meta @@ -123,7 +123,7 @@ imports: - name: github.com/fatih/camelcase version: f6a740d52f961c60348ebb109adde9f4635d7540 - name: github.com/fatih/structs - version: ebf56d35bba727c68ac77f56f2fcf90b181851aa + version: 4966fc68f5b7593aafa6cbbba2d65ec6e1416047 - name: github.com/ghodss/yaml version: 0ca9ea5df5451ffdf184b4428c902747c2c11cd7 - name: github.com/go-openapi/jsonpointer @@ -158,7 +158,7 @@ imports: - name: github.com/google/btree version: 7d79101e329e5a3adf994758c578dab82b90c017 - name: github.com/google/go-cmp - version: 2006917edc5a27cd174dbc4baba31a137d6cb9ff + version: 3af367b6b30c263d47e8895973edcca9a49cf029 subpackages: - cmp - cmp/internal/diff @@ -184,7 +184,7 @@ imports: - openstack/utils - pagination - name: github.com/graymeta/stow - version: afce6d90444a3ba63c6d6671498c6cdc79375369 + version: 1849a82ac7fbd3e5cb144bcc711544e90903eac4 repo: https://github.com/appscode/stow.git vcs: git - name: github.com/gregjones/httpcache @@ -204,24 +204,26 @@ imports: - name: github.com/json-iterator/go version: 1624edc4454b8682399def8740d46db5e4362ba4 - name: github.com/kubedb/apimachinery - version: b708c5206e4e9fdb0753d18036b5b17dac5d8b5c + version: 7760fb61e363cdc939e78708046db6a4d92ca77c subpackages: - apis/kubedb - apis/kubedb/v1alpha1 - client/clientset/versioned/scheme - client/clientset/versioned/typed/kubedb/v1alpha1 - name: github.com/kubedb/elasticsearch - version: 60c8f8973732e4853671f971697bb0a02c37ac72 + version: efd4971e11b83abd7ee5f486759ed14d054c6cb0 +- name: github.com/kubedb/etcd + version: e537d186d2184f1a1c728483c2b72e4c813fe830 - name: github.com/kubedb/memcached - version: c87f44a360e23d596a5f2c5904c31a6a9627653c + version: 3b18436ca39adb62a45c60be7dd04c278e8c07a4 - name: github.com/kubedb/mongodb - version: 41b2f81daeb609963acc2fc3594548ec1da0b5e5 + version: 9094d089533138995e55a8e9e36463e8cc40ca6d - name: github.com/kubedb/mysql - version: 796c93dad463302334aad12ea25bd4f73b6bb091 + version: 04eb9bb5156ae6c4109a0398073f4b90de22ba93 - name: github.com/kubedb/postgres - version: 4af241215cdb71b95e9664d829dca4e330b0ce43 + version: 85783294de09f749fd77b558901c7c602edac1ca - name: github.com/kubedb/redis - version: 978db413808d0da7380847d2ddeb738f27bd3727 + version: 301038d1ec3872ba5bb17155159cbb877e20963d - name: github.com/mailru/easyjson version: 2f5df55504ebc322e4d52d34df6a1f5b503bf26d subpackages: @@ -326,7 +328,7 @@ imports: subpackages: - rate - name: google.golang.org/api - version: 7ca32eb868bf53ea2fc406698eb98583a8073d19 + version: 1d193494d9b89e3f4dbd64a2d7992a998b0450e6 subpackages: - storage/v1 - name: google.golang.org/appengine diff --git a/vendor/github.com/appscode/kutil/meta/patch.go b/vendor/github.com/appscode/kutil/meta/patch.go index 57e3517f3..b087d8140 100644 --- a/vendor/github.com/appscode/kutil/meta/patch.go +++ b/vendor/github.com/appscode/kutil/meta/patch.go @@ -7,20 +7,26 @@ import ( jp "github.com/appscode/jsonpatch" "github.com/evanphx/json-patch" "github.com/json-iterator/go" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/mergepatch" "k8s.io/apimachinery/pkg/util/strategicpatch" ) var json = jsoniter.ConfigFastest -func CreateStrategicPatch(cur runtime.Object, mod runtime.Object, fns ...mergepatch.PreconditionFunc) ([]byte, error) { - curJson, err := json.Marshal(cur) +func toJson(v interface{}) ([]byte, error) { + if u, ok := v.([]byte); ok { + return u, nil + } + return json.Marshal(v) +} + +func CreateStrategicPatch(cur interface{}, mod interface{}, fns ...mergepatch.PreconditionFunc) ([]byte, error) { + curJson, err := toJson(cur) if err != nil { return nil, err } - modJson, err := json.Marshal(mod) + modJson, err := toJson(mod) if err != nil { return nil, err } @@ -28,13 +34,13 @@ func CreateStrategicPatch(cur runtime.Object, mod runtime.Object, fns ...mergepa return strategicpatch.CreateTwoWayMergePatch(curJson, modJson, mod, fns...) } -func CreateJSONMergePatch(cur runtime.Object, mod runtime.Object, fns ...mergepatch.PreconditionFunc) ([]byte, error) { - curJson, err := json.Marshal(cur) +func CreateJSONMergePatch(cur interface{}, mod interface{}, fns ...mergepatch.PreconditionFunc) ([]byte, error) { + curJson, err := toJson(cur) if err != nil { return nil, err } - modJson, err := json.Marshal(mod) + modJson, err := toJson(mod) if err != nil { return nil, err } @@ -50,13 +56,13 @@ func CreateJSONMergePatch(cur runtime.Object, mod runtime.Object, fns ...mergepa return patch, nil } -func CreateJSONPatch(cur runtime.Object, mod runtime.Object) ([]byte, error) { - curJson, err := json.Marshal(cur) +func CreateJSONPatch(cur interface{}, mod interface{}) ([]byte, error) { + curJson, err := toJson(cur) if err != nil { return nil, err } - modJson, err := json.Marshal(mod) + modJson, err := toJson(mod) if err != nil { return nil, err } diff --git a/vendor/github.com/google/go-cmp/cmp/compare.go b/vendor/github.com/google/go-cmp/cmp/compare.go index b56d63447..7e215f220 100644 --- a/vendor/github.com/google/go-cmp/cmp/compare.go +++ b/vendor/github.com/google/go-cmp/cmp/compare.go @@ -29,7 +29,6 @@ package cmp import ( "fmt" "reflect" - "strings" "github.com/google/go-cmp/cmp/internal/diff" "github.com/google/go-cmp/cmp/internal/function" @@ -113,10 +112,6 @@ type state struct { curPath Path // The current path in the value tree reporter reporter // Optional reporter used for difference formatting - // recChecker checks for infinite cycles applying the same set of - // transformers upon the output of itself. - recChecker recChecker - // dynChecker triggers pseudo-random checks for option correctness. // It is safe for statelessCompare to mutate this value. dynChecker dynChecker @@ -186,7 +181,6 @@ func (s *state) statelessCompare(vx, vy reflect.Value) diff.Result { func (s *state) compareAny(vx, vy reflect.Value) { // TODO: Support cyclic data structures. - s.recChecker.Check(s.curPath) // Rule 0: Differing types are never equal. if !vx.IsValid() || !vy.IsValid() { @@ -386,9 +380,8 @@ func detectRaces(c chan<- reflect.Value, f reflect.Value, vs ...reflect.Value) { // assuming that T is assignable to R. // Otherwise, it returns the input value as is. func sanitizeValue(v reflect.Value, t reflect.Type) reflect.Value { - // TODO(dsnet): Workaround for reflect bug (https://golang.org/issue/22143). - // The upstream fix landed in Go1.10, so we can remove this when drop support - // for Go1.9 and below. + // TODO(dsnet): Remove this hacky workaround. + // See https://golang.org/issue/22143 if v.Kind() == reflect.Interface && v.IsNil() && v.Type() != t { return reflect.New(t).Elem() } @@ -524,45 +517,6 @@ func (s *state) report(eq bool, vx, vy reflect.Value) { } } -// recChecker tracks the state needed to periodically perform checks that -// user provided transformers are not stuck in an infinitely recursive cycle. -type recChecker struct{ next int } - -// Check scans the Path for any recursive transformers and panics when any -// recursive transformers are detected. Note that the presence of a -// recursive Transformer does not necessarily imply an infinite cycle. -// As such, this check only activates after some minimal number of path steps. -func (rc *recChecker) Check(p Path) { - const minLen = 1 << 16 - if rc.next == 0 { - rc.next = minLen - } - if len(p) < rc.next { - return - } - rc.next <<= 1 - - // Check whether the same transformer has appeared at least twice. - var ss []string - m := map[Option]int{} - for _, ps := range p { - if t, ok := ps.(Transform); ok { - t := t.Option() - if m[t] == 1 { // Transformer was used exactly once before - tf := t.(*transformer).fnc.Type() - ss = append(ss, fmt.Sprintf("%v: %v => %v", t, tf.In(0), tf.Out(0))) - } - m[t]++ - } - } - if len(ss) > 0 { - const warning = "recursive set of Transformers detected" - const help = "consider using cmpopts.AcyclicTransformer" - set := strings.Join(ss, "\n\t") - panic(fmt.Sprintf("%s:\n\t%s\n%s", warning, set, help)) - } -} - // dynChecker tracks the state needed to periodically perform checks that // user provided functions are symmetric and deterministic. // The zero value is safe for immediate use. diff --git a/vendor/github.com/google/go-cmp/cmp/internal/value/format.go b/vendor/github.com/google/go-cmp/cmp/internal/value/format.go index bafb2d121..657e50877 100644 --- a/vendor/github.com/google/go-cmp/cmp/internal/value/format.go +++ b/vendor/github.com/google/go-cmp/cmp/internal/value/format.go @@ -26,7 +26,7 @@ func Format(v reflect.Value, conf FormatConfig) string { conf.printType = true conf.followPointers = true conf.realPointers = true - return formatAny(v, conf, visited{}) + return formatAny(v, conf, nil) } type FormatConfig struct { @@ -37,7 +37,7 @@ type FormatConfig struct { realPointers bool // Should we print the real address of pointers? } -func formatAny(v reflect.Value, conf FormatConfig, m visited) string { +func formatAny(v reflect.Value, conf FormatConfig, visited map[uintptr]bool) string { // TODO: Should this be a multi-line printout in certain situations? if !v.IsValid() { @@ -79,10 +79,11 @@ func formatAny(v reflect.Value, conf FormatConfig, m visited) string { } return "" } - if m.Visit(v) || !conf.followPointers { + if visited[v.Pointer()] || !conf.followPointers { return formatPointer(v, conf) } - return "&" + formatAny(v.Elem(), conf, m) + visited = insertPointer(visited, v.Pointer()) + return "&" + formatAny(v.Elem(), conf, visited) case reflect.Interface: if v.IsNil() { if conf.printType { @@ -90,7 +91,7 @@ func formatAny(v reflect.Value, conf FormatConfig, m visited) string { } return "" } - return formatAny(v.Elem(), conf, m) + return formatAny(v.Elem(), conf, visited) case reflect.Slice: if v.IsNil() { if conf.printType { @@ -98,23 +99,18 @@ func formatAny(v reflect.Value, conf FormatConfig, m visited) string { } return "" } + if visited[v.Pointer()] { + return formatPointer(v, conf) + } + visited = insertPointer(visited, v.Pointer()) fallthrough case reflect.Array: var ss []string subConf := conf subConf.printType = v.Type().Elem().Kind() == reflect.Interface for i := 0; i < v.Len(); i++ { - vi := v.Index(i) - if vi.CanAddr() { // Check for recursive elements - p := vi.Addr() - if m.Visit(p) { - subConf := conf - subConf.printType = true - ss = append(ss, "*"+formatPointer(p, subConf)) - continue - } - } - ss = append(ss, formatAny(vi, subConf, m)) + s := formatAny(v.Index(i), subConf, visited) + ss = append(ss, s) } s := fmt.Sprintf("{%s}", strings.Join(ss, ", ")) if conf.printType { @@ -128,9 +124,10 @@ func formatAny(v reflect.Value, conf FormatConfig, m visited) string { } return "" } - if m.Visit(v) { + if visited[v.Pointer()] { return formatPointer(v, conf) } + visited = insertPointer(visited, v.Pointer()) var ss []string keyConf, valConf := conf, conf @@ -138,8 +135,8 @@ func formatAny(v reflect.Value, conf FormatConfig, m visited) string { keyConf.followPointers = false valConf.printType = v.Type().Elem().Kind() == reflect.Interface for _, k := range SortKeys(v.MapKeys()) { - sk := formatAny(k, keyConf, m) - sv := formatAny(v.MapIndex(k), valConf, m) + sk := formatAny(k, keyConf, visited) + sv := formatAny(v.MapIndex(k), valConf, visited) ss = append(ss, fmt.Sprintf("%s: %s", sk, sv)) } s := fmt.Sprintf("{%s}", strings.Join(ss, ", ")) @@ -158,7 +155,7 @@ func formatAny(v reflect.Value, conf FormatConfig, m visited) string { } name := v.Type().Field(i).Name subConf.UseStringer = conf.UseStringer - s := formatAny(vv, subConf, m) + s := formatAny(vv, subConf, visited) ss = append(ss, fmt.Sprintf("%s: %s", name, s)) } s := fmt.Sprintf("{%s}", strings.Join(ss, ", ")) @@ -232,6 +229,15 @@ func formatHex(u uint64) string { return fmt.Sprintf(f, u) } +// insertPointer insert p into m, allocating m if necessary. +func insertPointer(m map[uintptr]bool, p uintptr) map[uintptr]bool { + if m == nil { + m = make(map[uintptr]bool) + } + m[p] = true + return m +} + // isZero reports whether v is the zero value. // This does not rely on Interface and so can be used on unexported fields. func isZero(v reflect.Value) bool { @@ -269,12 +275,3 @@ func isZero(v reflect.Value) bool { } return false } - -type visited map[Pointer]bool - -func (m visited) Visit(v reflect.Value) bool { - p := PointerOf(v) - visited := m[p] - m[p] = true - return visited -} diff --git a/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go b/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go deleted file mode 100644 index 0a01c4796..000000000 --- a/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2018, The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE.md file. - -// +build purego - -package value - -import "reflect" - -// Pointer is an opaque typed pointer and is guaranteed to be comparable. -type Pointer struct { - p uintptr - t reflect.Type -} - -// PointerOf returns a Pointer from v, which must be a -// reflect.Ptr, reflect.Slice, or reflect.Map. -func PointerOf(v reflect.Value) Pointer { - // NOTE: Storing a pointer as an uintptr is technically incorrect as it - // assumes that the GC implementation does not use a moving collector. - return Pointer{v.Pointer(), v.Type()} -} diff --git a/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_unsafe.go b/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_unsafe.go deleted file mode 100644 index da134ae2a..000000000 --- a/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_unsafe.go +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2018, The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE.md file. - -// +build !purego - -package value - -import ( - "reflect" - "unsafe" -) - -// Pointer is an opaque typed pointer and is guaranteed to be comparable. -type Pointer struct { - p unsafe.Pointer - t reflect.Type -} - -// PointerOf returns a Pointer from v, which must be a -// reflect.Ptr, reflect.Slice, or reflect.Map. -func PointerOf(v reflect.Value) Pointer { - // The proper representation of a pointer is unsafe.Pointer, - // which is necessary if the GC ever uses a moving collector. - return Pointer{unsafe.Pointer(v.Pointer()), v.Type()} -} diff --git a/vendor/github.com/google/go-cmp/cmp/options.go b/vendor/github.com/google/go-cmp/cmp/options.go index cc3a4b9e7..91d4b066e 100644 --- a/vendor/github.com/google/go-cmp/cmp/options.go +++ b/vendor/github.com/google/go-cmp/cmp/options.go @@ -220,9 +220,6 @@ func (invalid) apply(s *state, _, _ reflect.Value) { // input and output types are the same), an implicit filter is added such that // a transformer is applicable only if that exact transformer is not already // in the tail of the Path since the last non-Transform step. -// For situations where the implicit filter is still insufficient, -// consider using cmpopts.AcyclicTransformer, which adds a filter -// to prevent the transformer from being recursively applied upon itself. // // The name is a user provided label that is used as the Transform.Name in the // transformation PathStep. If empty, an arbitrary name is used. diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/elasticsearch_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/elasticsearch_version_helpers.go index 1bd3e66cf..f45da08ec 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/elasticsearch_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/elasticsearch_version_helpers.go @@ -53,19 +53,14 @@ func (p ElasticsearchVersion) CustomResourceDefinition() *apiextensions.CustomRe JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", - }, - { - Name: "ToolsImage", - Type: "string", - JSONPath: ".spec.tools.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/etcd_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/etcd_version_helpers.go index 68bc60abf..3f9c8ce66 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/etcd_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/etcd_version_helpers.go @@ -53,14 +53,14 @@ func (p EtcdVersion) CustomResourceDefinition() *apiextensions.CustomResourceDef JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_helpers.go index a4230b87d..b4e136cef 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_helpers.go @@ -163,7 +163,7 @@ func (m *MemcachedSpec) SetDefaults() { // perform defaulting if m.UpdateStrategy.Type == "" { - m.UpdateStrategy.Type = apps.RollingUpdateStatefulSetStrategyType + m.UpdateStrategy.Type = apps.RollingUpdateDeploymentStrategyType } if m.TerminationPolicy == "" { m.TerminationPolicy = TerminationPolicyPause diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_version_helpers.go index 32c856aef..8fd96221d 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/memcached_version_helpers.go @@ -53,14 +53,14 @@ func (p MemcachedVersion) CustomResourceDefinition() *apiextensions.CustomResour JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mongodb_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mongodb_version_helpers.go index c696edb61..811bae84a 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mongodb_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mongodb_version_helpers.go @@ -53,19 +53,14 @@ func (p MongoDBVersion) CustomResourceDefinition() *apiextensions.CustomResource JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", - }, - { - Name: "ToolsImage", - Type: "string", - JSONPath: ".spec.tools.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mysql_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mysql_version_helpers.go index 48436d72d..38a7fc168 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mysql_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/mysql_version_helpers.go @@ -53,19 +53,14 @@ func (p MySQLVersion) CustomResourceDefinition() *apiextensions.CustomResourceDe JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", - }, - { - Name: "ToolsImage", - Type: "string", - JSONPath: ".spec.tools.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/openapi_generated.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/openapi_generated.go index de7dc6729..f2f42072e 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/openapi_generated.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/openapi_generated.go @@ -112,6 +112,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.PostgresVersionTools": schema_apimachinery_apis_kubedb_v1alpha1_PostgresVersionTools(ref), "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.PostgresWALSourceSpec": schema_apimachinery_apis_kubedb_v1alpha1_PostgresWALSourceSpec(ref), "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.Redis": schema_apimachinery_apis_kubedb_v1alpha1_Redis(ref), + "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.RedisClusterSpec": schema_apimachinery_apis_kubedb_v1alpha1_RedisClusterSpec(ref), "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.RedisList": schema_apimachinery_apis_kubedb_v1alpha1_RedisList(ref), "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.RedisSpec": schema_apimachinery_apis_kubedb_v1alpha1_RedisSpec(ref), "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.RedisStatus": schema_apimachinery_apis_kubedb_v1alpha1_RedisStatus(ref), @@ -3886,6 +3887,32 @@ func schema_apimachinery_apis_kubedb_v1alpha1_Redis(ref common.ReferenceCallback } } +func schema_apimachinery_apis_kubedb_v1alpha1_RedisClusterSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "master": { + SchemaProps: spec.SchemaProps{ + Description: "Number of master nodes. It must be >= 3. If not specified, defaults to 3.", + Type: []string{"integer"}, + Format: "int32", + }, + }, + "replicas": { + SchemaProps: spec.SchemaProps{ + Description: "Number of replica(s) per master node. If not specified, defaults to 1.", + Type: []string{"integer"}, + Format: "int32", + }, + }, + }, + }, + }, + Dependencies: []string{}, + } +} + func schema_apimachinery_apis_kubedb_v1alpha1_RedisList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -3945,11 +3972,24 @@ func schema_apimachinery_apis_kubedb_v1alpha1_RedisSpec(ref common.ReferenceCall }, "replicas": { SchemaProps: spec.SchemaProps{ - Description: "Number of instances to deploy for a Redis database.", + Description: "Number of instances to deploy for a MySQL database.", Type: []string{"integer"}, Format: "int32", }, }, + "mode": { + SchemaProps: spec.SchemaProps{ + Description: "Default is \"Standalone\". If set to \"Cluster\", ClusterSpec is required and redis servers will start in cluster mode", + Type: []string{"string"}, + Format: "", + }, + }, + "cluster": { + SchemaProps: spec.SchemaProps{ + Description: "Redis cluster configuration for running redis servers in cluster mode. Required if Mode is set to \"Cluster\"", + Ref: ref("github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.RedisClusterSpec"), + }, + }, "storageType": { SchemaProps: spec.SchemaProps{ Description: "StorageType can be durable (default) or ephemeral", @@ -4071,7 +4111,7 @@ func schema_apimachinery_apis_kubedb_v1alpha1_RedisSpec(ref common.ReferenceCall }, }, Dependencies: []string{ - "k8s.io/api/apps/v1.StatefulSetUpdateStrategy", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PersistentVolumeClaimSpec", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.Toleration", "k8s.io/api/core/v1.VolumeSource", "kmodules.xyz/monitoring-agent-api/api/v1.AgentSpec", "kmodules.xyz/offshoot-api/api/v1.PodTemplateSpec", "kmodules.xyz/offshoot-api/api/v1.ServiceTemplateSpec"}, + "github.com/kubedb/apimachinery/apis/kubedb/v1alpha1.RedisClusterSpec", "k8s.io/api/apps/v1.StatefulSetUpdateStrategy", "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PersistentVolumeClaimSpec", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.Toleration", "k8s.io/api/core/v1.VolumeSource", "kmodules.xyz/monitoring-agent-api/api/v1.AgentSpec", "kmodules.xyz/offshoot-api/api/v1.PodTemplateSpec", "kmodules.xyz/offshoot-api/api/v1.ServiceTemplateSpec"}, } } @@ -4658,6 +4698,20 @@ func schema_apimachinery_apis_kubedb_v1alpha1_SnapshotSourceSpec(ref common.Refe Format: "", }, }, + "args": { + SchemaProps: spec.SchemaProps{ + Description: "Arguments to the restore job", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, }, Required: []string{"namespace", "name"}, }, @@ -6651,7 +6705,7 @@ func schema_k8sio_api_core_v1_CSIPersistentVolumeSource(ref common.ReferenceCall }, "fsType": { SchemaProps: spec.SchemaProps{ - Description: "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\". Implicitly inferred to be \"ext4\" if unspecified.", + Description: "Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. \"ext4\", \"xfs\", \"ntfs\".", Type: []string{"string"}, Format: "", }, @@ -15646,7 +15700,7 @@ func schema_k8sio_api_core_v1_VolumeMount(ref common.ReferenceCallback) common.O }, "mountPropagation": { SchemaProps: spec.SchemaProps{ - Description: "mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationHostToContainer is used. This field is beta in 1.10.", + Description: "mountPropagation determines how mounts are propagated from the host to container and the other way around. When not set, MountPropagationNone is used. This field is beta in 1.10.", Type: []string{"string"}, Format: "", }, diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/postgres_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/postgres_version_helpers.go index 4acb23cca..984aade73 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/postgres_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/postgres_version_helpers.go @@ -53,19 +53,14 @@ func (p PostgresVersion) CustomResourceDefinition() *apiextensions.CustomResourc JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", - }, - { - Name: "ToolsImage", - Type: "string", - JSONPath: ".spec.tools.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_helpers.go index 92944cdff..439449460 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_helpers.go @@ -3,6 +3,7 @@ package v1alpha1 import ( "fmt" + "github.com/appscode/go/types" crdutils "github.com/appscode/kutil/apiextensions/v1beta1" meta_util "github.com/appscode/kutil/meta" apps "k8s.io/api/apps/v1" @@ -45,6 +46,10 @@ func (r Redis) ServiceName() string { return r.OffshootName() } +func (r Redis) ConfigMapName() string { + return r.OffshootName() +} + type redisStatsService struct { *Redis } @@ -162,6 +167,19 @@ func (r *RedisSpec) SetDefaults() { } // perform defaulting + if r.Mode == "" { + r.Mode = RedisModeStandalone + } else if r.Mode == RedisModeCluster { + if r.Cluster == nil { + r.Cluster = &RedisClusterSpec{} + } + if r.Cluster.Master == nil { + r.Cluster.Master = types.Int32P(3) + } + if r.Cluster.Replicas == nil { + r.Cluster.Replicas = types.Int32P(1) + } + } if r.StorageType == "" { r.StorageType = StorageTypeDurable } diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_types.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_types.go index b1a6cff15..688196bc3 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_types.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_types.go @@ -16,6 +16,13 @@ const ( ResourcePluralRedis = "redises" ) +type RedisMode string + +const ( + RedisModeStandalone RedisMode = "Standalone" + RedisModeCluster RedisMode = "Cluster" +) + // +genclient // +k8s:openapi-gen=true // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -32,9 +39,16 @@ type RedisSpec struct { // Version of Redis to be deployed. Version types.StrYo `json:"version"` - // Number of instances to deploy for a Redis database. + // Number of instances to deploy for a MySQL database. Replicas *int32 `json:"replicas,omitempty"` + // Default is "Standalone". If set to "Cluster", ClusterSpec is required and redis servers will + // start in cluster mode + Mode RedisMode `json:"mode,omitempty"` + + // Redis cluster configuration for running redis servers in cluster mode. Required if Mode is set to "Cluster" + Cluster *RedisClusterSpec `json:"cluster,omitempty"` + // StorageType can be durable (default) or ephemeral StorageType StorageType `json:"storageType,omitempty"` @@ -105,6 +119,14 @@ type RedisSpec struct { ImagePullSecrets []core.LocalObjectReference `json:"imagePullSecrets,omitempty"` } +type RedisClusterSpec struct { + // Number of master nodes. It must be >= 3. If not specified, defaults to 3. + Master *int32 `json:"master,omitempty"` + + // Number of replica(s) per master node. If not specified, defaults to 1. + Replicas *int32 `json:"replicas,omitempty"` +} + type RedisStatus struct { Phase DatabasePhase `json:"phase,omitempty"` Reason string `json:"reason,omitempty"` diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_version_helpers.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_version_helpers.go index 1168e45b8..e58ae15f6 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_version_helpers.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/redis_version_helpers.go @@ -53,14 +53,14 @@ func (p RedisVersion) CustomResourceDefinition() *apiextensions.CustomResourceDe JSONPath: ".spec.version", }, { - Name: "DbImage", + Name: "DB_IMAGE", Type: "string", JSONPath: ".spec.db.image", }, { - Name: "ExporterImage", - Type: "string", - JSONPath: ".spec.exporter.image", + Name: "Deprecated", + Type: "boolean", + JSONPath: ".spec.deprecated", }, { Name: "Age", diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/types.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/types.go index 5de7c73e7..5d47665d7 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/types.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/types.go @@ -20,6 +20,8 @@ type ScriptSourceSpec struct { type SnapshotSourceSpec struct { Namespace string `json:"namespace"` Name string `json:"name"` + // Arguments to the restore job + Args []string `json:"args,omitempty"` } type BackupScheduleSpec struct { diff --git a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/zz_generated.deepcopy.go b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/zz_generated.deepcopy.go index 440ec793d..2e60fa8bb 100644 --- a/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/github.com/kubedb/apimachinery/apis/kubedb/v1alpha1/zz_generated.deepcopy.go @@ -887,7 +887,7 @@ func (in *InitSpec) DeepCopyInto(out *InitSpec) { *out = nil } else { *out = new(SnapshotSourceSpec) - **out = **in + (*in).DeepCopyInto(*out) } } if in.PostgresWAL != nil { @@ -2499,6 +2499,40 @@ func (in *Redis) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *RedisClusterSpec) DeepCopyInto(out *RedisClusterSpec) { + *out = *in + if in.Master != nil { + in, out := &in.Master, &out.Master + if *in == nil { + *out = nil + } else { + *out = new(int32) + **out = **in + } + } + if in.Replicas != nil { + in, out := &in.Replicas, &out.Replicas + if *in == nil { + *out = nil + } else { + *out = new(int32) + **out = **in + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new RedisClusterSpec. +func (in *RedisClusterSpec) DeepCopy() *RedisClusterSpec { + if in == nil { + return nil + } + out := new(RedisClusterSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *RedisList) DeepCopyInto(out *RedisList) { *out = *in @@ -2544,6 +2578,15 @@ func (in *RedisSpec) DeepCopyInto(out *RedisSpec) { **out = **in } } + if in.Cluster != nil { + in, out := &in.Cluster, &out.Cluster + if *in == nil { + *out = nil + } else { + *out = new(RedisClusterSpec) + (*in).DeepCopyInto(*out) + } + } if in.Storage != nil { in, out := &in.Storage, &out.Storage if *in == nil { @@ -2839,6 +2882,11 @@ func (in *SnapshotList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SnapshotSourceSpec) DeepCopyInto(out *SnapshotSourceSpec) { *out = *in + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) + } return } diff --git a/vendor/github.com/kubedb/etcd/LICENSE b/vendor/github.com/kubedb/etcd/LICENSE new file mode 100644 index 000000000..261eeb9e9 --- /dev/null +++ b/vendor/github.com/kubedb/etcd/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/google.golang.org/api/storage/v1/storage-gen.go b/vendor/google.golang.org/api/storage/v1/storage-gen.go index 71356dea9..279344d8e 100644 --- a/vendor/google.golang.org/api/storage/v1/storage-gen.go +++ b/vendor/google.golang.org/api/storage/v1/storage-gen.go @@ -549,13 +549,12 @@ type BucketLifecycleRuleCondition struct { // matches archived objects. IsLive *bool `json:"isLive,omitempty"` - // MatchesPattern: A regular expression that satisfies the RE2 syntax - // language. This condition is satisfied when the name of the object - // matches the RE2 pattern. Note: This feature is currently in the - // "Early Access" launch stage and is only available to a whitelisted - // set of users; that means that this feature may changed in - // backward-incompatible ways and that it is not guaranteed to be - // released. + // MatchesPattern: A regular expression that satisfies the RE2 syntax. + // This condition is satisfied when the name of the object matches the + // RE2 pattern. Note: This feature is currently in the "Early Access" + // launch stage and is only available to a whitelisted set of users; + // that means that this feature may be changed in backward-incompatible + // ways and that it is not guaranteed to be released. MatchesPattern string `json:"matchesPattern,omitempty"` // MatchesStorageClass: Objects having any of the storage classes @@ -1067,8 +1066,8 @@ type ComposeRequestSourceObjects struct { // Generation: The generation of this object to use as the source. Generation int64 `json:"generation,omitempty,string"` - // Name: The source object's name. The source object's bucket is - // implicitly the destination bucket. + // Name: The source object's name. All source objects must reside in the + // same bucket. Name string `json:"name,omitempty"` // ObjectPreconditions: Conditions that must be met for this operation @@ -7661,7 +7660,7 @@ func (c *ObjectsComposeCall) Do(opts ...googleapi.CallOption) (*Object, error) { // ], // "parameters": { // "destinationBucket": { - // "description": "Name of the bucket in which to store the new object.", + // "description": "Name of the bucket containing the source objects. The destination object is stored in this bucket.", // "location": "path", // "required": true, // "type": "string"