diff --git a/go.mod b/go.mod index d7144d02..0b3b0d5d 100644 --- a/go.mod +++ b/go.mod @@ -30,9 +30,9 @@ require ( k8s.io/api v0.30.2 k8s.io/apimachinery v0.30.2 k8s.io/klog/v2 v2.130.1 - kmodules.xyz/client-go v0.30.28 + kmodules.xyz/client-go v0.30.32 kmodules.xyz/custom-resources v0.30.0 - kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1 + kubedb.dev/apimachinery v0.49.0-rc.0 sigs.k8s.io/controller-runtime v0.18.4 xorm.io/xorm v1.3.6 ) @@ -43,7 +43,7 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect - github.com/cert-manager/cert-manager v1.15.1 // indirect + github.com/cert-manager/cert-manager v1.15.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect diff --git a/go.sum b/go.sum index 2c9ce916..b4b332e0 100644 --- a/go.sum +++ b/go.sum @@ -59,8 +59,8 @@ github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= -github.com/cert-manager/cert-manager v1.15.1 h1:HSG4k2GlJ2YgTLkZfQzrArNaQpM9+ehDDg550IxAD94= -github.com/cert-manager/cert-manager v1.15.1/go.mod h1:p98JoGv3J9JhdKU9ngsj2EhWGI6/GlU7kpjWu5lf2js= +github.com/cert-manager/cert-manager v1.15.2 h1:Mjbvc+FjYeg2928xy7bcS+c+ARxyqBcXM9QypOg1/Uo= +github.com/cert-manager/cert-manager v1.15.2/go.mod h1:stBge/DTvrhfQMB/93+Y62s+gQgZBsfL1o0C/4AL/mI= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -796,16 +796,16 @@ k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCI k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= -kmodules.xyz/client-go v0.30.28 h1:YD5AZaUm3xakIbwLoKblLbE6mvayNZhIomgdXyuLo40= -kmodules.xyz/client-go v0.30.28/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM= +kmodules.xyz/client-go v0.30.32 h1:y1qb4IJwYdkROLcc7e0UcJSDj8D2YeLsawAWHnCF+JU= +kmodules.xyz/client-go v0.30.32/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM= kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o= kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24= kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+aYy2EiKaw= kmodules.xyz/monitoring-agent-api v0.30.2/go.mod h1:BoZFPDDRB7J39CcUsSDlzgW8PQCwik4ILPleyUob+Mg= kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI= kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g= -kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1 h1:wSfneVFQ57FYIpV+XHA3xsfi8cCr4fWUSKetlI9AlIM= -kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1/go.mod h1:NCiS4uS+F8DUyU9/tUQO3wqyNRNf0busab5/0Q2nYA0= +kubedb.dev/apimachinery v0.49.0-rc.0 h1:7WLTSSoXEb8trDFW5AcDxfYJxX7j5TQU2OYijLgAfTc= +kubedb.dev/apimachinery v0.49.0-rc.0/go.mod h1:l3sl+LZXvllja1xbZTgmzHNY7hQGK/uLXjkSothH5ns= kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4= kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/vendor/github.com/cert-manager/cert-manager/LICENSES b/vendor/github.com/cert-manager/cert-manager/LICENSES index 80350381..a1645b38 100644 --- a/vendor/github.com/cert-manager/cert-manager/LICENSES +++ b/vendor/github.com/cert-manager/cert-manager/LICENSES @@ -150,7 +150,7 @@ google.golang.org/api,https://github.com/googleapis/google-api-go-client/blob/v0 google.golang.org/api/internal/third_party/uritemplates,https://github.com/googleapis/google-api-go-client/blob/v0.181.0/internal/third_party/uritemplates/LICENSE,BSD-3-Clause google.golang.org/genproto/googleapis/api,https://github.com/googleapis/go-genproto/blob/fc5f0ca64291/googleapis/api/LICENSE,Apache-2.0 google.golang.org/genproto/googleapis/rpc,https://github.com/googleapis/go-genproto/blob/fc5f0ca64291/googleapis/rpc/LICENSE,Apache-2.0 -google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.64.0/LICENSE,Apache-2.0 +google.golang.org/grpc,https://github.com/grpc/grpc-go/blob/v1.64.1/LICENSE,Apache-2.0 google.golang.org/protobuf,https://github.com/protocolbuffers/protobuf-go/blob/v1.34.1/LICENSE,BSD-3-Clause gopkg.in/inf.v0,https://github.com/go-inf/inf/blob/v0.9.1/LICENSE,BSD-3-Clause gopkg.in/ini.v1,https://github.com/go-ini/ini/blob/v1.67.0/LICENSE,Apache-2.0 diff --git a/vendor/kmodules.xyz/client-go/Makefile b/vendor/kmodules.xyz/client-go/Makefile index 4ff50bd7..9c7cb06c 100644 --- a/vendor/kmodules.xyz/client-go/Makefile +++ b/vendor/kmodules.xyz/client-go/Makefile @@ -56,7 +56,7 @@ OS := $(if $(GOOS),$(GOOS),$(shell go env GOOS)) ARCH := $(if $(GOARCH),$(GOARCH),$(shell go env GOARCH)) BASEIMAGE_PROD ?= gcr.io/distroless/static-debian12 -BASEIMAGE_DBG ?= debian:bookworm +BASEIMAGE_DBG ?= debian:12 GO_VERSION ?= 1.23 BUILD_IMAGE ?= ghcr.io/appscode/golang-dev:$(GO_VERSION) diff --git a/vendor/kmodules.xyz/client-go/api/v1/cluster.go b/vendor/kmodules.xyz/client-go/api/v1/cluster.go index 5f17fba3..ca9579cf 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/cluster.go +++ b/vendor/kmodules.xyz/client-go/api/v1/cluster.go @@ -47,22 +47,34 @@ const ( ClusterNameKey string = "cluster.appscode.com/name" ClusterDisplayNameKey string = "cluster.appscode.com/display-name" ClusterProviderNameKey string = "cluster.appscode.com/provider" + + ClientOrgKey string = "ace.appscode.com/client-org" + ClientKeyPrefix string = "client.ace.appscode.com/" ) type ClusterMetadata struct { - UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"` - Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"` - DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"` - Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"` - OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"` - OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"` - APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"` - CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"` + UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"` + Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"` + DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"` + Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"` + OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"` + OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"` + APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"` + CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"` + ManagerID string `json:"managerID,omitempty" protobuf:"bytes,9,opt,name=managerID"` + HubClusterID string `json:"hubClusterID,omitempty" protobuf:"bytes,10,opt,name=hubClusterID"` +} + +func (md ClusterMetadata) Manager() string { + if md.ManagerID != "" && md.ManagerID != "0" { + return md.ManagerID + } + return md.OwnerID } func (md ClusterMetadata) State() string { hasher := hmac.New(sha256.New, []byte(md.UID)) - state := fmt.Sprintf("%s,%s", md.APIEndpoint, md.OwnerID) + state := fmt.Sprintf("%s,%s", md.APIEndpoint, md.Manager()) hasher.Write([]byte(state)) return base64.URLEncoding.EncodeToString(hasher.Sum(nil)) } diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go index fac4e455..f1f0d595 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -598,125 +598,128 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 1886 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdf, 0x6f, 0x5b, 0x49, - 0xf5, 0xf7, 0xad, 0x9d, 0xc4, 0x3e, 0x4e, 0xea, 0x66, 0xda, 0xaf, 0xea, 0x6f, 0x45, 0xed, 0x70, - 0x2b, 0xaa, 0x14, 0xb6, 0x37, 0x24, 0x6a, 0x61, 0x59, 0x81, 0x20, 0x76, 0xba, 0x5d, 0xef, 0xa6, - 0x8d, 0x19, 0xa7, 0xec, 0x6a, 0x41, 0xa0, 0xc9, 0xbd, 0xc7, 0xce, 0x90, 0xeb, 0x7b, 0xaf, 0x66, - 0xae, 0xb3, 0x64, 0x9f, 0xf6, 0x11, 0xc4, 0xcb, 0xf2, 0xc6, 0xe3, 0x56, 0xe2, 0x4f, 0x40, 0x42, - 0xfc, 0x05, 0xf4, 0xb1, 0xbc, 0xa0, 0x95, 0x40, 0x16, 0x35, 0xaf, 0x88, 0x17, 0x84, 0x84, 0xf2, - 0x84, 0x66, 0xee, 0x4f, 0x3b, 0xce, 0x26, 0x0b, 0x48, 0xbc, 0xf9, 0x9e, 0xcf, 0xe7, 0x9c, 0x39, - 0x33, 0x73, 0x7e, 0x8d, 0xe1, 0xfe, 0xd1, 0xd0, 0x77, 0x46, 0x2e, 0x4a, 0xeb, 0x27, 0x27, 0x1f, - 0x6e, 0xd8, 0x2e, 0x47, 0x2f, 0xbc, 0x3f, 0xf0, 0x37, 0x58, 0xc0, 0x37, 0x8e, 0x37, 0x37, 0x06, - 0xe8, 0xa1, 0x60, 0x21, 0x3a, 0x56, 0x20, 0xfc, 0xd0, 0x27, 0xb7, 0xf3, 0x74, 0x2b, 0xa2, 0xff, - 0x68, 0xe0, 0x5b, 0x2c, 0xe0, 0xd6, 0xf1, 0xe6, 0xad, 0xfb, 0x03, 0x1e, 0x1e, 0x8e, 0x0e, 0x2c, - 0xdb, 0x1f, 0x6e, 0x0c, 0xfc, 0x81, 0xbf, 0xa1, 0xb5, 0x0e, 0x46, 0x7d, 0xfd, 0xa5, 0x3f, 0xf4, - 0xaf, 0xc8, 0xda, 0x2d, 0xf3, 0xe8, 0x75, 0x69, 0xf1, 0x68, 0x31, 0xdb, 0x17, 0x38, 0x67, 0xc5, - 0x5b, 0x0f, 0x32, 0xce, 0x90, 0xd9, 0x87, 0xdc, 0x43, 0x71, 0xb2, 0x11, 0x1c, 0x0d, 0x94, 0x40, - 0x6e, 0x0c, 0x31, 0x64, 0x73, 0xb4, 0xcc, 0xdf, 0x18, 0x50, 0x6b, 0x6f, 0x77, 0x3b, 0x6d, 0x77, - 0x24, 0x43, 0x14, 0x1d, 0xaf, 0xef, 0x93, 0x6f, 0x42, 0x39, 0x10, 0xfe, 0x31, 0x77, 0x50, 0xd4, - 0x8d, 0x35, 0x63, 0xbd, 0xd2, 0x5a, 0x7b, 0x31, 0x6e, 0x16, 0x26, 0xe3, 0x66, 0xb9, 0x1b, 0xcb, - 0x4f, 0xc7, 0xcd, 0x65, 0xa5, 0x96, 0x7c, 0xd3, 0x54, 0x83, 0x6c, 0x40, 0xc5, 0x63, 0x43, 0x94, - 0x01, 0xb3, 0xb1, 0x7e, 0x45, 0xab, 0xaf, 0xc6, 0xea, 0x95, 0xa7, 0x09, 0x40, 0x33, 0x0e, 0x79, - 0x08, 0x55, 0x3b, 0x5a, 0x5d, 0xc1, 0xf5, 0xa2, 0x56, 0xb9, 0x1e, 0xab, 0x54, 0xdb, 0x19, 0x44, - 0xf3, 0x3c, 0xf3, 0xfb, 0xf0, 0x7f, 0x6d, 0x14, 0x21, 0xef, 0x73, 0x9b, 0x85, 0xd8, 0x15, 0xfc, - 0x98, 0x85, 0xf8, 0x0e, 0x9e, 0x90, 0x16, 0x94, 0xd1, 0xb3, 0x7d, 0x87, 0x7b, 0x83, 0xd8, 0xfd, - 0xbb, 0x89, 0xfb, 0x8f, 0x62, 0xf9, 0xe9, 0xb8, 0x49, 0x32, 0x8d, 0x44, 0x4a, 0x53, 0x3d, 0xf3, - 0xef, 0x0b, 0x50, 0xcb, 0x59, 0xef, 0x05, 0x68, 0x93, 0x3b, 0xb0, 0xc0, 0x5c, 0xce, 0x64, 0x6c, - 0x74, 0x25, 0x36, 0xba, 0xb0, 0xad, 0x84, 0x34, 0xc2, 0xc8, 0xfb, 0x50, 0xe1, 0x52, 0x8e, 0x50, - 0x50, 0xec, 0xeb, 0xdd, 0x57, 0xb7, 0xee, 0x5b, 0xd1, 0xcd, 0xe8, 0xbb, 0x57, 0xb7, 0x67, 0x1d, - 0x6f, 0x5a, 0xfb, 0x27, 0x01, 0x3a, 0xbb, 0xbe, 0xcd, 0xdc, 0xbd, 0x83, 0x1f, 0xa3, 0x1d, 0x52, - 0xec, 0xa3, 0x40, 0xcf, 0xc6, 0xd6, 0x8a, 0x3a, 0xa8, 0x4e, 0x62, 0x83, 0x66, 0xe6, 0xc8, 0x16, - 0x80, 0x44, 0x5b, 0x60, 0x98, 0x3b, 0x27, 0x12, 0x7b, 0x01, 0xbd, 0x14, 0xa1, 0x39, 0x16, 0xf9, - 0x2e, 0x2c, 0xc9, 0x91, 0x5e, 0xa1, 0x5e, 0xd2, 0xde, 0x7c, 0xd9, 0xfa, 0xcc, 0xc8, 0xb4, 0xde, - 0x7b, 0xf8, 0xd5, 0x6f, 0xf4, 0x22, 0x8d, 0x56, 0x75, 0x32, 0x6e, 0x2e, 0xc5, 0x1f, 0x34, 0xb1, - 0x43, 0xde, 0x83, 0xb2, 0x33, 0x12, 0x2c, 0xe4, 0xbe, 0x57, 0x5f, 0xd0, 0x36, 0xad, 0xdc, 0x0e, - 0xd3, 0xd8, 0xb3, 0x82, 0xa3, 0x81, 0x12, 0x48, 0x4b, 0xc5, 0x9e, 0x32, 0xbd, 0x13, 0x6b, 0xb5, - 0x96, 0xd5, 0x5d, 0x24, 0x5f, 0x34, 0xb5, 0x46, 0x18, 0x54, 0x05, 0x7a, 0xf8, 0x41, 0x0b, 0xfb, - 0xbe, 0xc0, 0xfa, 0xe2, 0xbf, 0x65, 0xbc, 0xa6, 0xa2, 0x86, 0x66, 0x66, 0x68, 0xde, 0x26, 0x59, - 0x87, 0xb2, 0xe3, 0x49, 0x1d, 0x87, 0xf5, 0xa5, 0xb5, 0xe2, 0x7a, 0x25, 0x76, 0xe6, 0x69, 0x4f, - 0xcb, 0x68, 0x8a, 0x92, 0x4d, 0xa8, 0xf2, 0x60, 0xdb, 0x71, 0x04, 0x4a, 0x89, 0xb2, 0x5e, 0xd6, - 0x64, 0x6d, 0xbc, 0xd3, 0x4d, 0xc5, 0x34, 0xcf, 0x21, 0x5f, 0x80, 0xd2, 0x48, 0x70, 0x59, 0xaf, - 0x68, 0x6e, 0x79, 0x32, 0x6e, 0x96, 0x9e, 0xd1, 0x8e, 0xa4, 0x5a, 0x4a, 0xde, 0x80, 0xab, 0x38, - 0x64, 0xdc, 0xcd, 0x6c, 0x82, 0xe6, 0x91, 0xc9, 0xb8, 0x79, 0xf5, 0xd1, 0x14, 0x42, 0x67, 0x98, - 0xc4, 0x01, 0x08, 0xd2, 0x78, 0xad, 0x57, 0xf5, 0xc1, 0x3c, 0xb8, 0xe0, 0x26, 0xe7, 0x66, 0x47, - 0xeb, 0xaa, 0x0a, 0x96, 0xec, 0x9b, 0xe6, 0xec, 0x9a, 0x7f, 0x34, 0xa0, 0x9a, 0x2f, 0x04, 0xb7, - 0xa1, 0x38, 0xe2, 0x4e, 0x1c, 0xef, 0xd5, 0x38, 0xd2, 0x8a, 0xcf, 0x3a, 0x3b, 0x54, 0xc9, 0xc9, - 0x1a, 0x94, 0x54, 0x16, 0xc7, 0x49, 0xbe, 0x1c, 0xe3, 0x25, 0x1d, 0x83, 0x1a, 0x21, 0xdf, 0x82, - 0x5a, 0x9c, 0xb2, 0x4f, 0x98, 0xc7, 0x06, 0x28, 0x64, 0xbd, 0xa8, 0xf7, 0x7c, 0x7d, 0x32, 0x6e, - 0xd6, 0xda, 0xd3, 0x10, 0x9d, 0xe5, 0x92, 0x5d, 0x28, 0xd9, 0x2c, 0xe0, 0x71, 0xe4, 0x5a, 0x17, - 0xed, 0x77, 0xba, 0x8c, 0x45, 0xe7, 0xaf, 0x84, 0x54, 0x5b, 0x31, 0x7f, 0x5e, 0x84, 0x74, 0x49, - 0x0c, 0x99, 0xc3, 0x42, 0xf6, 0x9f, 0xef, 0xf0, 0x21, 0x54, 0x1d, 0x2e, 0x03, 0x97, 0x9d, 0xcc, - 0x2b, 0x5e, 0x3b, 0x19, 0x44, 0xf3, 0x3c, 0xf2, 0xed, 0x5c, 0x89, 0x2d, 0x69, 0x9d, 0x3b, 0x73, - 0x4a, 0x6c, 0xed, 0x2d, 0x5f, 0x86, 0xdc, 0x1b, 0xcc, 0xa9, 0xb2, 0xf7, 0x60, 0xc9, 0xff, 0xc0, - 0x43, 0xd1, 0xd9, 0xd1, 0x39, 0x58, 0x69, 0xd5, 0x62, 0xfd, 0xa5, 0xbd, 0x48, 0x4c, 0x13, 0x5c, - 0x15, 0x64, 0xfd, 0x53, 0x95, 0x1c, 0x9d, 0x53, 0xb9, 0x82, 0xbc, 0x97, 0x00, 0x34, 0xe3, 0xa8, - 0x3d, 0xb1, 0x80, 0x3f, 0xf2, 0x9c, 0xc0, 0xe7, 0x5e, 0x58, 0x5f, 0x9a, 0xde, 0xd3, 0x76, 0xb7, - 0x93, 0x40, 0x34, 0xcf, 0x23, 0xaf, 0x41, 0xd9, 0x66, 0xad, 0x91, 0xe7, 0xb8, 0x58, 0x2f, 0x6b, - 0x9d, 0x6b, 0xc9, 0x9e, 0xda, 0xdb, 0x91, 0x9c, 0xa6, 0x0c, 0xf3, 0x9f, 0x45, 0xa8, 0xb4, 0x7d, - 0xcf, 0xe1, 0x3a, 0xf3, 0x37, 0xa1, 0x14, 0x2a, 0xf7, 0xa2, 0xb3, 0xb8, 0x9d, 0x1c, 0xb4, 0x72, - 0xe7, 0x74, 0xdc, 0x5c, 0x49, 0x89, 0xda, 0x55, 0x4d, 0x25, 0x3f, 0x84, 0x45, 0x19, 0xb2, 0x70, - 0x24, 0xe3, 0x03, 0x78, 0x33, 0x56, 0x5a, 0xec, 0x69, 0xe9, 0xe9, 0xb8, 0x79, 0xa9, 0x8e, 0x68, - 0xa5, 0xb6, 0x23, 0x3d, 0x1a, 0x5b, 0x25, 0x6f, 0x03, 0xf1, 0x0f, 0x24, 0x8a, 0x63, 0x74, 0x1e, - 0x47, 0x4d, 0x53, 0x15, 0x3c, 0x75, 0xc1, 0xc5, 0xd6, 0xad, 0x78, 0x2d, 0xb2, 0x77, 0x86, 0x41, - 0xe7, 0x68, 0x91, 0x6d, 0x28, 0x4b, 0x3c, 0x46, 0xc1, 0xc3, 0x93, 0xf8, 0x06, 0xbe, 0x94, 0x1c, - 0x4d, 0x2f, 0x96, 0x9f, 0x8e, 0x9b, 0xab, 0x99, 0x2b, 0xb1, 0x90, 0xa6, 0x6a, 0xe4, 0x18, 0x88, - 0xcb, 0x64, 0xb8, 0x2f, 0x98, 0x27, 0xa3, 0xa3, 0xe0, 0x43, 0xd4, 0x77, 0xa3, 0x6b, 0xfa, 0x65, - 0x4a, 0xa4, 0xd2, 0xc8, 0x5c, 0xdf, 0x3d, 0x63, 0x8d, 0xce, 0x59, 0x81, 0xdc, 0x85, 0x45, 0x81, - 0x4c, 0xfa, 0x5e, 0x7c, 0xa7, 0x57, 0x93, 0x63, 0xa6, 0x5a, 0x4a, 0x63, 0x54, 0x05, 0xe4, 0x10, - 0xa5, 0x64, 0x03, 0xac, 0x57, 0xa6, 0x03, 0xf2, 0x49, 0x24, 0xa6, 0x09, 0x6e, 0xfe, 0xcd, 0x80, - 0xda, 0x5b, 0xc8, 0xdc, 0xf0, 0xb0, 0x7d, 0x88, 0xf6, 0x91, 0x6e, 0xae, 0xbf, 0x30, 0xe0, 0xa6, - 0x40, 0xe6, 0xf8, 0x9e, 0x7b, 0x32, 0x83, 0xe9, 0xec, 0xac, 0x6e, 0x7d, 0xed, 0x82, 0xf4, 0xa7, - 0xf3, 0xb5, 0x5b, 0xcd, 0xd8, 0x8f, 0x9b, 0xe7, 0x10, 0xe8, 0x79, 0xeb, 0x92, 0xc7, 0xb0, 0xea, - 0x70, 0xc9, 0x0e, 0x5c, 0x7c, 0x57, 0xf0, 0x10, 0x35, 0xa0, 0x4b, 0x41, 0xb9, 0xf5, 0xff, 0xb1, - 0xd1, 0xd5, 0x9d, 0x59, 0x02, 0x3d, 0xab, 0x63, 0xfe, 0xc3, 0x80, 0x4a, 0x67, 0xc8, 0x06, 0xa8, - 0xab, 0xea, 0x1d, 0x58, 0xe0, 0xea, 0x63, 0x76, 0x8e, 0xd0, 0x0c, 0x1a, 0x61, 0x64, 0x1f, 0xca, - 0x2e, 0xf7, 0x90, 0x0d, 0x50, 0xd6, 0xaf, 0xac, 0x15, 0xd7, 0xab, 0x5b, 0x77, 0x2f, 0xd8, 0xff, - 0x6e, 0x44, 0xcf, 0x92, 0x2e, 0x16, 0x48, 0x9a, 0x5a, 0x22, 0x43, 0xa8, 0x05, 0x23, 0xd7, 0x6d, - 0x0b, 0x74, 0xd0, 0x0b, 0x39, 0x73, 0xa5, 0x0e, 0xe8, 0x8b, 0x6b, 0x6b, 0x77, 0x5a, 0x2b, 0xaa, - 0xdf, 0x33, 0x42, 0x3a, 0x6b, 0xdb, 0xfc, 0x99, 0x01, 0x4b, 0xb1, 0x17, 0xe4, 0x29, 0x2c, 0xd8, - 0x87, 0x8c, 0x7b, 0x75, 0x43, 0xef, 0xe6, 0xde, 0x05, 0x0b, 0x46, 0x53, 0x91, 0xae, 0xe3, 0xe9, - 0x01, 0xb5, 0x95, 0x3e, 0x8d, 0xcc, 0x10, 0x0b, 0xc0, 0xf6, 0xbd, 0x90, 0xa9, 0x58, 0x8f, 0x8e, - 0xa8, 0x12, 0xf5, 0xb6, 0x76, 0x2a, 0xa5, 0x39, 0x86, 0xf9, 0x2b, 0x03, 0xca, 0xb1, 0xd1, 0x1d, - 0x75, 0x05, 0x03, 0xe1, 0x8f, 0x82, 0xd9, 0x2b, 0x78, 0xac, 0x84, 0x34, 0xc2, 0x54, 0xf1, 0x3f, - 0xe2, 0x9e, 0x33, 0x5b, 0xfc, 0xdf, 0xe1, 0x9e, 0x43, 0x35, 0x32, 0x3d, 0xea, 0x16, 0x2f, 0x31, - 0xea, 0x26, 0xfd, 0xa4, 0x74, 0x5e, 0x3f, 0x31, 0x7f, 0x6d, 0x00, 0x64, 0x7b, 0x27, 0xef, 0x42, - 0x59, 0xa0, 0xf4, 0x47, 0xc2, 0xc6, 0x38, 0x0d, 0xee, 0x5d, 0x98, 0x06, 0x11, 0xbd, 0xb3, 0x93, - 0x45, 0x42, 0x22, 0xa3, 0xa9, 0x31, 0xf2, 0x04, 0x8a, 0x22, 0x9d, 0x50, 0xad, 0x4b, 0x5d, 0x46, - 0x36, 0xa2, 0xa6, 0x8d, 0x52, 0x0d, 0xa8, 0xca, 0x8e, 0xe9, 0x40, 0x6d, 0x86, 0x34, 0x7d, 0x38, - 0xc6, 0xe7, 0x38, 0x9c, 0x73, 0x9b, 0xad, 0xf9, 0x57, 0x03, 0x66, 0x83, 0xee, 0xf3, 0x2f, 0xf3, - 0x36, 0x10, 0x55, 0x9f, 0xb9, 0x8d, 0xdb, 0xb6, 0xed, 0x8f, 0xbc, 0x68, 0x9a, 0x8e, 0x16, 0x4d, - 0x8b, 0x63, 0xef, 0x0c, 0x83, 0xce, 0xd1, 0x22, 0x3f, 0x48, 0x26, 0x72, 0x8a, 0xfd, 0x68, 0xb4, - 0xa9, 0x6e, 0xad, 0xcf, 0x1b, 0xf7, 0xe7, 0x4e, 0xfa, 0x33, 0xb3, 0xbb, 0xb2, 0x41, 0x73, 0xf6, - 0xcc, 0x97, 0x06, 0x9c, 0x57, 0xb4, 0xc8, 0xd7, 0x61, 0x25, 0x40, 0xc1, 0x7d, 0xa7, 0x87, 0xb6, - 0xef, 0x39, 0xd1, 0xa3, 0x64, 0xa1, 0xb5, 0x3a, 0x19, 0x37, 0x57, 0xba, 0x79, 0x80, 0x4e, 0xf3, - 0xd4, 0x14, 0x1a, 0xf2, 0x21, 0xfa, 0xa3, 0x30, 0xd1, 0xbc, 0xa2, 0x35, 0xf5, 0x14, 0xba, 0x3f, - 0x85, 0xd0, 0x19, 0x26, 0xf9, 0x0e, 0x5c, 0xeb, 0x33, 0xee, 0x8e, 0x04, 0xee, 0x1f, 0x0a, 0x94, - 0x87, 0xbe, 0xeb, 0xe8, 0xb0, 0x5f, 0x68, 0xdd, 0x98, 0x8c, 0x9b, 0xd7, 0xde, 0x9c, 0xc1, 0xe8, - 0x19, 0xb6, 0xf9, 0x07, 0x03, 0x20, 0x8b, 0xd0, 0xcb, 0xe5, 0xe1, 0x3d, 0x58, 0x3a, 0x46, 0x21, - 0x55, 0xf7, 0xbd, 0x32, 0xdd, 0x59, 0xbe, 0x17, 0x89, 0x69, 0x82, 0xa7, 0x21, 0x54, 0x3c, 0x77, - 0x5e, 0x4b, 0x92, 0xba, 0x74, 0x6e, 0x52, 0x3f, 0x80, 0x05, 0x69, 0xfb, 0x01, 0xc6, 0x63, 0x45, - 0x23, 0xf1, 0xa9, 0xa7, 0x84, 0x6a, 0x18, 0x49, 0xfc, 0xd7, 0x02, 0x1a, 0x91, 0xcd, 0xdf, 0x1b, - 0x50, 0xd9, 0xdf, 0xed, 0xb5, 0x7d, 0xaf, 0xcf, 0x07, 0xd3, 0xaf, 0x40, 0xe3, 0xbf, 0xfb, 0x0a, - 0x3c, 0x84, 0x65, 0x3b, 0x9b, 0xec, 0x93, 0xee, 0x60, 0x5d, 0xfe, 0x31, 0xa0, 0xbb, 0xe2, 0x8d, - 0x78, 0x5b, 0xcb, 0x39, 0x40, 0xd2, 0x29, 0xcb, 0xe6, 0x17, 0xa1, 0xa2, 0x02, 0x62, 0xaf, 0xbf, - 0xc3, 0x4e, 0xde, 0xb8, 0xf1, 0xcb, 0x4f, 0x9a, 0x85, 0x9f, 0x3e, 0x6f, 0x16, 0x3e, 0x7e, 0xde, - 0x2c, 0x7c, 0xf2, 0xbc, 0x59, 0xf8, 0xe8, 0x4f, 0x6b, 0x05, 0xf3, 0xb7, 0x06, 0xdc, 0xd0, 0x9b, - 0x98, 0xcd, 0xfe, 0xd7, 0xa0, 0xcc, 0x02, 0xfe, 0x38, 0x77, 0xb9, 0x69, 0x35, 0xda, 0xee, 0x76, - 0xa2, 0xfb, 0x4d, 0x19, 0xff, 0x9b, 0x52, 0xfb, 0xbb, 0x22, 0x54, 0x73, 0xaf, 0x5d, 0x95, 0x52, - 0xbe, 0x18, 0x30, 0x8f, 0x7f, 0xa8, 0x87, 0x36, 0xa9, 0x3b, 0x55, 0x25, 0x4a, 0xa9, 0xbd, 0x3c, - 0x40, 0xa7, 0x79, 0xe4, 0x2b, 0x50, 0xd1, 0x25, 0x41, 0x70, 0x4c, 0x3a, 0x91, 0xbe, 0xbe, 0x76, - 0x22, 0xa4, 0x19, 0x4e, 0x3a, 0x70, 0x3d, 0xaf, 0xcd, 0xdc, 0x67, 0x1e, 0x0f, 0x93, 0x67, 0xd1, - 0xcd, 0xc9, 0xb8, 0x79, 0x7d, 0xef, 0x2c, 0x4c, 0xe7, 0xe9, 0xa8, 0x16, 0xe8, 0xaa, 0xd8, 0xe1, - 0xa1, 0x5a, 0xb8, 0x94, 0xb5, 0xc0, 0xdd, 0x54, 0x4a, 0x73, 0x0c, 0xe5, 0xa7, 0x7e, 0x3f, 0x78, - 0x36, 0xaa, 0xa1, 0x39, 0xf5, 0xb3, 0x9b, 0x08, 0x69, 0x86, 0xab, 0xa7, 0x9b, 0x0c, 0x05, 0x62, - 0x98, 0x3d, 0x57, 0x17, 0xb3, 0xa7, 0x5b, 0x6f, 0x1a, 0xa2, 0xb3, 0x5c, 0xf5, 0x7a, 0x0e, 0x7c, - 0x19, 0x32, 0xb7, 0xed, 0x3b, 0xe9, 0x53, 0x5b, 0xbf, 0x9e, 0xbb, 0x99, 0x98, 0xe6, 0x39, 0xe4, - 0x75, 0x58, 0x96, 0x28, 0x38, 0x73, 0x9f, 0x8e, 0x86, 0x07, 0x28, 0xe2, 0x79, 0x33, 0x0d, 0xd4, - 0x5e, 0x0e, 0xa3, 0x53, 0xcc, 0x56, 0xfb, 0xc5, 0xab, 0x46, 0xe1, 0xe5, 0xab, 0x46, 0xe1, 0xd3, - 0x57, 0x8d, 0xc2, 0x47, 0x93, 0x86, 0xf1, 0x62, 0xd2, 0x30, 0x5e, 0x4e, 0x1a, 0xc6, 0xa7, 0x93, - 0x86, 0xf1, 0xe7, 0x49, 0xc3, 0xf8, 0xf8, 0x2f, 0x8d, 0xc2, 0xfb, 0xb7, 0x3f, 0xf3, 0x1f, 0xbc, - 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x96, 0x9b, 0xc8, 0x3b, 0xe1, 0x13, 0x00, 0x00, + // 1921 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x8f, 0x1b, 0x49, + 0x15, 0x77, 0xc7, 0x9e, 0x8c, 0xfd, 0x3c, 0x89, 0x93, 0x4a, 0x50, 0x4c, 0x44, 0xdc, 0x43, 0x47, + 0x44, 0x13, 0xd8, 0xf4, 0x30, 0xa3, 0x04, 0x96, 0x15, 0x08, 0xc6, 0x76, 0x36, 0xf1, 0xee, 0x24, + 0x63, 0xca, 0x13, 0x76, 0xb5, 0x20, 0x50, 0x4d, 0x77, 0xd9, 0x53, 0x4c, 0xbb, 0xbb, 0x55, 0xd5, + 0x3d, 0xcb, 0xec, 0x69, 0x8f, 0x70, 0x5b, 0x6e, 0x1c, 0x37, 0x12, 0x7f, 0x02, 0x12, 0xe2, 0x2f, + 0x20, 0xc7, 0x70, 0x41, 0x2b, 0x81, 0x2c, 0x62, 0xae, 0x88, 0x0b, 0x02, 0xa1, 0x39, 0xa1, 0xaa, + 0xae, 0xfe, 0xb0, 0xc7, 0xb3, 0x33, 0x0b, 0x48, 0x7b, 0x73, 0xbf, 0xdf, 0xef, 0xbd, 0xfa, 0x78, + 0xaf, 0xde, 0x87, 0xe1, 0xde, 0xc1, 0x38, 0x70, 0x63, 0x8f, 0x0a, 0xfb, 0x67, 0x47, 0x1f, 0xac, + 0x3b, 0x1e, 0xa3, 0x7e, 0x74, 0x6f, 0x14, 0xac, 0x93, 0x90, 0xad, 0x1f, 0x6e, 0xac, 0x8f, 0xa8, + 0x4f, 0x39, 0x89, 0xa8, 0x6b, 0x87, 0x3c, 0x88, 0x02, 0x74, 0xab, 0x48, 0xb7, 0x13, 0xfa, 0x4f, + 0x46, 0x81, 0x4d, 0x42, 0x66, 0x1f, 0x6e, 0xdc, 0xbc, 0x37, 0x62, 0xd1, 0x7e, 0xbc, 0x67, 0x3b, + 0xc1, 0x78, 0x7d, 0x14, 0x8c, 0x82, 0x75, 0xa5, 0xb5, 0x17, 0x0f, 0xd5, 0x97, 0xfa, 0x50, 0xbf, + 0x12, 0x6b, 0x37, 0xad, 0x83, 0xd7, 0x85, 0xcd, 0x92, 0xc5, 0x9c, 0x80, 0xd3, 0x05, 0x2b, 0xde, + 0xbc, 0x9f, 0x73, 0xc6, 0xc4, 0xd9, 0x67, 0x3e, 0xe5, 0x47, 0xeb, 0xe1, 0xc1, 0x48, 0x0a, 0xc4, + 0xfa, 0x98, 0x46, 0x64, 0x81, 0x96, 0xf5, 0x5b, 0x03, 0x1a, 0x9d, 0xad, 0x7e, 0xaf, 0xe3, 0xc5, + 0x22, 0xa2, 0xbc, 0xe7, 0x0f, 0x03, 0xf4, 0x6d, 0xa8, 0x86, 0x3c, 0x38, 0x64, 0x2e, 0xe5, 0x4d, + 0x63, 0xd5, 0x58, 0xab, 0xb5, 0x57, 0x5f, 0x4c, 0xcc, 0xd2, 0x74, 0x62, 0x56, 0xfb, 0x5a, 0x7e, + 0x3c, 0x31, 0x57, 0xa4, 0x5a, 0xfa, 0x8d, 0x33, 0x0d, 0xb4, 0x0e, 0x35, 0x9f, 0x8c, 0xa9, 0x08, + 0x89, 0x43, 0x9b, 0x17, 0x94, 0xfa, 0x55, 0xad, 0x5e, 0x7b, 0x9a, 0x02, 0x38, 0xe7, 0xa0, 0x07, + 0x50, 0x77, 0x92, 0xd5, 0x25, 0xdc, 0x2c, 0x2b, 0x95, 0x6b, 0x5a, 0xa5, 0xde, 0xc9, 0x21, 0x5c, + 0xe4, 0x59, 0x3f, 0x84, 0x2f, 0x74, 0x28, 0x8f, 0xd8, 0x90, 0x39, 0x24, 0xa2, 0x7d, 0xce, 0x0e, + 0x49, 0x44, 0xdf, 0xa6, 0x47, 0xa8, 0x0d, 0x55, 0xea, 0x3b, 0x81, 0xcb, 0xfc, 0x91, 0xde, 0xfe, + 0x9d, 0x74, 0xfb, 0x0f, 0xb5, 0xfc, 0x78, 0x62, 0xa2, 0x5c, 0x23, 0x95, 0xe2, 0x4c, 0xcf, 0xfa, + 0xc7, 0x12, 0x34, 0x0a, 0xd6, 0x07, 0x21, 0x75, 0xd0, 0x6d, 0x58, 0x22, 0x1e, 0x23, 0x42, 0x1b, + 0xbd, 0xa4, 0x8d, 0x2e, 0x6d, 0x49, 0x21, 0x4e, 0x30, 0xf4, 0x1e, 0xd4, 0x98, 0x10, 0x31, 0xe5, + 0x98, 0x0e, 0xd5, 0xe9, 0xeb, 0x9b, 0xf7, 0xec, 0xc4, 0x33, 0xca, 0xf7, 0xd2, 0x7b, 0xf6, 0xe1, + 0x86, 0xbd, 0x7b, 0x14, 0x52, 0x77, 0x3b, 0x70, 0x88, 0xb7, 0xb3, 0xf7, 0x53, 0xea, 0x44, 0x98, + 0x0e, 0x29, 0xa7, 0xbe, 0x43, 0xdb, 0x97, 0xe4, 0x45, 0xf5, 0x52, 0x1b, 0x38, 0x37, 0x87, 0x36, + 0x01, 0x04, 0x75, 0x38, 0x8d, 0x0a, 0xf7, 0x84, 0xf4, 0x2e, 0x60, 0x90, 0x21, 0xb8, 0xc0, 0x42, + 0xdf, 0x87, 0x65, 0x11, 0xab, 0x15, 0x9a, 0x15, 0xb5, 0x9b, 0xaf, 0xda, 0x9f, 0x1a, 0x99, 0xf6, + 0xbb, 0x0f, 0xbe, 0xfe, 0xad, 0x41, 0xa2, 0xd1, 0xae, 0x4f, 0x27, 0xe6, 0xb2, 0xfe, 0xc0, 0xa9, + 0x1d, 0xf4, 0x2e, 0x54, 0xdd, 0x98, 0x93, 0x88, 0x05, 0x7e, 0x73, 0x49, 0xd9, 0xb4, 0x0b, 0x27, + 0xcc, 0x62, 0xcf, 0x0e, 0x0f, 0x46, 0x52, 0x20, 0x6c, 0x19, 0x7b, 0xd2, 0x74, 0x57, 0x6b, 0xb5, + 0x57, 0xa4, 0x2f, 0xd2, 0x2f, 0x9c, 0x59, 0x43, 0x04, 0xea, 0x9c, 0xfa, 0xf4, 0xfd, 0x36, 0x1d, + 0x06, 0x9c, 0x36, 0x2f, 0xfe, 0x57, 0xc6, 0x1b, 0x32, 0x6a, 0x70, 0x6e, 0x06, 0x17, 0x6d, 0xa2, + 0x35, 0xa8, 0xba, 0xbe, 0x50, 0x71, 0xd8, 0x5c, 0x5e, 0x2d, 0xaf, 0xd5, 0xf4, 0x66, 0x9e, 0x0e, + 0x94, 0x0c, 0x67, 0x28, 0xda, 0x80, 0x3a, 0x0b, 0xb7, 0x5c, 0x97, 0x53, 0x21, 0xa8, 0x68, 0x56, + 0x15, 0x59, 0x19, 0xef, 0xf5, 0x33, 0x31, 0x2e, 0x72, 0xd0, 0x97, 0xa0, 0x12, 0x73, 0x26, 0x9a, + 0x35, 0xc5, 0xad, 0x4e, 0x27, 0x66, 0xe5, 0x19, 0xee, 0x09, 0xac, 0xa4, 0xe8, 0x0d, 0xb8, 0x4c, + 0xc7, 0x84, 0x79, 0xb9, 0x4d, 0x50, 0x3c, 0x34, 0x9d, 0x98, 0x97, 0x1f, 0xce, 0x20, 0x78, 0x8e, + 0x89, 0x5c, 0x80, 0x30, 0x8b, 0xd7, 0x66, 0x5d, 0x5d, 0xcc, 0xfd, 0x33, 0x3c, 0xb9, 0xf0, 0x75, + 0xb4, 0x2f, 0xcb, 0x60, 0xc9, 0xbf, 0x71, 0xc1, 0xae, 0xf5, 0x27, 0x03, 0xea, 0xc5, 0x44, 0x70, + 0x0b, 0xca, 0x31, 0x73, 0x75, 0xbc, 0xd7, 0x75, 0xa4, 0x95, 0x9f, 0xf5, 0xba, 0x58, 0xca, 0xd1, + 0x2a, 0x54, 0xe4, 0x2b, 0xd6, 0x8f, 0x7c, 0x45, 0xe3, 0x15, 0x15, 0x83, 0x0a, 0x41, 0xdf, 0x81, + 0x86, 0x7e, 0xb2, 0x4f, 0x88, 0x4f, 0x46, 0x94, 0x8b, 0x66, 0x59, 0x9d, 0xf9, 0xda, 0x74, 0x62, + 0x36, 0x3a, 0xb3, 0x10, 0x9e, 0xe7, 0xa2, 0x6d, 0xa8, 0x38, 0x24, 0x64, 0x3a, 0x72, 0xed, 0xb3, + 0xce, 0x3b, 0x9b, 0xc6, 0x92, 0xfb, 0x97, 0x42, 0xac, 0xac, 0x58, 0xff, 0x2a, 0x43, 0xb6, 0x24, + 0x8d, 0x88, 0x4b, 0x22, 0xf2, 0xbf, 0x9f, 0xf0, 0x01, 0xd4, 0x5d, 0x26, 0x42, 0x8f, 0x1c, 0x2d, + 0x4a, 0x5e, 0xdd, 0x1c, 0xc2, 0x45, 0x1e, 0xfa, 0x6e, 0x21, 0xc5, 0x56, 0x94, 0xce, 0xed, 0x05, + 0x29, 0xb6, 0xf1, 0x38, 0x10, 0x11, 0xf3, 0x47, 0x0b, 0xb2, 0xec, 0x5d, 0x58, 0x0e, 0xde, 0xf7, + 0x29, 0xef, 0x75, 0xd5, 0x1b, 0xac, 0xb5, 0x1b, 0x5a, 0x7f, 0x79, 0x27, 0x11, 0xe3, 0x14, 0x97, + 0x09, 0x59, 0xfd, 0x94, 0x29, 0x47, 0xbd, 0xa9, 0x42, 0x42, 0xde, 0x49, 0x01, 0x9c, 0x73, 0xe4, + 0x99, 0x48, 0xc8, 0x1e, 0xfa, 0x6e, 0x18, 0x30, 0x3f, 0x6a, 0x2e, 0xcf, 0x9e, 0x69, 0xab, 0xdf, + 0x4b, 0x21, 0x5c, 0xe4, 0xa1, 0xd7, 0xa0, 0xea, 0x90, 0x76, 0xec, 0xbb, 0x1e, 0x6d, 0x56, 0x95, + 0xce, 0x95, 0xf4, 0x4c, 0x9d, 0xad, 0x44, 0x8e, 0x33, 0x86, 0xdc, 0xd5, 0x38, 0xf1, 0x73, 0xaf, + 0xdb, 0xac, 0xcd, 0xee, 0xea, 0x49, 0x0a, 0xe0, 0x9c, 0x83, 0x5e, 0x87, 0x95, 0xfd, 0x78, 0x2f, + 0x75, 0x70, 0xb7, 0x09, 0x4a, 0xe7, 0xba, 0xd6, 0x59, 0x79, 0x5c, 0xc0, 0xf0, 0x0c, 0xd3, 0xfa, + 0x77, 0x19, 0x6a, 0x9d, 0xc0, 0x77, 0x99, 0x4a, 0x32, 0x1b, 0x50, 0x89, 0xe4, 0x4d, 0x24, 0xd7, + 0x7e, 0x2b, 0xf5, 0xa9, 0x3c, 0xf9, 0xf1, 0xc4, 0xbc, 0x94, 0x11, 0xd5, 0xad, 0x28, 0x2a, 0xfa, + 0x31, 0x5c, 0x14, 0x11, 0x89, 0x62, 0xa1, 0xef, 0xfa, 0x4d, 0xad, 0x74, 0x71, 0xa0, 0xa4, 0xc7, + 0x13, 0xf3, 0x5c, 0xc5, 0xd7, 0xce, 0x6c, 0x27, 0x7a, 0x58, 0x5b, 0x45, 0x6f, 0x01, 0x0a, 0xf6, + 0x04, 0xe5, 0x87, 0xd4, 0x7d, 0x94, 0xd4, 0x67, 0x99, 0x5b, 0x65, 0x2c, 0x95, 0xdb, 0x37, 0xf5, + 0x5a, 0x68, 0xe7, 0x04, 0x03, 0x2f, 0xd0, 0x42, 0x5b, 0x50, 0x15, 0xf4, 0x90, 0x72, 0x16, 0x1d, + 0x69, 0x67, 0x7f, 0x25, 0xf5, 0xc2, 0x40, 0xcb, 0x8f, 0x27, 0xe6, 0xd5, 0x7c, 0x2b, 0x5a, 0x88, + 0x33, 0x35, 0x74, 0x08, 0xc8, 0x23, 0x22, 0xda, 0xe5, 0xc4, 0x17, 0xc9, 0x55, 0xb0, 0x31, 0x55, + 0x61, 0xa0, 0xca, 0xc7, 0x79, 0xb2, 0xb1, 0xd4, 0xc8, 0xb7, 0xbe, 0x7d, 0xc2, 0x1a, 0x5e, 0xb0, + 0x02, 0xba, 0x03, 0x17, 0x39, 0x25, 0x22, 0xf0, 0x75, 0xf8, 0x5c, 0x4e, 0xaf, 0x19, 0x2b, 0x29, + 0xd6, 0xa8, 0x8c, 0xfd, 0x31, 0x15, 0x82, 0x8c, 0xa8, 0x0e, 0x9c, 0x2c, 0xf6, 0x9f, 0x24, 0x62, + 0x9c, 0xe2, 0xd6, 0xdf, 0x0d, 0x68, 0x3c, 0xa6, 0xc4, 0x8b, 0xf6, 0x3b, 0xfb, 0xd4, 0x39, 0x50, + 0x75, 0xfc, 0x97, 0x06, 0xdc, 0xe0, 0x94, 0xb8, 0x81, 0xef, 0x1d, 0xcd, 0x61, 0x2a, 0x11, 0xd4, + 0x37, 0xbf, 0x71, 0x46, 0xa6, 0xc1, 0x8b, 0xb5, 0xdb, 0xa6, 0xde, 0xc7, 0x8d, 0x53, 0x08, 0xf8, + 0xb4, 0x75, 0xd1, 0x23, 0xb8, 0xea, 0x32, 0x41, 0xf6, 0x3c, 0xfa, 0x0e, 0x67, 0x11, 0x55, 0x80, + 0xca, 0x3a, 0xd5, 0xf6, 0x17, 0xb5, 0xd1, 0xab, 0xdd, 0x79, 0x02, 0x3e, 0xa9, 0x63, 0xfd, 0xd3, + 0x80, 0x5a, 0x6f, 0x4c, 0x46, 0x54, 0x25, 0xf0, 0xdb, 0xb0, 0xc4, 0xe4, 0xc7, 0x7c, 0xcb, 0xa2, + 0x18, 0x38, 0xc1, 0xd0, 0x2e, 0x54, 0x3d, 0xe6, 0x53, 0x32, 0xa2, 0xa2, 0x79, 0x61, 0xb5, 0xbc, + 0x56, 0xdf, 0xbc, 0x73, 0xc6, 0xf9, 0xb7, 0x13, 0x7a, 0xfe, 0xbe, 0xb5, 0x40, 0xe0, 0xcc, 0x12, + 0x1a, 0x43, 0x23, 0x8c, 0x3d, 0xaf, 0xc3, 0xa9, 0x4b, 0xfd, 0x88, 0x11, 0x4f, 0xa8, 0x80, 0x3e, + 0x3b, 0x8d, 0xf7, 0x67, 0xb5, 0x92, 0x52, 0x31, 0x27, 0xc4, 0xf3, 0xb6, 0xad, 0x5f, 0x18, 0xb0, + 0xac, 0x77, 0x81, 0x9e, 0xc2, 0x92, 0xb3, 0x4f, 0x98, 0xdf, 0x34, 0xd4, 0x69, 0xee, 0x9e, 0xb1, + 0x60, 0xd2, 0x80, 0xa9, 0x92, 0x91, 0x5d, 0x50, 0x47, 0xea, 0xe3, 0xc4, 0x0c, 0xb2, 0x01, 0x9c, + 0xc0, 0x8f, 0x88, 0x8c, 0xf5, 0xe4, 0x8a, 0x6a, 0x49, 0x19, 0xed, 0x64, 0x52, 0x5c, 0x60, 0x58, + 0xbf, 0x36, 0xa0, 0xaa, 0x8d, 0x76, 0xa5, 0x0b, 0x46, 0x3c, 0x88, 0xc3, 0x79, 0x17, 0x3c, 0x92, + 0x42, 0x9c, 0x60, 0xb2, 0xce, 0x1c, 0x30, 0xdf, 0x9d, 0xaf, 0x33, 0x6f, 0x33, 0xdf, 0xc5, 0x0a, + 0x99, 0xed, 0xaa, 0xcb, 0xe7, 0xe8, 0xaa, 0xd3, 0xd2, 0x55, 0x39, 0xad, 0x74, 0x59, 0xbf, 0x31, + 0x00, 0xf2, 0xb3, 0xa3, 0x77, 0xa0, 0xca, 0xa9, 0x08, 0x62, 0xee, 0x50, 0xfd, 0x0c, 0xee, 0x9e, + 0xf9, 0x0c, 0x12, 0x7a, 0xaf, 0x9b, 0x47, 0x42, 0x2a, 0xc3, 0x99, 0x31, 0xf4, 0x04, 0xca, 0x3c, + 0x6b, 0x86, 0xed, 0x73, 0x39, 0x23, 0xef, 0x86, 0xb3, 0x9a, 0x2c, 0x7b, 0x61, 0x69, 0xc7, 0x72, + 0xa1, 0x31, 0x47, 0x9a, 0xbd, 0x1c, 0xe3, 0x33, 0x5c, 0xce, 0xa9, 0x75, 0xdd, 0xfa, 0x9b, 0x01, + 0xf3, 0x41, 0xf7, 0xd9, 0x97, 0x79, 0x0b, 0x90, 0xcc, 0xcf, 0xcc, 0xa1, 0x5b, 0x8e, 0x13, 0xc4, + 0x7e, 0xd2, 0xb8, 0x27, 0x8b, 0x66, 0xc9, 0x71, 0x70, 0x82, 0x81, 0x17, 0x68, 0xa1, 0x1f, 0xa5, + 0xcd, 0x3f, 0xa6, 0xc3, 0xa4, 0x8b, 0xaa, 0x6f, 0xae, 0x2d, 0x9a, 0x2c, 0x16, 0x0e, 0x15, 0x73, + 0x63, 0x82, 0xb4, 0x81, 0x0b, 0xf6, 0xac, 0x97, 0x06, 0x9c, 0x96, 0xb4, 0xd0, 0x37, 0xe1, 0x52, + 0x48, 0x39, 0x0b, 0xdc, 0x01, 0x75, 0x02, 0xdf, 0x4d, 0xe6, 0x9f, 0xa5, 0xf6, 0xd5, 0xe9, 0xc4, + 0xbc, 0xd4, 0x2f, 0x02, 0x78, 0x96, 0x27, 0x1b, 0xde, 0x88, 0x8d, 0x69, 0x10, 0x47, 0xa9, 0xe6, + 0x05, 0xa5, 0xa9, 0x1a, 0xde, 0xdd, 0x19, 0x04, 0xcf, 0x31, 0xd1, 0xf7, 0xe0, 0xca, 0x90, 0x30, + 0x2f, 0xe6, 0x74, 0x77, 0x9f, 0x53, 0xb1, 0x1f, 0x78, 0xae, 0x0a, 0xfb, 0xa5, 0xf6, 0xf5, 0xe9, + 0xc4, 0xbc, 0xf2, 0xe6, 0x1c, 0x86, 0x4f, 0xb0, 0xad, 0x3f, 0x1a, 0x00, 0x79, 0x84, 0x9e, 0xef, + 0x1d, 0xde, 0x85, 0xe5, 0x43, 0xca, 0x85, 0xac, 0xbe, 0x17, 0x66, 0x2b, 0xcb, 0x0f, 0x12, 0x31, + 0x4e, 0xf1, 0x2c, 0x84, 0xca, 0xa7, 0xb6, 0x86, 0xe9, 0xa3, 0xae, 0x9c, 0xfa, 0xa8, 0xef, 0xc3, + 0x92, 0x70, 0x82, 0x90, 0xea, 0xb6, 0xa2, 0x95, 0xee, 0x69, 0x20, 0x85, 0xb2, 0x19, 0x49, 0xf7, + 0xaf, 0x04, 0x38, 0x21, 0x5b, 0x7f, 0x30, 0xa0, 0xb6, 0xbb, 0x3d, 0xe8, 0x04, 0xfe, 0x90, 0x8d, + 0x66, 0x07, 0x4e, 0xe3, 0xff, 0x3b, 0x70, 0xee, 0xc3, 0x8a, 0x93, 0x0f, 0x11, 0x69, 0x75, 0xb0, + 0xcf, 0x3f, 0x77, 0xa8, 0xaa, 0x98, 0xb5, 0x68, 0x05, 0x40, 0xe0, 0x19, 0xcb, 0xd6, 0x97, 0xa1, + 0x26, 0x03, 0x62, 0x67, 0xd8, 0x25, 0x47, 0x6f, 0x5c, 0xff, 0xd5, 0xc7, 0x66, 0xe9, 0xe7, 0xcf, + 0xcd, 0xd2, 0x47, 0xcf, 0xcd, 0xd2, 0xc7, 0xcf, 0xcd, 0xd2, 0x87, 0x7f, 0x5e, 0x2d, 0x59, 0xbf, + 0x33, 0xe0, 0xba, 0x3a, 0xc4, 0xfc, 0xeb, 0x7f, 0x0d, 0xaa, 0x24, 0x64, 0x8f, 0x0a, 0xce, 0xcd, + 0xb2, 0xd1, 0x56, 0xbf, 0x97, 0xf8, 0x37, 0x63, 0x7c, 0x3e, 0xa9, 0xf6, 0xf7, 0x65, 0xa8, 0x17, + 0x06, 0x6b, 0xf9, 0xa4, 0x02, 0x3e, 0x22, 0x3e, 0xfb, 0x40, 0x35, 0x6d, 0x42, 0x55, 0xaa, 0x5a, + 0xf2, 0xa4, 0x76, 0x8a, 0x00, 0x9e, 0xe5, 0xa1, 0xaf, 0x41, 0x4d, 0xa5, 0x04, 0xce, 0x68, 0x5a, + 0x89, 0x94, 0xfb, 0x3a, 0xa9, 0x10, 0xe7, 0x38, 0xea, 0xc1, 0xb5, 0xa2, 0x36, 0xf1, 0x9e, 0xf9, + 0x2c, 0x4a, 0x27, 0xb0, 0x1b, 0xd3, 0x89, 0x79, 0x6d, 0xe7, 0x24, 0x8c, 0x17, 0xe9, 0xc8, 0x12, + 0xe8, 0xc9, 0xd8, 0x61, 0x91, 0x5c, 0xb8, 0x92, 0x97, 0xc0, 0xed, 0x4c, 0x8a, 0x0b, 0x0c, 0xb9, + 0x4f, 0x35, 0xaa, 0xf8, 0x0e, 0x95, 0x4d, 0x73, 0xb6, 0xcf, 0x7e, 0x2a, 0xc4, 0x39, 0x2e, 0xa7, + 0x44, 0x11, 0x71, 0x4a, 0xa3, 0x7c, 0x32, 0xbe, 0x98, 0x4f, 0x89, 0x83, 0x59, 0x08, 0xcf, 0x73, + 0xe5, 0xa0, 0x1e, 0x06, 0x22, 0x22, 0x5e, 0x27, 0x70, 0xb3, 0xa9, 0x5e, 0x0d, 0xea, 0xfd, 0x5c, + 0x8c, 0x8b, 0x1c, 0x39, 0x4b, 0x08, 0xca, 0x19, 0xf1, 0x9e, 0xc6, 0xe3, 0x3d, 0xca, 0x75, 0xbf, + 0x99, 0x05, 0xea, 0xa0, 0x80, 0xe1, 0x19, 0x66, 0xbb, 0xf3, 0xe2, 0x55, 0xab, 0xf4, 0xf2, 0x55, + 0xab, 0xf4, 0xc9, 0xab, 0x56, 0xe9, 0xc3, 0x69, 0xcb, 0x78, 0x31, 0x6d, 0x19, 0x2f, 0xa7, 0x2d, + 0xe3, 0x93, 0x69, 0xcb, 0xf8, 0xcb, 0xb4, 0x65, 0x7c, 0xf4, 0xd7, 0x56, 0xe9, 0xbd, 0x5b, 0x9f, + 0xfa, 0x67, 0xe1, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x12, 0x7e, 0x97, 0xff, 0x4c, 0x14, 0x00, + 0x00, } func (m *CAPIClusterInfo) Marshal() (dAtA []byte, err error) { @@ -988,6 +991,16 @@ func (m *ClusterMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.HubClusterID) + copy(dAtA[i:], m.HubClusterID) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.HubClusterID))) + i-- + dAtA[i] = 0x52 + i -= len(m.ManagerID) + copy(dAtA[i:], m.ManagerID) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.ManagerID))) + i-- + dAtA[i] = 0x4a i -= len(m.CABundle) copy(dAtA[i:], m.CABundle) i = encodeVarintGenerated(dAtA, i, uint64(len(m.CABundle))) @@ -1807,6 +1820,10 @@ func (m *ClusterMetadata) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.CABundle) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.ManagerID) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.HubClusterID) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -2148,6 +2165,8 @@ func (this *ClusterMetadata) String() string { `OwnerType:` + fmt.Sprintf("%v", this.OwnerType) + `,`, `APIEndpoint:` + fmt.Sprintf("%v", this.APIEndpoint) + `,`, `CABundle:` + fmt.Sprintf("%v", this.CABundle) + `,`, + `ManagerID:` + fmt.Sprintf("%v", this.ManagerID) + `,`, + `HubClusterID:` + fmt.Sprintf("%v", this.HubClusterID) + `,`, `}`, }, "") return s @@ -3461,6 +3480,70 @@ func (m *ClusterMetadata) Unmarshal(dAtA []byte) error { } m.CABundle = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 9: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ManagerID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ManagerID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HubClusterID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HubClusterID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index 2c43d3ee..a6b1e76b 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -127,6 +127,10 @@ message ClusterMetadata { optional string apiEndpoint = 7; optional string caBundle = 8; + + optional string managerID = 9; + + optional string hubClusterID = 10; } // Condition defines an observation of a object operational state. diff --git a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go index 17d3f843..54bf95dd 100644 --- a/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/catalog/v1alpha1/openapi_generated.go @@ -21435,6 +21435,18 @@ func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCal Format: "", }, }, + "managerID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "hubClusterID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"uid"}, }, diff --git a/vendor/kubedb.dev/apimachinery/apis/elasticsearch/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/elasticsearch/v1alpha1/openapi_generated.go index fe97d786..9cfa2d03 100644 --- a/vendor/kubedb.dev/apimachinery/apis/elasticsearch/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/elasticsearch/v1alpha1/openapi_generated.go @@ -21258,6 +21258,18 @@ func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCal Format: "", }, }, + "managerID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "hubClusterID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"uid"}, }, diff --git a/vendor/kubedb.dev/apimachinery/apis/kafka/v1alpha1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kafka/v1alpha1/openapi_generated.go index 515d2b87..5151dfa6 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kafka/v1alpha1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kafka/v1alpha1/openapi_generated.go @@ -21274,6 +21274,18 @@ func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCal Format: "", }, }, + "managerID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "hubClusterID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"uid"}, }, diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go index bf945df8..68ffd777 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/constants.go @@ -130,15 +130,25 @@ const ( MemcachedPrimaryServicePortName = "primary" MemcachedDatabasePort = 11211 MemcachedContainerName = "memcached" + MemcachedExporterContainerName = "exporter" MemcachedConfigVolumeName = "memcached-config" MemcachedConfigVolumePath = "/usr/config/" MemcachedDataVolumeName = "data" - MemcachedDataVolumePath = "/usr/data" + MemcachedDataVolumePath = "/usr/data/" MemcachedAuthVolumeName = "auth" - MemcachedAuthVolumePath = "/usr/auth" + MemcachedAuthVolumePath = "/usr/auth/" + + MemcachedExporterAuthVolumeName = "exporter-auth" + MemcachedExporterAuthVolumePath = "/auth/" + + MemcachedExporterTLSVolumeName = "exporter-tls" + MemcachedExporterTLSVolumePath = "/certs/" + + MemcachedTLSVolumeName = "tls" + MemcachedTLSVolumePath = "/usr/certs/" MemcachedHealthKey = "kubedb_memcached_health_key" MemcachedHealthValue = "kubedb_memcached_health_value" @@ -1369,14 +1379,15 @@ const ( const ( // envs - EnvFerretDBUser = "FERRETDB_PG_USER" - EnvFerretDBPassword = "FERRETDB_PG_PASSWORD" - EnvFerretDBHandler = "FERRETDB_HANDLER" - EnvFerretDBPgURL = "FERRETDB_POSTGRESQL_URL" - EnvFerretDBTLSPort = "FERRETDB_LISTEN_TLS" - EnvFerretDBCAPath = "FERRETDB_LISTEN_TLS_CA_FILE" - EnvFerretDBCertPath = "FERRETDB_LISTEN_TLS_CERT_FILE" - EnvFerretDBKeyPath = "FERRETDB_LISTEN_TLS_KEY_FILE" + EnvFerretDBUser = "FERRETDB_PG_USER" + EnvFerretDBPassword = "FERRETDB_PG_PASSWORD" + EnvFerretDBHandler = "FERRETDB_HANDLER" + EnvFerretDBPgURL = "FERRETDB_POSTGRESQL_URL" + EnvFerretDBTLSPort = "FERRETDB_LISTEN_TLS" + EnvFerretDBCAPath = "FERRETDB_LISTEN_TLS_CA_FILE" + EnvFerretDBCertPath = "FERRETDB_LISTEN_TLS_CERT_FILE" + EnvFerretDBKeyPath = "FERRETDB_LISTEN_TLS_KEY_FILE" + EnvFerretDBDebugAddr = "FERRETDB_DEBUG_ADDR" FerretDBContainerName = "ferretdb" FerretDBMainImage = "ghcr.io/ferretdb/ferretdb" @@ -1387,7 +1398,7 @@ const ( FerretDBExternalClientPath = "/etc/certs/ext" FerretDBDefaultPort = 27017 - FerretDBMetricsPort = 8080 + FerretDBMetricsPort = 56790 FerretDBTLSPort = 27018 FerretDBMetricsPath = "/debug/metrics" diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_helpers.go index 31a0a4a0..24a62cf7 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_helpers.go @@ -30,6 +30,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + kmapi "kmodules.xyz/client-go/api/v1" "kmodules.xyz/client-go/apiextensions" core_util "kmodules.xyz/client-go/core/v1" meta_util "kmodules.xyz/client-go/meta" @@ -291,6 +292,23 @@ func (m *Memcached) setDefaultContainerResourceLimits(podTemplate *ofstv2.PodTem } } +// CertificateName returns the default certificate name and/or certificate secret name for a certificate alias +func (m *Memcached) CertificateName(alias MemcachedCertificateAlias) string { + return meta_util.NameWithSuffix(m.Name, fmt.Sprintf("%s-cert", string(alias))) +} + +// GetCertSecretName returns the secret name for a certificate alias if any provide, +// otherwise returns default certificate secret name for the given alias. +func (m *Memcached) GetCertSecretName(alias MemcachedCertificateAlias) string { + if m.Spec.TLS != nil { + name, ok := kmapi.GetCertificateSecretName(m.Spec.TLS.Certificates, string(alias)) + if ok { + return name + } + } + return m.CertificateName(alias) +} + func (m *MemcachedSpec) GetPersistentSecrets() []string { return nil } @@ -300,3 +318,12 @@ func (m *Memcached) ReplicasAreReady(lister pslister.PetSetLister) (bool, string expectedItems := 1 return checkReplicas(lister.PetSets(m.Namespace), labels.SelectorFromSet(m.OffshootLabels()), expectedItems) } + +func (m *Memcached) SetTLSDefaults() { + if m.Spec.TLS == nil || m.Spec.TLS.IssuerRef == nil { + return + } + m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MemcachedServerCert), m.CertificateName(MemcachedServerCert)) + m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MemcachedClientCert), m.CertificateName(MemcachedClientCert)) + m.Spec.TLS.Certificates = kmapi.SetMissingSecretNameForCertificate(m.Spec.TLS.Certificates, string(MemcachedMetricsExporterCert), m.CertificateName(MemcachedMetricsExporterCert)) +} diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_types.go index d0d76a64..8f30eeae 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/memcached_types.go @@ -124,6 +124,7 @@ type MemcachedCertificateAlias string const ( MemcachedServerCert MemcachedCertificateAlias = "server" + MemcachedClientCert MemcachedCertificateAlias = "client" MemcachedMetricsExporterCert MemcachedCertificateAlias = "metrics-exporter" ) diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go index d2c015cf..2431f11c 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/openapi_generated.go @@ -21371,6 +21371,18 @@ func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCal Format: "", }, }, + "managerID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "hubClusterID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"uid"}, }, @@ -25572,6 +25584,12 @@ func schema_apimachinery_apis_kubedb_v1_ArchiverRecovery(ref common.ReferenceCal Ref: ref("kmodules.xyz/client-go/api/v1.ObjectReference"), }, }, + "replicationStrategy": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"recoveryTimestamp"}, }, diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/postgres_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/postgres_helpers.go index 2c0520e1..ddf77bdf 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/postgres_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/postgres_helpers.go @@ -34,6 +34,7 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/utils/ptr" kmapi "kmodules.xyz/client-go/api/v1" "kmodules.xyz/client-go/apiextensions" meta_util "kmodules.xyz/client-go/meta" @@ -266,6 +267,9 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion) { p.Spec.Monitor.Prometheus.Exporter.SecurityContext.RunAsGroup = postgresVersion.Spec.SecurityContext.RunAsUser } } + if p.Spec.Init != nil && p.Spec.Init.Archiver != nil && p.Spec.Init.Archiver.ReplicationStrategy == nil { + p.Spec.Init.Archiver.ReplicationStrategy = ptr.To(ReplicationStrategyNone) + } } func getMajorPgVersion(postgresVersion *catalog.PostgresVersion) (uint64, error) { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/types.go index 7b5ae04c..3ee92588 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/types.go @@ -133,6 +133,21 @@ const ( StatsServiceAlias ServiceAlias = "stats" ) +// +kubebuilder:validation:Enum=fscopy;clone;sync;none +type PITRReplicationStrategy string + +const ( + // ReplicationStrategySync means data will be synced from primary to secondary + ReplicationStrategySync PITRReplicationStrategy = "sync" + // ReplicationStrategyFSCopy means data will be copied from filesystem + ReplicationStrategyFSCopy PITRReplicationStrategy = "fscopy" + // ReplicationStrategyClone means volumeSnapshot will be used to create pvc's + ReplicationStrategyClone PITRReplicationStrategy = "clone" + // ReplicationStrategyNone means no replication will be used + // data will be fully restored in every replicas instead of replication + ReplicationStrategyNone PITRReplicationStrategy = "none" +) + // +kubebuilder:validation:Enum=DNS;IP;IPv4;IPv6 type AddressType string @@ -220,5 +235,6 @@ type ArchiverRecovery struct { ManifestRepository *kmapi.ObjectReference `json:"manifestRepository,omitempty"` // FullDBRepository means db restore + manifest restore - FullDBRepository *kmapi.ObjectReference `json:"fullDBRepository,omitempty"` + FullDBRepository *kmapi.ObjectReference `json:"fullDBRepository,omitempty"` + ReplicationStrategy *PITRReplicationStrategy `json:"replicationStrategy,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/zz_generated.deepcopy.go index b86ca02c..aae7c403 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/zz_generated.deepcopy.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1/zz_generated.deepcopy.go @@ -141,6 +141,11 @@ func (in *ArchiverRecovery) DeepCopyInto(out *ArchiverRecovery) { *out = new(apiv1.ObjectReference) **out = **in } + if in.ReplicationStrategy != nil { + in, out := &in.ReplicationStrategy, &out.ReplicationStrategy + *out = new(PITRReplicationStrategy) + **out = **in + } return } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/druid_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/druid_types.go index 524ea9b8..d572d115 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/druid_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/druid_types.go @@ -68,7 +68,7 @@ type DruidSpec struct { // Database authentication secret // +optional - AuthSecret *core.LocalObjectReference `json:"authSecret,omitempty"` + AuthSecret *SecretReference `json:"authSecret,omitempty"` // Init is used to initialize database // +optional diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go index 594eddfe..c587cbcc 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/openapi_generated.go @@ -21464,6 +21464,18 @@ func schema_kmodulesxyz_client_go_api_v1_ClusterMetadata(ref common.ReferenceCal Format: "", }, }, + "managerID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + "hubClusterID": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"uid"}, }, @@ -25665,6 +25677,12 @@ func schema_apimachinery_apis_kubedb_v1alpha2_ArchiverRecovery(ref common.Refere Ref: ref("kmodules.xyz/client-go/api/v1.ObjectReference"), }, }, + "replicationStrategy": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, Required: []string{"recoveryTimestamp"}, }, @@ -26955,7 +26973,7 @@ func schema_apimachinery_apis_kubedb_v1alpha2_DruidSpec(ref common.ReferenceCall "authSecret": { SchemaProps: spec.SchemaProps{ Description: "Database authentication secret", - Ref: ref("k8s.io/api/core/v1.LocalObjectReference"), + Ref: ref("kubedb.dev/apimachinery/apis/kubedb/v1alpha2.SecretReference"), }, }, "init": { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go index 92e810b6..ca0b3b26 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_helpers.go @@ -256,6 +256,22 @@ func (s *Solr) PVCName(alias string) string { return meta_util.NameWithSuffix(s.Name, alias) } +func (s Solr) NodeRoleSpecificLabelKey(roleType SolrNodeRoleType) string { + return kubedb.GroupName + "/role-" + string(roleType) +} + +func (s Solr) OverseerSelectors() map[string]string { + return s.OffshootSelectors(map[string]string{string(SolrNodeRoleOverseer): SolrNodeRoleSet}) +} + +func (s Solr) DataSelectors() map[string]string { + return s.OffshootSelectors(map[string]string{string(SolrNodeRoleData): SolrNodeRoleSet}) +} + +func (s Solr) CoordinatorSelectors() map[string]string { + return s.OffshootSelectors(map[string]string{string(SolrNodeRoleCoordinator): SolrNodeRoleSet}) +} + func (s *Solr) SetDefaults() { if s.Spec.DeletionPolicy == "" { s.Spec.DeletionPolicy = TerminationPolicyDelete diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go index 1587bc34..b5676094 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/solr_types.go @@ -180,6 +180,7 @@ const ( SolrNodeRoleOverseer SolrNodeRoleType = "overseer" SolrNodeRoleData SolrNodeRoleType = "data" SolrNodeRoleCoordinator SolrNodeRoleType = "coordinator" + SolrNodeRoleCombined SolrNodeRoleType = "combined" SolrNodeRoleSet = "set" ) diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/types.go index 771e754e..bb818a96 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/types.go @@ -135,6 +135,21 @@ const ( SecondaryServiceAlias ServiceAlias = "secondary" ) +// +kubebuilder:validation:Enum=fscopy;clone;sync;none +type PITRReplicationStrategy string + +const ( + // ReplicationStrategySync means data will be synced from primary to secondary + ReplicationStrategySync PITRReplicationStrategy = "sync" + // ReplicationStrategyFSCopy means data will be copied from filesystem + ReplicationStrategyFSCopy PITRReplicationStrategy = "fscopy" + // ReplicationStrategyClone means volumeSnapshot will be used to create pvc's + ReplicationStrategyClone PITRReplicationStrategy = "clone" + // ReplicationStrategyNone means no replication will be used + // data will be restored instead of replication + ReplicationStrategyNone PITRReplicationStrategy = "none" +) + // +kubebuilder:validation:Enum=DNS;IP;IPv4;IPv6 type AddressType string @@ -237,5 +252,6 @@ type ArchiverRecovery struct { ManifestRepository *kmapi.ObjectReference `json:"manifestRepository,omitempty"` // FullDBRepository means db restore + manifest restore - FullDBRepository *kmapi.ObjectReference `json:"fullDBRepository,omitempty"` + FullDBRepository *kmapi.ObjectReference `json:"fullDBRepository,omitempty"` + ReplicationStrategy *PITRReplicationStrategy `json:"replicationStrategy,omitempty"` } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.conversion.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.conversion.go index 75a0fcdf..a9586fa3 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.conversion.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.conversion.go @@ -1100,6 +1100,7 @@ func autoConvert_v1alpha2_ArchiverRecovery_To_v1_ArchiverRecovery(in *ArchiverRe out.EncryptionSecret = (*clientgoapiv1.ObjectReference)(unsafe.Pointer(in.EncryptionSecret)) out.ManifestRepository = (*clientgoapiv1.ObjectReference)(unsafe.Pointer(in.ManifestRepository)) out.FullDBRepository = (*clientgoapiv1.ObjectReference)(unsafe.Pointer(in.FullDBRepository)) + out.ReplicationStrategy = (*v1.PITRReplicationStrategy)(unsafe.Pointer(in.ReplicationStrategy)) return nil } @@ -1113,6 +1114,7 @@ func autoConvert_v1_ArchiverRecovery_To_v1alpha2_ArchiverRecovery(in *v1.Archive out.EncryptionSecret = (*clientgoapiv1.ObjectReference)(unsafe.Pointer(in.EncryptionSecret)) out.ManifestRepository = (*clientgoapiv1.ObjectReference)(unsafe.Pointer(in.ManifestRepository)) out.FullDBRepository = (*clientgoapiv1.ObjectReference)(unsafe.Pointer(in.FullDBRepository)) + out.ReplicationStrategy = (*PITRReplicationStrategy)(unsafe.Pointer(in.ReplicationStrategy)) return nil } @@ -2354,6 +2356,8 @@ func autoConvert_v1_MemcachedSpec_To_v1alpha2_MemcachedSpec(in *v1.MemcachedSpec out.Replicas = (*int32)(unsafe.Pointer(in.Replicas)) out.Monitor = (*monitoringagentapiapiv1.AgentSpec)(unsafe.Pointer(in.Monitor)) out.ConfigSecret = (*corev1.LocalObjectReference)(unsafe.Pointer(in.ConfigSecret)) + // WARNING: in.AuthSecret requires manual conversion: does not exist in peer-type + // WARNING: in.DisableAuth requires manual conversion: does not exist in peer-type out.DataVolume = (*corev1.VolumeSource)(unsafe.Pointer(in.DataVolume)) if err := Convert_v2_PodTemplateSpec_To_v1_PodTemplateSpec(&in.PodTemplate, &out.PodTemplate, s); err != nil { return err @@ -3415,6 +3419,7 @@ func autoConvert_v1alpha2_PgBouncerSpec_To_v1_PgBouncerSpec(in *PgBouncerSpec, o out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) // WARNING: in.TerminationPolicy requires manual conversion: does not exist in peer-type out.HealthChecker = in.HealthChecker + out.Halted = in.Halted return nil } @@ -3439,6 +3444,7 @@ func autoConvert_v1_PgBouncerSpec_To_v1alpha2_PgBouncerSpec(in *v1.PgBouncerSpec out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) // WARNING: in.DeletionPolicy requires manual conversion: does not exist in peer-type out.HealthChecker = in.HealthChecker + out.Halted = in.Halted return nil } @@ -3818,6 +3824,7 @@ func autoConvert_v1alpha2_ProxySQLSpec_To_v1_ProxySQLSpec(in *ProxySQLSpec, out out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) // WARNING: in.TerminationPolicy requires manual conversion: does not exist in peer-type out.HealthChecker = in.HealthChecker + out.Halted = in.Halted return nil } @@ -3840,6 +3847,7 @@ func autoConvert_v1_ProxySQLSpec_To_v1alpha2_ProxySQLSpec(in *v1.ProxySQLSpec, o out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) // WARNING: in.DeletionPolicy requires manual conversion: does not exist in peer-type out.HealthChecker = in.HealthChecker + out.Halted = in.Halted return nil } diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go index f3ecdcc6..4f8458a7 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go @@ -142,6 +142,11 @@ func (in *ArchiverRecovery) DeepCopyInto(out *ArchiverRecovery) { *out = new(apiv1.ObjectReference) **out = **in } + if in.ReplicationStrategy != nil { + in, out := &in.ReplicationStrategy, &out.ReplicationStrategy + *out = new(PITRReplicationStrategy) + **out = **in + } return } @@ -1017,8 +1022,8 @@ func (in *DruidSpec) DeepCopyInto(out *DruidSpec) { } if in.AuthSecret != nil { in, out := &in.AuthSecret, &out.AuthSecret - *out = new(corev1.LocalObjectReference) - **out = **in + *out = new(SecretReference) + (*in).DeepCopyInto(*out) } if in.Init != nil { in, out := &in.Init, &out.Init diff --git a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_solrautoscalers.yaml b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_solrautoscalers.yaml index c6483647..c34b6d9d 100644 --- a/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_solrautoscalers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/autoscaling.kubedb.com_solrautoscalers.yaml @@ -34,6 +34,138 @@ spec: properties: compute: properties: + coordinator: + properties: + containerControlledValues: + enum: + - RequestsAndLimits + - RequestsOnly + type: string + controlledResources: + items: + type: string + type: array + inMemoryStorage: + properties: + scalingFactorPercentage: + format: int32 + type: integer + usageThresholdPercentage: + format: int32 + type: integer + type: object + maxAllowed: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + minAllowed: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + podLifeTimeThreshold: + type: string + resourceDiffPercentage: + format: int32 + type: integer + trigger: + type: string + type: object + data: + properties: + containerControlledValues: + enum: + - RequestsAndLimits + - RequestsOnly + type: string + controlledResources: + items: + type: string + type: array + inMemoryStorage: + properties: + scalingFactorPercentage: + format: int32 + type: integer + usageThresholdPercentage: + format: int32 + type: integer + type: object + maxAllowed: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + minAllowed: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + podLifeTimeThreshold: + type: string + resourceDiffPercentage: + format: int32 + type: integer + trigger: + type: string + type: object + node: + properties: + containerControlledValues: + enum: + - RequestsAndLimits + - RequestsOnly + type: string + controlledResources: + items: + type: string + type: array + inMemoryStorage: + properties: + scalingFactorPercentage: + format: int32 + type: integer + usageThresholdPercentage: + format: int32 + type: integer + type: object + maxAllowed: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + minAllowed: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + podLifeTimeThreshold: + type: string + resourceDiffPercentage: + format: int32 + type: integer + trigger: + type: string + type: object nodeTopology: properties: name: @@ -47,7 +179,7 @@ spec: format: int32 type: integer type: object - solr: + overseer: properties: containerControlledValues: enum: @@ -112,7 +244,128 @@ spec: type: object storage: properties: - solr: + coordinator: + properties: + expansionMode: + enum: + - Offline + - Online + type: string + scalingRules: + items: + properties: + appliesUpto: + type: string + threshold: + type: string + required: + - appliesUpto + - threshold + type: object + type: array + scalingThreshold: + format: int32 + type: integer + trigger: + type: string + upperBound: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + usageThreshold: + format: int32 + type: integer + required: + - expansionMode + type: object + data: + properties: + expansionMode: + enum: + - Offline + - Online + type: string + scalingRules: + items: + properties: + appliesUpto: + type: string + threshold: + type: string + required: + - appliesUpto + - threshold + type: object + type: array + scalingThreshold: + format: int32 + type: integer + trigger: + type: string + upperBound: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + usageThreshold: + format: int32 + type: integer + required: + - expansionMode + type: object + node: + properties: + expansionMode: + enum: + - Offline + - Online + type: string + scalingRules: + items: + properties: + appliesUpto: + type: string + threshold: + type: string + required: + - appliesUpto + - threshold + type: object + type: array + scalingThreshold: + format: int32 + type: integer + trigger: + type: string + upperBound: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + usageThreshold: + format: int32 + type: integer + required: + - expansionMode + type: object + nodeTopology: + properties: + name: + type: string + scaleDownDiffPercentage: + default: 25 + format: int32 + type: integer + scaleUpDiffPercentage: + default: 15 + format: int32 + type: integer + type: object + overseer: properties: expansionMode: enum: diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_druids.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_druids.yaml index 4541ffb7..ae2e6e6e 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_druids.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_druids.yaml @@ -48,9 +48,16 @@ spec: properties: authSecret: properties: + activeFrom: + format: date-time + type: string + externallyManaged: + type: boolean name: default: "" type: string + rotateAfter: + type: string type: object x-kubernetes-map-type: atomic configSecret: @@ -147,6 +154,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml index fa3bd468..813f73f2 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_elasticsearches.yaml @@ -146,6 +146,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -39771,6 +39778,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml index 1fe17669..83bb72c7 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_etcds.yaml @@ -105,6 +105,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml index 01e7a6ec..d0a57fb3 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mariadbs.yaml @@ -224,6 +224,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -5090,6 +5097,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml index 3bc04abc..8994a599 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mongodbs.yaml @@ -6486,6 +6486,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -26217,6 +26224,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mssqlservers.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mssqlservers.yaml index fc638e09..e29a08f8 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mssqlservers.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mssqlservers.yaml @@ -250,6 +250,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml index f78c3257..d6c74e1f 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_mysqls.yaml @@ -294,6 +294,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -8373,6 +8380,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml index 2af669de..da5c471a 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_perconaxtradbs.yaml @@ -208,6 +208,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -5083,6 +5090,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml index 47d47567..ccae4107 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_postgreses.yaml @@ -287,6 +287,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -5301,6 +5308,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml index 0ddf675e..e0c8bf42 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_redises.yaml @@ -219,6 +219,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object @@ -5085,6 +5092,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_singlestores.yaml b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_singlestores.yaml index 59b0dd30..8febae83 100644 --- a/vendor/kubedb.dev/apimachinery/crds/kubedb.com_singlestores.yaml +++ b/vendor/kubedb.dev/apimachinery/crds/kubedb.com_singlestores.yaml @@ -131,6 +131,13 @@ spec: recoveryTimestamp: format: date-time type: string + replicationStrategy: + enum: + - fscopy + - clone + - sync + - none + type: string required: - recoveryTimestamp type: object diff --git a/vendor/modules.txt b/vendor/modules.txt index 0a8b32fa..9a4018e9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -36,7 +36,7 @@ github.com/beorn7/perks/quantile # github.com/blang/semver/v4 v4.0.0 ## explicit; go 1.14 github.com/blang/semver/v4 -# github.com/cert-manager/cert-manager v1.15.1 +# github.com/cert-manager/cert-manager v1.15.2 ## explicit; go 1.22.0 github.com/cert-manager/cert-manager/pkg/apis/acme github.com/cert-manager/cert-manager/pkg/apis/acme/v1 @@ -1537,7 +1537,7 @@ k8s.io/utils/trace # kmodules.xyz/apiversion v0.2.0 ## explicit; go 1.14 kmodules.xyz/apiversion -# kmodules.xyz/client-go v0.30.28 +# kmodules.xyz/client-go v0.30.32 ## explicit; go 1.22.0 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -1564,7 +1564,7 @@ kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v1/conversion kmodules.xyz/offshoot-api/api/v2 kmodules.xyz/offshoot-api/util -# kubedb.dev/apimachinery v0.48.1-0.20241101074809-3a305bf59ab1 +# kubedb.dev/apimachinery v0.49.0-rc.0 ## explicit; go 1.22.1 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/catalog