From 75fbb8d678ff7b0de0183091333917d16e6ea5c7 Mon Sep 17 00:00:00 2001 From: Arnob Kumar Saha Date: Wed, 9 Oct 2024 13:57:21 +0600 Subject: [PATCH] Remove `RenewBefore` field from certificateSpec (#597) Signed-off-by: Arnob kumar saha --- api/v1/certificates.go | 4 - api/v1/cluster.go | 22 +- api/v1/generated.pb.go | 1033 +++++++++++++++++++++++++------ api/v1/generated.proto | 32 +- api/v1/zz_generated.deepcopy.go | 5 - 5 files changed, 884 insertions(+), 212 deletions(-) diff --git a/api/v1/certificates.go b/api/v1/certificates.go index c72d55df9..d5e181427 100644 --- a/api/v1/certificates.go +++ b/api/v1/certificates.go @@ -58,10 +58,6 @@ type CertificateSpec struct { // +optional Duration *metav1.Duration `json:"duration,omitempty" protobuf:"bytes,5,opt,name=duration"` - // Certificate renew before expiration duration - // +optional - RenewBefore *metav1.Duration `json:"renewBefore,omitempty" protobuf:"bytes,6,opt,name=renewBefore"` - // DNSNames is a list of subject alt names to be used on the Certificate. // +optional DNSNames []string `json:"dnsNames,omitempty" protobuf:"bytes,7,rep,name=dnsNames"` diff --git a/api/v1/cluster.go b/api/v1/cluster.go index 8d80b0d1c..5f17fba3a 100644 --- a/api/v1/cluster.go +++ b/api/v1/cluster.go @@ -54,10 +54,10 @@ type ClusterMetadata struct { 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"` - OwnerType string `json:"ownerType,omitempty"` - APIEndpoint string `json:"apiEndpoint,omitempty"` - CABundle string `json:"caBundle,omitempty"` + 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"` } func (md ClusterMetadata) State() string { @@ -151,18 +151,18 @@ func (cm ClusterManager) String() string { } type CAPIClusterInfo struct { - Provider CAPIProvider `json:"provider"` - Namespace string `json:"namespace"` - ClusterName string `json:"clusterName"` + Provider CAPIProvider `json:"provider" protobuf:"bytes,1,opt,name=provider,casttype=CAPIProvider"` + Namespace string `json:"namespace" protobuf:"bytes,2,opt,name=namespace"` + ClusterName string `json:"clusterName" protobuf:"bytes,3,opt,name=clusterName"` } // ClusterInfo used in ace-installer type ClusterInfo struct { - UID string `json:"uid"` - Name string `json:"name"` - ClusterManagers []string `json:"clusterManagers"` + UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"` + Name string `json:"name" protobuf:"bytes,2,opt,name=name"` + ClusterManagers []string `json:"clusterManagers" protobuf:"bytes,3,rep,name=clusterManagers"` // +optional - CAPI *CAPIClusterInfo `json:"capi"` + CAPI *CAPIClusterInfo `json:"capi" protobuf:"bytes,4,opt,name=capi"` } // +kubebuilder:validation:Enum=capa;capg;capz diff --git a/api/v1/generated.pb.go b/api/v1/generated.pb.go index afb785759..02b2c851b 100644 --- a/api/v1/generated.pb.go +++ b/api/v1/generated.pb.go @@ -44,10 +44,38 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +func (m *CAPIClusterInfo) Reset() { *m = CAPIClusterInfo{} } +func (*CAPIClusterInfo) ProtoMessage() {} +func (*CAPIClusterInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_af8e7a11c7a1ccd9, []int{0} +} +func (m *CAPIClusterInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *CAPIClusterInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *CAPIClusterInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_CAPIClusterInfo.Merge(m, src) +} +func (m *CAPIClusterInfo) XXX_Size() int { + return m.Size() +} +func (m *CAPIClusterInfo) XXX_DiscardUnknown() { + xxx_messageInfo_CAPIClusterInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_CAPIClusterInfo proto.InternalMessageInfo + func (m *CertificatePrivateKey) Reset() { *m = CertificatePrivateKey{} } func (*CertificatePrivateKey) ProtoMessage() {} func (*CertificatePrivateKey) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{0} + return fileDescriptor_af8e7a11c7a1ccd9, []int{1} } func (m *CertificatePrivateKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -75,7 +103,7 @@ var xxx_messageInfo_CertificatePrivateKey proto.InternalMessageInfo func (m *CertificateSpec) Reset() { *m = CertificateSpec{} } func (*CertificateSpec) ProtoMessage() {} func (*CertificateSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{1} + return fileDescriptor_af8e7a11c7a1ccd9, []int{2} } func (m *CertificateSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -100,10 +128,38 @@ func (m *CertificateSpec) XXX_DiscardUnknown() { var xxx_messageInfo_CertificateSpec proto.InternalMessageInfo +func (m *ClusterInfo) Reset() { *m = ClusterInfo{} } +func (*ClusterInfo) ProtoMessage() {} +func (*ClusterInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_af8e7a11c7a1ccd9, []int{3} +} +func (m *ClusterInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ClusterInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil +} +func (m *ClusterInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClusterInfo.Merge(m, src) +} +func (m *ClusterInfo) XXX_Size() int { + return m.Size() +} +func (m *ClusterInfo) XXX_DiscardUnknown() { + xxx_messageInfo_ClusterInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_ClusterInfo proto.InternalMessageInfo + func (m *ClusterMetadata) Reset() { *m = ClusterMetadata{} } func (*ClusterMetadata) ProtoMessage() {} func (*ClusterMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{2} + return fileDescriptor_af8e7a11c7a1ccd9, []int{4} } func (m *ClusterMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -131,7 +187,7 @@ var xxx_messageInfo_ClusterMetadata proto.InternalMessageInfo func (m *Condition) Reset() { *m = Condition{} } func (*Condition) ProtoMessage() {} func (*Condition) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{3} + return fileDescriptor_af8e7a11c7a1ccd9, []int{5} } func (m *Condition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +215,7 @@ var xxx_messageInfo_Condition proto.InternalMessageInfo func (m *HealthCheckSpec) Reset() { *m = HealthCheckSpec{} } func (*HealthCheckSpec) ProtoMessage() {} func (*HealthCheckSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{4} + return fileDescriptor_af8e7a11c7a1ccd9, []int{6} } func (m *HealthCheckSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -187,7 +243,7 @@ var xxx_messageInfo_HealthCheckSpec proto.InternalMessageInfo func (m *ImageInfo) Reset() { *m = ImageInfo{} } func (*ImageInfo) ProtoMessage() {} func (*ImageInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{5} + return fileDescriptor_af8e7a11c7a1ccd9, []int{7} } func (m *ImageInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -215,7 +271,7 @@ var xxx_messageInfo_ImageInfo proto.InternalMessageInfo func (m *Lineage) Reset() { *m = Lineage{} } func (*Lineage) ProtoMessage() {} func (*Lineage) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{6} + return fileDescriptor_af8e7a11c7a1ccd9, []int{8} } func (m *Lineage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -243,7 +299,7 @@ var xxx_messageInfo_Lineage proto.InternalMessageInfo func (m *ObjectID) Reset() { *m = ObjectID{} } func (*ObjectID) ProtoMessage() {} func (*ObjectID) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{7} + return fileDescriptor_af8e7a11c7a1ccd9, []int{9} } func (m *ObjectID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -271,7 +327,7 @@ var xxx_messageInfo_ObjectID proto.InternalMessageInfo func (m *ObjectInfo) Reset() { *m = ObjectInfo{} } func (*ObjectInfo) ProtoMessage() {} func (*ObjectInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{8} + return fileDescriptor_af8e7a11c7a1ccd9, []int{10} } func (m *ObjectInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +355,7 @@ var xxx_messageInfo_ObjectInfo proto.InternalMessageInfo func (m *ObjectReference) Reset() { *m = ObjectReference{} } func (*ObjectReference) ProtoMessage() {} func (*ObjectReference) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{9} + return fileDescriptor_af8e7a11c7a1ccd9, []int{11} } func (m *ObjectReference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -327,7 +383,7 @@ var xxx_messageInfo_ObjectReference proto.InternalMessageInfo func (m *PullCredentials) Reset() { *m = PullCredentials{} } func (*PullCredentials) ProtoMessage() {} func (*PullCredentials) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{10} + return fileDescriptor_af8e7a11c7a1ccd9, []int{12} } func (m *PullCredentials) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -355,7 +411,7 @@ var xxx_messageInfo_PullCredentials proto.InternalMessageInfo func (m *ReadonlyHealthCheckSpec) Reset() { *m = ReadonlyHealthCheckSpec{} } func (*ReadonlyHealthCheckSpec) ProtoMessage() {} func (*ReadonlyHealthCheckSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{11} + return fileDescriptor_af8e7a11c7a1ccd9, []int{13} } func (m *ReadonlyHealthCheckSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -383,7 +439,7 @@ var xxx_messageInfo_ReadonlyHealthCheckSpec proto.InternalMessageInfo func (m *ResourceID) Reset() { *m = ResourceID{} } func (*ResourceID) ProtoMessage() {} func (*ResourceID) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{12} + return fileDescriptor_af8e7a11c7a1ccd9, []int{14} } func (m *ResourceID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -411,7 +467,7 @@ var xxx_messageInfo_ResourceID proto.InternalMessageInfo func (m *TLSConfig) Reset() { *m = TLSConfig{} } func (*TLSConfig) ProtoMessage() {} func (*TLSConfig) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{13} + return fileDescriptor_af8e7a11c7a1ccd9, []int{15} } func (m *TLSConfig) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -439,7 +495,7 @@ var xxx_messageInfo_TLSConfig proto.InternalMessageInfo func (m *TimeOfDay) Reset() { *m = TimeOfDay{} } func (*TimeOfDay) ProtoMessage() {} func (*TimeOfDay) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{14} + return fileDescriptor_af8e7a11c7a1ccd9, []int{16} } func (m *TimeOfDay) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TimeOfDay.Unmarshal(m, b) @@ -462,7 +518,7 @@ var xxx_messageInfo_TimeOfDay proto.InternalMessageInfo func (m *TypedObjectReference) Reset() { *m = TypedObjectReference{} } func (*TypedObjectReference) ProtoMessage() {} func (*TypedObjectReference) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{15} + return fileDescriptor_af8e7a11c7a1ccd9, []int{17} } func (m *TypedObjectReference) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -490,7 +546,7 @@ var xxx_messageInfo_TypedObjectReference proto.InternalMessageInfo func (m *X509Subject) Reset() { *m = X509Subject{} } func (*X509Subject) ProtoMessage() {} func (*X509Subject) Descriptor() ([]byte, []int) { - return fileDescriptor_af8e7a11c7a1ccd9, []int{16} + return fileDescriptor_af8e7a11c7a1ccd9, []int{18} } func (m *X509Subject) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -516,8 +572,10 @@ func (m *X509Subject) XXX_DiscardUnknown() { var xxx_messageInfo_X509Subject proto.InternalMessageInfo func init() { + proto.RegisterType((*CAPIClusterInfo)(nil), "kmodules.xyz.client_go.api.v1.CAPIClusterInfo") proto.RegisterType((*CertificatePrivateKey)(nil), "kmodules.xyz.client_go.api.v1.CertificatePrivateKey") proto.RegisterType((*CertificateSpec)(nil), "kmodules.xyz.client_go.api.v1.CertificateSpec") + proto.RegisterType((*ClusterInfo)(nil), "kmodules.xyz.client_go.api.v1.ClusterInfo") proto.RegisterType((*ClusterMetadata)(nil), "kmodules.xyz.client_go.api.v1.ClusterMetadata") proto.RegisterType((*Condition)(nil), "kmodules.xyz.client_go.api.v1.Condition") proto.RegisterType((*HealthCheckSpec)(nil), "kmodules.xyz.client_go.api.v1.HealthCheckSpec") @@ -540,115 +598,162 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 1728 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x23, 0x49, - 0x15, 0x76, 0xc7, 0x4e, 0xe2, 0x2e, 0x27, 0xe3, 0x49, 0xcd, 0xa0, 0x31, 0x23, 0xc6, 0x1d, 0xbc, - 0x62, 0x94, 0x01, 0xa6, 0x4d, 0x46, 0xb3, 0xb0, 0xac, 0x84, 0x20, 0xed, 0xec, 0x66, 0xbd, 0x9b, - 0x49, 0x42, 0x39, 0xc3, 0xae, 0x16, 0x04, 0xaa, 0x74, 0x3f, 0x3b, 0x45, 0xda, 0xdd, 0xad, 0xaa, - 0x6e, 0x83, 0xf7, 0xb4, 0x47, 0xb8, 0x2d, 0x37, 0x8e, 0x3b, 0x12, 0x7f, 0x02, 0x17, 0xfe, 0x02, - 0x46, 0x9c, 0x86, 0x0b, 0xda, 0x03, 0xb2, 0x18, 0x73, 0x45, 0x5c, 0x10, 0x12, 0xca, 0x09, 0x55, - 0xf5, 0x4f, 0x3b, 0xce, 0x24, 0x8b, 0x90, 0xf6, 0xe6, 0xfe, 0xde, 0xf7, 0xbe, 0xaa, 0xae, 0x7a, - 0xbf, 0xda, 0xe8, 0xe1, 0xd9, 0xd0, 0x77, 0x22, 0x17, 0x84, 0xf9, 0xcb, 0xf1, 0x47, 0x6d, 0xdb, - 0x65, 0xe0, 0x85, 0x0f, 0x07, 0x7e, 0x9b, 0x06, 0xac, 0x3d, 0xda, 0x6e, 0x0f, 0xc0, 0x03, 0x4e, - 0x43, 0x70, 0xcc, 0x80, 0xfb, 0xa1, 0x8f, 0xef, 0x15, 0xe9, 0x66, 0x4c, 0xff, 0xd9, 0xc0, 0x37, - 0x69, 0xc0, 0xcc, 0xd1, 0xf6, 0xdd, 0x87, 0x03, 0x16, 0x9e, 0x46, 0x27, 0xa6, 0xed, 0x0f, 0xdb, - 0x03, 0x7f, 0xe0, 0xb7, 0x95, 0xd7, 0x49, 0xd4, 0x57, 0x4f, 0xea, 0x41, 0xfd, 0x8a, 0xd5, 0xee, - 0xb6, 0xce, 0xde, 0x10, 0x26, 0x8b, 0x17, 0xb3, 0x7d, 0x0e, 0x0b, 0x56, 0xbc, 0xfb, 0x38, 0xe7, - 0x0c, 0xa9, 0x7d, 0xca, 0x3c, 0xe0, 0xe3, 0x76, 0x70, 0x36, 0x90, 0x80, 0x68, 0x0f, 0x21, 0xa4, - 0x0b, 0xbc, 0x5a, 0x3f, 0x46, 0x5f, 0xea, 0x00, 0x0f, 0x59, 0x9f, 0xd9, 0x34, 0x84, 0x23, 0xce, - 0x46, 0x34, 0x84, 0xf7, 0x60, 0x8c, 0x2d, 0x54, 0x05, 0xcf, 0xf6, 0x1d, 0xe6, 0x0d, 0x1a, 0xda, - 0xa6, 0xb6, 0xa5, 0x5b, 0xf7, 0x9f, 0x4f, 0x8c, 0xd2, 0x74, 0x62, 0x54, 0xdf, 0x4a, 0xf0, 0xf3, - 0x89, 0x81, 0x73, 0x8f, 0x14, 0x25, 0x99, 0x5f, 0xeb, 0x5f, 0xcb, 0xa8, 0x5e, 0x50, 0xef, 0x05, - 0x60, 0xe3, 0xd7, 0xd0, 0x32, 0x75, 0x19, 0x15, 0x89, 0xe8, 0x7a, 0x22, 0xba, 0xbc, 0x23, 0x41, - 0x12, 0xdb, 0xf0, 0x87, 0x48, 0x67, 0x42, 0x44, 0xc0, 0x09, 0xf4, 0x1b, 0x4b, 0x9b, 0xda, 0x56, - 0xed, 0xd1, 0x43, 0x33, 0x7e, 0x3f, 0x75, 0x82, 0xf2, 0x0c, 0xcc, 0xd1, 0xb6, 0x79, 0x3c, 0x0e, - 0xc0, 0xd9, 0xf7, 0x6d, 0xea, 0x1e, 0x9e, 0xfc, 0x1c, 0xec, 0x90, 0x40, 0x1f, 0x38, 0x78, 0x36, - 0x58, 0xeb, 0xd3, 0x89, 0xa1, 0x77, 0x53, 0x0d, 0x92, 0xcb, 0xe1, 0x47, 0x08, 0x09, 0xb0, 0x39, - 0x84, 0x07, 0x74, 0x08, 0x8d, 0xb2, 0xda, 0x05, 0x4e, 0x76, 0x81, 0x7a, 0x99, 0x85, 0x14, 0x58, - 0xf8, 0x87, 0x68, 0x55, 0x44, 0x6a, 0x85, 0x46, 0x45, 0xed, 0xe6, 0xeb, 0xe6, 0x2b, 0xef, 0xd7, - 0xfc, 0xe0, 0xf5, 0x6f, 0x7d, 0xb7, 0x17, 0x7b, 0x58, 0xb5, 0xe9, 0xc4, 0x58, 0x4d, 0x1e, 0x48, - 0xaa, 0x83, 0x3f, 0x40, 0x55, 0x27, 0xe2, 0x34, 0x64, 0xbe, 0xd7, 0x58, 0x56, 0x9a, 0x66, 0xe1, - 0x0d, 0xb3, 0x1b, 0x34, 0x83, 0xb3, 0x81, 0x04, 0x84, 0x29, 0x6f, 0x50, 0x4a, 0xef, 0x26, 0x5e, - 0xd6, 0x9a, 0xbc, 0x8b, 0xf4, 0x89, 0x64, 0x6a, 0x98, 0xa2, 0x1a, 0x07, 0x0f, 0x7e, 0x61, 0x41, - 0xdf, 0xe7, 0xd0, 0x58, 0xf9, 0x9f, 0xc4, 0xeb, 0xd3, 0x89, 0x51, 0x23, 0xb9, 0x0c, 0x29, 0x6a, - 0xe2, 0x2d, 0x54, 0x75, 0x3c, 0x21, 0x8f, 0x46, 0x34, 0x56, 0x37, 0xcb, 0x5b, 0x7a, 0xb2, 0x99, - 0x83, 0x9e, 0xc2, 0x48, 0x66, 0xc5, 0xdb, 0xa8, 0xc6, 0x82, 0x1d, 0xc7, 0xe1, 0x20, 0x04, 0x88, - 0x46, 0x55, 0x91, 0x95, 0x78, 0xf7, 0x28, 0x83, 0x49, 0x91, 0x83, 0xbf, 0x82, 0x2a, 0x11, 0x67, - 0xa2, 0xa1, 0x2b, 0x6e, 0x75, 0x3a, 0x31, 0x2a, 0x4f, 0x49, 0x57, 0x10, 0x85, 0xe2, 0x37, 0xd1, - 0x0d, 0x18, 0x52, 0xe6, 0xe6, 0x9a, 0x48, 0xf1, 0xf0, 0x74, 0x62, 0xdc, 0x78, 0x6b, 0xc6, 0x42, - 0xe6, 0x98, 0xd8, 0x41, 0x28, 0xc8, 0xe2, 0xb5, 0x51, 0x53, 0x07, 0xf3, 0xf8, 0x8a, 0x9b, 0x5c, - 0x98, 0x1d, 0xd6, 0x0d, 0x19, 0x2c, 0xf9, 0x33, 0x29, 0xe8, 0xb6, 0xfe, 0xa4, 0xa1, 0x7a, 0xc7, - 0x8d, 0x44, 0x08, 0xfc, 0x09, 0x84, 0xd4, 0xa1, 0x21, 0xc5, 0xf7, 0x50, 0x39, 0x62, 0x4e, 0x12, - 0xf3, 0xb5, 0x24, 0xda, 0xca, 0x4f, 0xbb, 0xbb, 0x44, 0xe2, 0x78, 0x13, 0x55, 0x3c, 0x19, 0x8d, - 0x4b, 0xca, 0xbe, 0x96, 0xd8, 0x2b, 0x2a, 0x0e, 0x95, 0x05, 0xbf, 0x8e, 0x6a, 0x0e, 0x13, 0x81, - 0x4b, 0xc7, 0x85, 0xb0, 0xbd, 0x95, 0x10, 0x6b, 0xbb, 0xb9, 0x89, 0x14, 0x79, 0xf8, 0xfb, 0xa8, - 0x1a, 0x70, 0x7f, 0xc4, 0x1c, 0xe0, 0x2a, 0x72, 0x75, 0xeb, 0xb5, 0x34, 0x8b, 0x8f, 0x12, 0xfc, - 0x7c, 0x62, 0xd4, 0xdf, 0xf1, 0x45, 0xc8, 0xbc, 0x41, 0x0a, 0x91, 0xcc, 0xa9, 0xf5, 0x9f, 0x32, - 0xd2, 0x3b, 0xbe, 0xe7, 0x30, 0x15, 0x5a, 0xdb, 0xa8, 0x12, 0x8e, 0x03, 0x48, 0xa4, 0xee, 0xa5, - 0xfb, 0x94, 0x69, 0x78, 0x3e, 0x31, 0xd6, 0x33, 0xa2, 0x04, 0x88, 0xa2, 0xe2, 0x9f, 0xa2, 0x15, - 0x11, 0xd2, 0x30, 0x12, 0x2a, 0xca, 0x75, 0xeb, 0xed, 0xc4, 0x69, 0xa5, 0xa7, 0xd0, 0xf3, 0x89, - 0x71, 0xad, 0xc2, 0x65, 0x66, 0xda, 0xb1, 0x1f, 0x49, 0x54, 0xf1, 0xbb, 0x08, 0xfb, 0x27, 0x02, - 0xf8, 0x08, 0x9c, 0xbd, 0xb8, 0xb6, 0xc9, 0x8c, 0x92, 0xe7, 0x53, 0xb6, 0xee, 0x26, 0x6b, 0xe1, - 0xc3, 0x0b, 0x0c, 0xb2, 0xc0, 0x0b, 0xef, 0xa0, 0xaa, 0x80, 0x11, 0x70, 0x16, 0x8e, 0x55, 0xda, - 0xe8, 0xd6, 0xd7, 0xd2, 0xd3, 0xea, 0x25, 0xf8, 0xf9, 0xc4, 0xd8, 0xc8, 0xb7, 0x92, 0x80, 0x24, - 0x73, 0xc3, 0x23, 0x84, 0x5d, 0x2a, 0xc2, 0x63, 0x4e, 0x3d, 0x11, 0x1f, 0x05, 0x1b, 0x42, 0x63, - 0x35, 0x2d, 0x1a, 0xd7, 0xc9, 0x41, 0xe9, 0x91, 0x6f, 0x7d, 0xff, 0x82, 0x1a, 0x59, 0xb0, 0x02, - 0xbe, 0x8f, 0x56, 0x38, 0x50, 0xe1, 0x7b, 0x8d, 0xaa, 0xda, 0xf8, 0x8d, 0xf4, 0x98, 0x89, 0x42, - 0x49, 0x62, 0xc5, 0x0f, 0xd0, 0xea, 0x10, 0x84, 0xa0, 0x03, 0x68, 0xe8, 0x8a, 0x58, 0x4f, 0x88, - 0xab, 0x4f, 0x62, 0x98, 0xa4, 0xf6, 0xd6, 0x3f, 0x35, 0x54, 0x7f, 0x07, 0xa8, 0x1b, 0x9e, 0x76, - 0x4e, 0xc1, 0x3e, 0x53, 0xd5, 0xfb, 0x37, 0x1a, 0xba, 0xc3, 0x81, 0x3a, 0xbe, 0xe7, 0x8e, 0xe7, - 0x6c, 0x2a, 0xb8, 0x6b, 0x8f, 0xbe, 0x7d, 0x45, 0x3e, 0x91, 0xc5, 0xde, 0x96, 0x91, 0xec, 0xe3, - 0xce, 0x25, 0x04, 0x72, 0xd9, 0xba, 0x78, 0x0f, 0x6d, 0x38, 0x4c, 0xd0, 0x13, 0x17, 0xde, 0xe7, - 0x2c, 0x04, 0x65, 0x50, 0x99, 0x54, 0xb5, 0xbe, 0x9c, 0x88, 0x6e, 0xec, 0xce, 0x13, 0xc8, 0x45, - 0x9f, 0xd6, 0xbf, 0x35, 0xa4, 0x77, 0x87, 0x74, 0x00, 0x5d, 0xaf, 0xef, 0xcb, 0x46, 0xc5, 0xe4, - 0xc3, 0x7c, 0xa3, 0x52, 0x0c, 0x12, 0xdb, 0xf0, 0x31, 0xaa, 0xba, 0xcc, 0x03, 0x3a, 0x00, 0xd1, - 0x58, 0xda, 0x2c, 0x6f, 0xd5, 0x1e, 0xdd, 0xbf, 0xe2, 0xfd, 0xf7, 0x63, 0xba, 0x75, 0x33, 0x8d, - 0xac, 0x04, 0x10, 0x24, 0x53, 0xc2, 0x43, 0x54, 0x0f, 0x22, 0xd7, 0xed, 0x70, 0x70, 0xc0, 0x0b, - 0x19, 0x75, 0x85, 0x0a, 0x68, 0x55, 0xc5, 0x5f, 0x29, 0x7e, 0x34, 0xeb, 0x65, 0xdd, 0x9a, 0x4e, - 0x8c, 0xfa, 0x1c, 0x48, 0xe6, 0xb5, 0x5b, 0xbf, 0xd6, 0xd0, 0x6a, 0xb2, 0x0b, 0x7c, 0x80, 0x96, - 0xed, 0x53, 0xca, 0xbc, 0x86, 0xa6, 0xde, 0xe6, 0xc1, 0x15, 0x0b, 0xc6, 0x6d, 0x57, 0x9e, 0x57, - 0x7e, 0x40, 0x1d, 0xe9, 0x4f, 0x62, 0x19, 0x6c, 0x22, 0x64, 0xfb, 0x5e, 0x48, 0x65, 0xac, 0xc7, - 0x47, 0xa4, 0xc7, 0xc5, 0xb3, 0x93, 0xa1, 0xa4, 0xc0, 0x68, 0xfd, 0x4e, 0x43, 0xd5, 0x44, 0x74, - 0x57, 0x5e, 0xc1, 0x80, 0xfb, 0x51, 0x30, 0x7f, 0x05, 0x7b, 0x12, 0x24, 0xb1, 0x4d, 0xd6, 0xce, - 0x33, 0xe6, 0x39, 0xf3, 0xb5, 0xf3, 0x3d, 0xe6, 0x39, 0x44, 0x59, 0x70, 0x1b, 0xe9, 0xb2, 0x86, - 0x8a, 0x80, 0xda, 0x69, 0xe5, 0xdc, 0x48, 0x68, 0xfa, 0x41, 0x6a, 0x20, 0x39, 0x27, 0x2b, 0xc7, - 0x95, 0xcb, 0xca, 0x71, 0xeb, 0xf7, 0x1a, 0x42, 0xf9, 0xbb, 0xe3, 0xf7, 0x51, 0x95, 0x83, 0xf0, - 0x23, 0x6e, 0x43, 0x92, 0x06, 0x0f, 0xae, 0x4c, 0x83, 0x98, 0xde, 0xdd, 0xcd, 0x23, 0x21, 0xc5, - 0x48, 0x26, 0x86, 0x9f, 0xa0, 0x32, 0xcf, 0x46, 0x20, 0xf3, 0x5a, 0x97, 0x91, 0xcf, 0x40, 0x59, - 0x9f, 0x91, 0x13, 0x90, 0xd4, 0x69, 0x39, 0xa8, 0x3e, 0x47, 0x9a, 0x3d, 0x1c, 0xed, 0x73, 0x1c, - 0xce, 0xa5, 0xbd, 0xaa, 0xf5, 0x0f, 0x0d, 0xcd, 0x07, 0xdd, 0xe7, 0x5f, 0xe6, 0x5d, 0x84, 0x65, - 0x7d, 0x66, 0x36, 0xec, 0xd8, 0xb6, 0x1f, 0x79, 0xf1, 0xb8, 0x16, 0x2f, 0x9a, 0x15, 0xc7, 0xde, - 0x05, 0x06, 0x59, 0xe0, 0x85, 0x7f, 0x92, 0x8e, 0x7c, 0x04, 0xfa, 0x32, 0x95, 0x64, 0x64, 0x6f, - 0x2d, 0x9a, 0x27, 0x17, 0x8e, 0x92, 0x73, 0xc3, 0xa1, 0xd4, 0x20, 0x05, 0xbd, 0xd6, 0x0b, 0x0d, - 0x5d, 0x56, 0xb4, 0xf0, 0x77, 0xd0, 0x7a, 0x00, 0x9c, 0xf9, 0x4e, 0x0f, 0x6c, 0xdf, 0x73, 0xe2, - 0xa9, 0x77, 0xd9, 0xda, 0x98, 0x4e, 0x8c, 0xf5, 0xa3, 0xa2, 0x81, 0xcc, 0xf2, 0xe4, 0x98, 0x13, - 0xb2, 0x21, 0xf8, 0x51, 0x98, 0x7a, 0x2e, 0x29, 0x4f, 0x35, 0xe6, 0x1c, 0xcf, 0x58, 0xc8, 0x1c, - 0x13, 0xff, 0x00, 0xdd, 0xec, 0x53, 0xe6, 0x46, 0x1c, 0x8e, 0x4f, 0x39, 0x88, 0x53, 0xdf, 0x75, - 0x54, 0xd8, 0x2f, 0x5b, 0xb7, 0xa7, 0x13, 0xe3, 0xe6, 0xdb, 0x73, 0x36, 0x72, 0x81, 0xdd, 0xfa, - 0x8b, 0x86, 0x50, 0x1e, 0xa1, 0xd7, 0xcb, 0xc3, 0x07, 0x68, 0x75, 0x04, 0x5c, 0xc8, 0xee, 0xbb, - 0x34, 0xdb, 0x59, 0x7e, 0x14, 0xc3, 0x24, 0xb5, 0x67, 0x21, 0x54, 0xbe, 0x74, 0xdc, 0x49, 0x93, - 0xba, 0x72, 0x69, 0x52, 0x3f, 0x46, 0xcb, 0xc2, 0xf6, 0x03, 0x48, 0xc6, 0x8a, 0x66, 0xba, 0xa7, - 0x9e, 0x04, 0xe5, 0x30, 0x92, 0xee, 0x5f, 0x01, 0x24, 0x26, 0xb7, 0xfe, 0xac, 0x21, 0xfd, 0x78, - 0xbf, 0xd7, 0xf1, 0xbd, 0x3e, 0x1b, 0xcc, 0x7e, 0x66, 0x68, 0xff, 0xdf, 0xcf, 0x8c, 0x53, 0xb4, - 0x66, 0xe7, 0xa3, 0x63, 0xda, 0x1d, 0xcc, 0xeb, 0x4f, 0x9b, 0xaa, 0x2b, 0xde, 0x4e, 0x5e, 0x6b, - 0xad, 0x60, 0x10, 0x64, 0x46, 0xb9, 0xf5, 0x55, 0xa4, 0xcb, 0x80, 0x38, 0xec, 0xef, 0xd2, 0xf1, - 0x9b, 0xb7, 0x7f, 0xfb, 0xa9, 0x51, 0xfa, 0xd5, 0x33, 0xa3, 0xf4, 0xc9, 0x33, 0xa3, 0xf4, 0xe9, - 0x33, 0xa3, 0xf4, 0xf1, 0x5f, 0x37, 0x4b, 0xad, 0x3f, 0x68, 0xe8, 0xb6, 0x7a, 0x89, 0xf9, 0xec, - 0xff, 0x26, 0xaa, 0xd2, 0x80, 0xed, 0x15, 0x2e, 0x37, 0xab, 0x46, 0x3b, 0x47, 0xdd, 0xf8, 0x7e, - 0x33, 0xc6, 0x17, 0x53, 0x6a, 0xff, 0x58, 0x46, 0xb5, 0xc2, 0xe7, 0x94, 0x4c, 0x29, 0x9f, 0x0f, - 0xa8, 0xc7, 0x3e, 0x52, 0x43, 0x9b, 0x50, 0x9d, 0x4a, 0x8f, 0x53, 0xea, 0xb0, 0x68, 0x20, 0xb3, - 0x3c, 0xfc, 0x0d, 0xa4, 0xab, 0x92, 0xc0, 0x19, 0xa4, 0x9d, 0x48, 0x5d, 0x5f, 0x27, 0x05, 0x49, - 0x6e, 0xc7, 0x5d, 0x74, 0xab, 0xe8, 0x4d, 0xdd, 0xa7, 0x1e, 0x0b, 0xe3, 0xda, 0xa1, 0x5b, 0x77, - 0xa6, 0x13, 0xe3, 0xd6, 0xe1, 0x45, 0x33, 0x59, 0xe4, 0x23, 0x5b, 0xa0, 0x2b, 0x63, 0x87, 0x85, - 0x72, 0xe1, 0x4a, 0xde, 0x02, 0xf7, 0x33, 0x94, 0x14, 0x18, 0x72, 0x9f, 0x6a, 0xfc, 0xf6, 0x6c, - 0x90, 0x43, 0x73, 0xb6, 0xcf, 0xa3, 0x14, 0x24, 0xb9, 0x1d, 0x7f, 0x0f, 0xd5, 0x45, 0xc8, 0x01, - 0xc2, 0xfc, 0x7b, 0x68, 0x45, 0xb9, 0xa8, 0xd6, 0xdf, 0x9b, 0x35, 0x91, 0x79, 0xae, 0xfc, 0x3c, - 0x0b, 0x7c, 0x11, 0x52, 0xb7, 0xe3, 0x3b, 0xd9, 0xb7, 0x9c, 0xfa, 0x3c, 0x3b, 0xca, 0x61, 0x52, - 0xe4, 0xe0, 0x37, 0xd0, 0x9a, 0x00, 0xce, 0xa8, 0x7b, 0x10, 0x0d, 0x4f, 0x80, 0x27, 0xf3, 0x66, - 0x16, 0xa8, 0xbd, 0x82, 0x8d, 0xcc, 0x30, 0xad, 0xce, 0xf3, 0x97, 0xcd, 0xd2, 0x8b, 0x97, 0xcd, - 0xd2, 0x67, 0x2f, 0x9b, 0xa5, 0x8f, 0xa7, 0x4d, 0xed, 0xf9, 0xb4, 0xa9, 0xbd, 0x98, 0x36, 0xb5, - 0xcf, 0xa6, 0x4d, 0xed, 0x6f, 0xd3, 0xa6, 0xf6, 0xc9, 0xdf, 0x9b, 0xa5, 0x0f, 0xef, 0xbd, 0xf2, - 0x8f, 0x96, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x6b, 0xda, 0x16, 0x88, 0x11, 0x00, 0x00, + // 1860 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xdd, 0x6f, 0x1b, 0x59, + 0x15, 0xf7, 0xd4, 0x4e, 0x62, 0x1f, 0x27, 0x75, 0x73, 0x5b, 0x54, 0x53, 0x51, 0x4f, 0x98, 0x8a, + 0x2a, 0x85, 0xed, 0x84, 0x44, 0x2d, 0x2c, 0x2b, 0x10, 0xc4, 0x4e, 0xb7, 0xeb, 0xdd, 0xb4, 0x31, + 0xd7, 0x29, 0xbb, 0x5a, 0x10, 0xe8, 0x66, 0xe6, 0xc6, 0xb9, 0x64, 0x3c, 0x33, 0xba, 0x77, 0xc6, + 0x90, 0x7d, 0xda, 0x47, 0x10, 0x2f, 0xe5, 0x8d, 0xc7, 0xad, 0xc4, 0x9f, 0x80, 0x84, 0xf8, 0x0b, + 0xe8, 0x63, 0x79, 0x41, 0x2b, 0x81, 0x2c, 0x6a, 0x5e, 0x11, 0x6f, 0x48, 0x28, 0x4f, 0xe8, 0xde, + 0xb9, 0xf3, 0x61, 0xc7, 0xd9, 0x64, 0x05, 0x12, 0x6f, 0x9e, 0xf3, 0xfb, 0x9d, 0x73, 0x3f, 0xce, + 0xe7, 0x35, 0xdc, 0x3f, 0x1e, 0x06, 0x6e, 0xec, 0x51, 0x61, 0xff, 0xfc, 0xe4, 0xa3, 0x0d, 0xc7, + 0x63, 0xd4, 0x8f, 0xee, 0x0f, 0x82, 0x0d, 0x12, 0xb2, 0x8d, 0xd1, 0xe6, 0xc6, 0x80, 0xfa, 0x94, + 0x93, 0x88, 0xba, 0x76, 0xc8, 0x83, 0x28, 0x40, 0xb7, 0x8b, 0x74, 0x3b, 0xa1, 0xff, 0x64, 0x10, + 0xd8, 0x24, 0x64, 0xf6, 0x68, 0xf3, 0xd6, 0xfd, 0x01, 0x8b, 0x8e, 0xe2, 0x03, 0xdb, 0x09, 0x86, + 0x1b, 0x83, 0x60, 0x10, 0x6c, 0x28, 0xad, 0x83, 0xf8, 0x50, 0x7d, 0xa9, 0x0f, 0xf5, 0x2b, 0xb1, + 0x76, 0xcb, 0x3a, 0x7e, 0x53, 0xd8, 0x2c, 0x59, 0xcc, 0x09, 0x38, 0x9d, 0xb3, 0xe2, 0xad, 0x07, + 0x39, 0x67, 0x48, 0x9c, 0x23, 0xe6, 0x53, 0x7e, 0xb2, 0x11, 0x1e, 0x0f, 0xa4, 0x40, 0x6c, 0x0c, + 0x69, 0x44, 0xe6, 0x68, 0x59, 0xbf, 0x37, 0xa0, 0xd1, 0xd9, 0xee, 0x75, 0x3b, 0x5e, 0x2c, 0x22, + 0xca, 0xbb, 0xfe, 0x61, 0x80, 0xbe, 0x0d, 0xd5, 0x90, 0x07, 0x23, 0xe6, 0x52, 0xde, 0x34, 0xd6, + 0x8c, 0xf5, 0x5a, 0x7b, 0xed, 0xe5, 0xd8, 0x2c, 0x4d, 0xc6, 0x66, 0xb5, 0xa7, 0xe5, 0xa7, 0x63, + 0x73, 0x59, 0xaa, 0xa5, 0xdf, 0x38, 0xd3, 0x40, 0x1b, 0x50, 0xf3, 0xc9, 0x90, 0x8a, 0x90, 0x38, + 0xb4, 0x79, 0x45, 0xa9, 0xaf, 0x6a, 0xf5, 0xda, 0xd3, 0x14, 0xc0, 0x39, 0x07, 0x3d, 0x84, 0xba, + 0x93, 0xac, 0x2e, 0xe1, 0x66, 0x59, 0xa9, 0x5c, 0xd7, 0x2a, 0xf5, 0x4e, 0x0e, 0xe1, 0x22, 0xcf, + 0xfa, 0x21, 0x7c, 0xa1, 0x43, 0x79, 0xc4, 0x0e, 0x99, 0x43, 0x22, 0xda, 0xe3, 0x6c, 0x44, 0x22, + 0xfa, 0x1e, 0x3d, 0x41, 0x6d, 0xa8, 0x52, 0xdf, 0x09, 0x5c, 0xe6, 0x0f, 0xf4, 0xf6, 0xef, 0xa6, + 0xdb, 0x7f, 0xa4, 0xe5, 0xa7, 0x63, 0x13, 0xe5, 0x1a, 0xa9, 0x14, 0x67, 0x7a, 0xd6, 0xf3, 0x05, + 0x68, 0x14, 0xac, 0xf7, 0x43, 0xea, 0xa0, 0x3b, 0xb0, 0x40, 0x3c, 0x46, 0x84, 0x36, 0xba, 0xa2, + 0x8d, 0x2e, 0x6c, 0x4b, 0x21, 0x4e, 0x30, 0xf4, 0x21, 0xd4, 0x98, 0x10, 0x31, 0xe5, 0x98, 0x1e, + 0xaa, 0xd3, 0xd7, 0xb7, 0xee, 0xdb, 0x89, 0x67, 0x94, 0xef, 0xa5, 0xf7, 0xec, 0xd1, 0xa6, 0xbd, + 0x7f, 0x12, 0x52, 0x77, 0x37, 0x70, 0x88, 0xb7, 0x77, 0xf0, 0x53, 0xea, 0x44, 0x98, 0x1e, 0x52, + 0x4e, 0x7d, 0x87, 0xb6, 0x57, 0xe4, 0x45, 0x75, 0x53, 0x1b, 0x38, 0x37, 0x87, 0xb6, 0x00, 0x04, + 0x75, 0x38, 0x8d, 0x0a, 0xf7, 0x84, 0xf4, 0x2e, 0xa0, 0x9f, 0x21, 0xb8, 0xc0, 0x42, 0xdf, 0x87, + 0x25, 0x11, 0xab, 0x15, 0x9a, 0x15, 0xb5, 0x9b, 0xaf, 0xda, 0x9f, 0x19, 0x99, 0xf6, 0x07, 0x0f, + 0xbf, 0xfe, 0xad, 0x7e, 0xa2, 0xd1, 0xae, 0x4f, 0xc6, 0xe6, 0x92, 0xfe, 0xc0, 0xa9, 0x1d, 0xf4, + 0x01, 0x54, 0xdd, 0x98, 0x93, 0x88, 0x05, 0x7e, 0x73, 0x41, 0xd9, 0xb4, 0x0b, 0x27, 0xcc, 0x62, + 0xcf, 0x0e, 0x8f, 0x07, 0x52, 0x20, 0x6c, 0x19, 0x7b, 0xd2, 0xf4, 0x8e, 0xd6, 0x6a, 0x2f, 0x4b, + 0x5f, 0xa4, 0x5f, 0x38, 0xb3, 0x86, 0xd6, 0xa1, 0xea, 0xfa, 0x42, 0x05, 0x49, 0x73, 0x69, 0xad, + 0xbc, 0x5e, 0xd3, 0xcc, 0xa7, 0x7d, 0x25, 0xc3, 0x19, 0x8a, 0x36, 0xa1, 0xce, 0xc2, 0x6d, 0xd7, + 0xe5, 0x54, 0x08, 0x2a, 0x9a, 0x55, 0x45, 0x6e, 0xc8, 0x78, 0xe9, 0xf6, 0x32, 0x31, 0x2e, 0x72, + 0xd0, 0x97, 0xa0, 0x12, 0x73, 0x26, 0x9a, 0x35, 0xc5, 0xad, 0x4e, 0xc6, 0x66, 0xe5, 0x19, 0xee, + 0x0a, 0xac, 0xa4, 0xe8, 0x2d, 0xb8, 0x4a, 0x87, 0x84, 0x79, 0xb9, 0x4d, 0x50, 0x3c, 0x34, 0x19, + 0x9b, 0x57, 0x1f, 0x4d, 0x21, 0x78, 0x86, 0x89, 0x5c, 0x80, 0x30, 0x0b, 0xa6, 0x66, 0x5d, 0x5d, + 0xc9, 0x83, 0x0b, 0xae, 0x79, 0x6e, 0xe8, 0xb6, 0xaf, 0x4a, 0x4f, 0xe6, 0xdf, 0xb8, 0x60, 0xd7, + 0xfa, 0x8b, 0x01, 0xf5, 0x62, 0x96, 0xde, 0x86, 0x72, 0xcc, 0x5c, 0x1d, 0x8c, 0x75, 0x1d, 0x06, + 0xe5, 0x67, 0xdd, 0x1d, 0x2c, 0xe5, 0x68, 0x0d, 0x2a, 0x32, 0xc5, 0x74, 0x06, 0x2e, 0x6b, 0xbc, + 0xa2, 0x02, 0x44, 0x21, 0xe8, 0x3b, 0xd0, 0xd0, 0xf9, 0xf4, 0x84, 0xf8, 0x64, 0x40, 0xb9, 0x68, + 0x96, 0xd5, 0x99, 0xaf, 0x4f, 0xc6, 0x66, 0xa3, 0x33, 0x0d, 0xe1, 0x59, 0x2e, 0xda, 0x85, 0x8a, + 0x43, 0x42, 0xa6, 0xc3, 0xca, 0xbe, 0xe8, 0xbc, 0xd3, 0x35, 0x26, 0xb9, 0x7f, 0x29, 0xc4, 0xca, + 0x8a, 0xf5, 0xab, 0x32, 0x64, 0x4b, 0xd2, 0x88, 0xb8, 0x24, 0x22, 0xff, 0xfd, 0x09, 0x1f, 0x42, + 0xdd, 0x65, 0x22, 0xf4, 0xc8, 0xc9, 0xbc, 0xca, 0xb2, 0x93, 0x43, 0xb8, 0xc8, 0x43, 0xdf, 0x2d, + 0xd4, 0xbf, 0x8a, 0xd2, 0xb9, 0x33, 0xa7, 0xfe, 0x35, 0xde, 0x09, 0x44, 0xc4, 0xfc, 0xc1, 0x9c, + 0x12, 0x78, 0x0f, 0x96, 0x82, 0x9f, 0xf9, 0x94, 0x77, 0x77, 0x54, 0x82, 0xd4, 0xda, 0x0d, 0xad, + 0xbf, 0xb4, 0x97, 0x88, 0x71, 0x8a, 0xcb, 0x6a, 0xa9, 0x7e, 0xca, 0x7a, 0xd0, 0x5c, 0x9c, 0xae, + 0x96, 0x7b, 0x29, 0x80, 0x73, 0x8e, 0x3c, 0x13, 0x09, 0xd9, 0x23, 0xdf, 0x0d, 0x03, 0xe6, 0x47, + 0xcd, 0xa5, 0xe9, 0x33, 0x6d, 0xf7, 0xba, 0x29, 0x84, 0x8b, 0x3c, 0xf4, 0x06, 0x54, 0x1d, 0xd2, + 0x8e, 0x7d, 0xd7, 0xa3, 0xcd, 0xaa, 0xd2, 0xb9, 0x96, 0x9e, 0xa9, 0xb3, 0x9d, 0xc8, 0x71, 0xc6, + 0xb0, 0xfe, 0x5d, 0x86, 0x5a, 0x27, 0xf0, 0x5d, 0xa6, 0xd2, 0x72, 0x13, 0x2a, 0x91, 0xdc, 0x5e, + 0x72, 0x17, 0xb7, 0xd3, 0x8b, 0x96, 0xdb, 0x39, 0x1d, 0x9b, 0x2b, 0x19, 0x51, 0x6d, 0x55, 0x51, + 0xd1, 0x8f, 0x61, 0x51, 0x44, 0x24, 0x8a, 0x85, 0xbe, 0x80, 0xb7, 0xb5, 0xd2, 0x62, 0x5f, 0x49, + 0x4f, 0xc7, 0xe6, 0xa5, 0xda, 0x95, 0x9d, 0xd9, 0x4e, 0xf4, 0xb0, 0xb6, 0x8a, 0xde, 0x05, 0x14, + 0x1c, 0x08, 0xca, 0x47, 0xd4, 0x7d, 0x9c, 0x74, 0x34, 0x59, 0x8d, 0xa4, 0x83, 0xcb, 0xed, 0x5b, + 0x7a, 0x2d, 0xb4, 0x77, 0x86, 0x81, 0xe7, 0x68, 0xa1, 0x6d, 0xa8, 0x0a, 0x3a, 0xa2, 0x9c, 0x45, + 0x27, 0xda, 0x03, 0x5f, 0x49, 0xaf, 0xa6, 0xaf, 0xe5, 0xa7, 0x63, 0x73, 0x35, 0xdf, 0x8a, 0x16, + 0xe2, 0x4c, 0x0d, 0x8d, 0x00, 0x79, 0x44, 0x44, 0xfb, 0x9c, 0xf8, 0x22, 0xb9, 0x0a, 0x36, 0xa4, + 0xca, 0x37, 0xaa, 0xe0, 0x5e, 0xa6, 0x38, 0x4a, 0x8d, 0x7c, 0xeb, 0xbb, 0x67, 0xac, 0xe1, 0x39, + 0x2b, 0xa0, 0xbb, 0xb0, 0xc8, 0x29, 0x11, 0x81, 0xaf, 0x7d, 0x7a, 0x35, 0xbd, 0x66, 0xac, 0xa4, + 0x58, 0xa3, 0x32, 0x20, 0x87, 0x54, 0x08, 0x32, 0xa0, 0xcd, 0xda, 0x74, 0x40, 0x3e, 0x49, 0xc4, + 0x38, 0xc5, 0xad, 0x7f, 0x1a, 0xd0, 0x78, 0x87, 0x12, 0x2f, 0x3a, 0xea, 0x1c, 0x51, 0xe7, 0x58, + 0x75, 0xbe, 0x5f, 0x1b, 0x70, 0x93, 0x53, 0xe2, 0x06, 0xbe, 0x77, 0x32, 0x83, 0xa9, 0xec, 0xac, + 0x6f, 0x7d, 0xe3, 0x82, 0xf4, 0xc7, 0xf3, 0xb5, 0xdb, 0xa6, 0xde, 0xc7, 0xcd, 0x73, 0x08, 0xf8, + 0xbc, 0x75, 0xd1, 0x63, 0x58, 0x75, 0x99, 0x20, 0x07, 0x1e, 0x7d, 0x9f, 0xb3, 0x88, 0x2a, 0x40, + 0x95, 0x82, 0x6a, 0xfb, 0x8b, 0xda, 0xe8, 0xea, 0xce, 0x2c, 0x01, 0x9f, 0xd5, 0xb1, 0xfe, 0x65, + 0x40, 0xad, 0x3b, 0x24, 0x03, 0xaa, 0xaa, 0xea, 0x1d, 0x58, 0x60, 0xf2, 0x63, 0xb6, 0xc9, 0x2b, + 0x06, 0x4e, 0x30, 0xb4, 0x0f, 0x55, 0x8f, 0xf9, 0x94, 0x0c, 0xa8, 0x68, 0x5e, 0x59, 0x2b, 0xaf, + 0xd7, 0xb7, 0xee, 0x5e, 0x70, 0xfe, 0xdd, 0x84, 0x9e, 0x27, 0x9d, 0x16, 0x08, 0x9c, 0x59, 0x42, + 0x43, 0x68, 0x84, 0xb1, 0xe7, 0x75, 0x38, 0x75, 0xa9, 0x1f, 0x31, 0xe2, 0x09, 0x15, 0xd0, 0x17, + 0xd7, 0xd6, 0xde, 0xb4, 0x56, 0x52, 0xbf, 0x67, 0x84, 0x78, 0xd6, 0xb6, 0xf5, 0x4b, 0x03, 0x96, + 0xf4, 0x2e, 0xd0, 0x53, 0x58, 0x70, 0x8e, 0x08, 0xf3, 0x9b, 0x86, 0x3a, 0xcd, 0xbd, 0x0b, 0x16, + 0x4c, 0x46, 0x16, 0x55, 0xc7, 0xb3, 0x0b, 0xea, 0x48, 0x7d, 0x9c, 0x98, 0x41, 0x36, 0x80, 0x13, + 0xf8, 0x11, 0x91, 0xb1, 0x9e, 0x5c, 0x51, 0x2d, 0xe9, 0x6d, 0x9d, 0x4c, 0x8a, 0x0b, 0x0c, 0xeb, + 0xb7, 0x06, 0x54, 0xb5, 0xd1, 0x1d, 0xe9, 0x82, 0x01, 0x0f, 0xe2, 0x70, 0xd6, 0x05, 0x8f, 0xa5, + 0x10, 0x27, 0x98, 0x2c, 0xfe, 0xc7, 0xcc, 0x77, 0x67, 0x8b, 0xff, 0x7b, 0xcc, 0x77, 0xb1, 0x42, + 0xa6, 0xe7, 0xd0, 0xf2, 0x25, 0xe6, 0xd0, 0xb4, 0x9f, 0x54, 0xce, 0xeb, 0x27, 0xd6, 0xef, 0x0c, + 0x80, 0xfc, 0xec, 0xe8, 0x7d, 0xa8, 0x72, 0x2a, 0x82, 0x98, 0x3b, 0x54, 0xa7, 0xc1, 0xbd, 0x0b, + 0xd3, 0x20, 0xa1, 0x77, 0x77, 0xf2, 0x48, 0x48, 0x65, 0x38, 0x33, 0x86, 0x9e, 0x40, 0x99, 0x67, + 0xe3, 0xa3, 0x7d, 0x29, 0x67, 0xe4, 0xf3, 0x63, 0xd6, 0x28, 0xe5, 0xf4, 0x28, 0xed, 0x58, 0x2e, + 0x34, 0x66, 0x48, 0xd3, 0x97, 0x63, 0x7c, 0x8e, 0xcb, 0x39, 0xb7, 0xd9, 0x5a, 0xff, 0x30, 0x60, + 0x36, 0xe8, 0x3e, 0xff, 0x32, 0xef, 0x02, 0x92, 0xf5, 0x99, 0x39, 0x74, 0xdb, 0x71, 0x82, 0xd8, + 0x4f, 0x46, 0xdd, 0x64, 0xd1, 0xac, 0x38, 0xf6, 0xcf, 0x30, 0xf0, 0x1c, 0x2d, 0xf4, 0xa3, 0x74, + 0x5c, 0xc6, 0xf4, 0x30, 0x19, 0x6d, 0xea, 0x5b, 0xeb, 0xf3, 0x66, 0xf1, 0xb9, 0x63, 0xf8, 0xcc, + 0x60, 0x2d, 0x6d, 0xe0, 0x82, 0x3d, 0xeb, 0x95, 0x01, 0xe7, 0x15, 0x2d, 0xf4, 0x4d, 0x58, 0x09, + 0x29, 0x67, 0x81, 0xdb, 0xa7, 0x4e, 0xe0, 0xbb, 0xc9, 0x8b, 0x61, 0xa1, 0xbd, 0x3a, 0x19, 0x9b, + 0x2b, 0xbd, 0x22, 0x80, 0xa7, 0x79, 0x72, 0x0a, 0x8d, 0xd8, 0x90, 0x06, 0x71, 0x94, 0x6a, 0x5e, + 0x51, 0x9a, 0x6a, 0x0a, 0xdd, 0x9f, 0x42, 0xf0, 0x0c, 0x13, 0x7d, 0x0f, 0xae, 0x1d, 0x12, 0xe6, + 0xc5, 0x9c, 0xee, 0x1f, 0x71, 0x2a, 0x8e, 0x02, 0xcf, 0x55, 0x61, 0xbf, 0xd0, 0xbe, 0x31, 0x19, + 0x9b, 0xd7, 0xde, 0x9e, 0xc1, 0xf0, 0x19, 0xb6, 0xf5, 0x67, 0x03, 0x20, 0x8f, 0xd0, 0xcb, 0xe5, + 0xe1, 0x3d, 0x58, 0x1a, 0x51, 0x2e, 0x64, 0xf7, 0xbd, 0x32, 0xdd, 0x59, 0x7e, 0x90, 0x88, 0x71, + 0x8a, 0x67, 0x21, 0x54, 0x3e, 0x77, 0x5e, 0x4b, 0x93, 0xba, 0x72, 0x6e, 0x52, 0x3f, 0x80, 0x05, + 0xe1, 0x04, 0x21, 0xd5, 0x63, 0x45, 0x2b, 0xdd, 0x53, 0x5f, 0x0a, 0xe5, 0x30, 0x92, 0xee, 0x5f, + 0x09, 0x70, 0x42, 0xb6, 0xfe, 0x64, 0x40, 0x6d, 0x7f, 0xb7, 0xdf, 0x09, 0xfc, 0x43, 0x36, 0x98, + 0x7e, 0xa2, 0x19, 0xff, 0xdb, 0x27, 0xda, 0x11, 0x2c, 0x3b, 0xf9, 0x64, 0x9f, 0x76, 0x07, 0xfb, + 0xf2, 0x8f, 0x01, 0xd5, 0x15, 0x6f, 0xe8, 0x63, 0x2d, 0x17, 0x00, 0x81, 0xa7, 0x2c, 0x5b, 0x5f, + 0x86, 0x9a, 0x0c, 0x88, 0xbd, 0xc3, 0x1d, 0x72, 0xf2, 0xd6, 0x8d, 0xdf, 0x7c, 0x62, 0x96, 0x7e, + 0xf1, 0xc2, 0x2c, 0x3d, 0x7f, 0x61, 0x96, 0x3e, 0x79, 0x61, 0x96, 0x3e, 0xfe, 0xeb, 0x5a, 0xc9, + 0xfa, 0x83, 0x01, 0x37, 0xd4, 0x21, 0x66, 0xb3, 0xff, 0x0d, 0xa8, 0x92, 0x90, 0x3d, 0x2e, 0x38, + 0x37, 0xab, 0x46, 0xdb, 0xbd, 0x6e, 0xe2, 0xdf, 0x8c, 0xf1, 0xff, 0x29, 0xb5, 0x7f, 0x2c, 0x43, + 0xbd, 0xf0, 0x14, 0x95, 0x29, 0x15, 0xf0, 0x01, 0xf1, 0xd9, 0x47, 0x6a, 0x68, 0x13, 0xaa, 0x53, + 0xd5, 0x92, 0x94, 0xda, 0x2b, 0x02, 0x78, 0x9a, 0x87, 0xbe, 0x06, 0x35, 0x55, 0x12, 0x38, 0xa3, + 0x69, 0x27, 0x52, 0xee, 0xeb, 0xa4, 0x42, 0x9c, 0xe3, 0xa8, 0x0b, 0xd7, 0x8b, 0xda, 0xc4, 0x7b, + 0xe6, 0xb3, 0x28, 0x7d, 0x16, 0xdd, 0x9c, 0x8c, 0xcd, 0xeb, 0x7b, 0x67, 0x61, 0x3c, 0x4f, 0x47, + 0xb6, 0x40, 0x4f, 0xc6, 0x0e, 0x8b, 0xe4, 0xc2, 0x95, 0xbc, 0x05, 0xee, 0x66, 0x52, 0x5c, 0x60, + 0xc8, 0x7d, 0xaa, 0xf7, 0x83, 0xef, 0x50, 0x39, 0x34, 0x67, 0xfb, 0xec, 0xa5, 0x42, 0x9c, 0xe3, + 0xf2, 0xe9, 0x26, 0x22, 0x4e, 0x69, 0x94, 0x3f, 0x57, 0x17, 0xf3, 0xa7, 0x5b, 0x7f, 0x1a, 0xc2, + 0xb3, 0x5c, 0xf9, 0x7a, 0x0e, 0x03, 0x11, 0x11, 0xaf, 0x13, 0xb8, 0xd9, 0x53, 0x5b, 0xbd, 0x9e, + 0x7b, 0xb9, 0x18, 0x17, 0x39, 0xe8, 0x4d, 0x58, 0x16, 0x94, 0x33, 0xe2, 0x3d, 0x8d, 0x87, 0x07, + 0x94, 0xeb, 0x79, 0x33, 0x0b, 0xd4, 0x7e, 0x01, 0xc3, 0x53, 0xcc, 0x76, 0xe7, 0xe5, 0xeb, 0x56, + 0xe9, 0xd5, 0xeb, 0x56, 0xe9, 0xd3, 0xd7, 0xad, 0xd2, 0xc7, 0x93, 0x96, 0xf1, 0x72, 0xd2, 0x32, + 0x5e, 0x4d, 0x5a, 0xc6, 0xa7, 0x93, 0x96, 0xf1, 0xb7, 0x49, 0xcb, 0x78, 0xfe, 0xf7, 0x56, 0xe9, + 0xc3, 0xdb, 0x9f, 0xf9, 0xf7, 0xda, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x1e, 0xcb, 0xee, 0x96, + 0x7e, 0x13, 0x00, 0x00, +} + +func (m *CAPIClusterInfo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *CAPIClusterInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *CAPIClusterInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + i -= len(m.ClusterName) + copy(dAtA[i:], m.ClusterName) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.ClusterName))) + i-- + dAtA[i] = 0x1a + i -= len(m.Namespace) + copy(dAtA[i:], m.Namespace) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Namespace))) + i-- + dAtA[i] = 0x12 + i -= len(m.Provider) + copy(dAtA[i:], m.Provider) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Provider))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil } func (m *CertificatePrivateKey) Marshal() (dAtA []byte, err error) { @@ -747,18 +852,6 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x3a } } - if m.RenewBefore != nil { - { - size, err := m.RenewBefore.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - } if m.Duration != nil { { size, err := m.Duration.MarshalToSizedBuffer(dAtA[:i]) @@ -808,6 +901,60 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *ClusterInfo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *ClusterInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ClusterInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.CAPI != nil { + { + size, err := m.CAPI.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if len(m.ClusterManagers) > 0 { + for iNdEx := len(m.ClusterManagers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.ClusterManagers[iNdEx]) + copy(dAtA[i:], m.ClusterManagers[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.ClusterManagers[iNdEx]))) + i-- + dAtA[i] = 0x1a + } + } + i -= len(m.Name) + copy(dAtA[i:], m.Name) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Name))) + i-- + dAtA[i] = 0x12 + i -= len(m.UID) + copy(dAtA[i:], m.UID) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.UID))) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + func (m *ClusterMetadata) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -828,6 +975,26 @@ func (m *ClusterMetadata) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.CABundle) + copy(dAtA[i:], m.CABundle) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.CABundle))) + i-- + dAtA[i] = 0x42 + i -= len(m.APIEndpoint) + copy(dAtA[i:], m.APIEndpoint) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.APIEndpoint))) + i-- + dAtA[i] = 0x3a + i -= len(m.OwnerType) + copy(dAtA[i:], m.OwnerType) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.OwnerType))) + i-- + dAtA[i] = 0x32 + i -= len(m.OwnerID) + copy(dAtA[i:], m.OwnerID) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.OwnerID))) + i-- + dAtA[i] = 0x2a i -= len(m.Provider) copy(dAtA[i:], m.Provider) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Provider))) @@ -1499,6 +1666,21 @@ func encodeVarintGenerated(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } +func (m *CAPIClusterInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Provider) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.Namespace) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.ClusterName) + n += 1 + l + sovGenerated(uint64(l)) + return n +} + func (m *CertificatePrivateKey) Size() (n int) { if m == nil { return 0 @@ -1532,10 +1714,6 @@ func (m *CertificateSpec) Size() (n int) { l = m.Duration.Size() n += 1 + l + sovGenerated(uint64(l)) } - if m.RenewBefore != nil { - l = m.RenewBefore.Size() - n += 1 + l + sovGenerated(uint64(l)) - } if len(m.DNSNames) > 0 { for _, s := range m.DNSNames { l = len(s) @@ -1567,6 +1745,29 @@ func (m *CertificateSpec) Size() (n int) { return n } +func (m *ClusterInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.UID) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.Name) + n += 1 + l + sovGenerated(uint64(l)) + if len(m.ClusterManagers) > 0 { + for _, s := range m.ClusterManagers { + l = len(s) + n += 1 + l + sovGenerated(uint64(l)) + } + } + if m.CAPI != nil { + l = m.CAPI.Size() + n += 1 + l + sovGenerated(uint64(l)) + } + return n +} + func (m *ClusterMetadata) Size() (n int) { if m == nil { return 0 @@ -1581,6 +1782,14 @@ func (m *ClusterMetadata) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.Provider) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.OwnerID) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.OwnerType) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.APIEndpoint) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.CABundle) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -1854,6 +2063,18 @@ func sovGenerated(x uint64) (n int) { func sozGenerated(x uint64) (n int) { return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } +func (this *CAPIClusterInfo) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&CAPIClusterInfo{`, + `Provider:` + fmt.Sprintf("%v", this.Provider) + `,`, + `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, + `ClusterName:` + fmt.Sprintf("%v", this.ClusterName) + `,`, + `}`, + }, "") + return s +} func (this *CertificatePrivateKey) String() string { if this == nil { return "nil" @@ -1874,7 +2095,6 @@ func (this *CertificateSpec) String() string { `SecretName:` + fmt.Sprintf("%v", this.SecretName) + `,`, `Subject:` + strings.Replace(this.Subject.String(), "X509Subject", "X509Subject", 1) + `,`, `Duration:` + strings.Replace(fmt.Sprintf("%v", this.Duration), "Duration", "v11.Duration", 1) + `,`, - `RenewBefore:` + strings.Replace(fmt.Sprintf("%v", this.RenewBefore), "Duration", "v11.Duration", 1) + `,`, `DNSNames:` + fmt.Sprintf("%v", this.DNSNames) + `,`, `IPAddresses:` + fmt.Sprintf("%v", this.IPAddresses) + `,`, `URIs:` + fmt.Sprintf("%v", this.URIs) + `,`, @@ -1884,6 +2104,19 @@ func (this *CertificateSpec) String() string { }, "") return s } +func (this *ClusterInfo) String() string { + if this == nil { + return "nil" + } + s := strings.Join([]string{`&ClusterInfo{`, + `UID:` + fmt.Sprintf("%v", this.UID) + `,`, + `Name:` + fmt.Sprintf("%v", this.Name) + `,`, + `ClusterManagers:` + fmt.Sprintf("%v", this.ClusterManagers) + `,`, + `CAPI:` + strings.Replace(this.CAPI.String(), "CAPIClusterInfo", "CAPIClusterInfo", 1) + `,`, + `}`, + }, "") + return s +} func (this *ClusterMetadata) String() string { if this == nil { return "nil" @@ -1893,6 +2126,10 @@ func (this *ClusterMetadata) String() string { `Name:` + fmt.Sprintf("%v", this.Name) + `,`, `DisplayName:` + fmt.Sprintf("%v", this.DisplayName) + `,`, `Provider:` + fmt.Sprintf("%v", this.Provider) + `,`, + `OwnerID:` + fmt.Sprintf("%v", this.OwnerID) + `,`, + `OwnerType:` + fmt.Sprintf("%v", this.OwnerType) + `,`, + `APIEndpoint:` + fmt.Sprintf("%v", this.APIEndpoint) + `,`, + `CABundle:` + fmt.Sprintf("%v", this.CABundle) + `,`, `}`, }, "") return s @@ -2089,7 +2326,7 @@ func valueToStringGenerated(v interface{}) string { pv := reflect.Indirect(rv).Interface() return fmt.Sprintf("*%v", pv) } -func (m *CertificatePrivateKey) Unmarshal(dAtA []byte) error { +func (m *CAPIClusterInfo) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -2112,15 +2349,15 @@ func (m *CertificatePrivateKey) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: CertificatePrivateKey: wiretype end group for non-group") + return fmt.Errorf("proto: CAPIClusterInfo: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: CertificatePrivateKey: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: CAPIClusterInfo: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Encoding", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Provider", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2148,26 +2385,172 @@ func (m *CertificatePrivateKey) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Encoding = PrivateKeyEncoding(dAtA[iNdEx:postIndex]) + m.Provider = CAPIProvider(dAtA[iNdEx:postIndex]) iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType) } - if (skippy < 0) || (iNdEx+skippy) < 0 { + 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 } - if (iNdEx + skippy) > l { + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { return io.ErrUnexpectedEOF } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF + m.Namespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ClusterName", 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.ClusterName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *CertificatePrivateKey) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: CertificatePrivateKey: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: CertificatePrivateKey: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Encoding", 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.Encoding = PrivateKeyEncoding(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF } return nil } @@ -2372,11 +2755,11 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: + case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RenewBefore", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field DNSNames", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2386,31 +2769,59 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthGenerated } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthGenerated } if postIndex > l { return io.ErrUnexpectedEOF } - if m.RenewBefore == nil { - m.RenewBefore = &v11.Duration{} + m.DNSNames = append(m.DNSNames, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field IPAddresses", wireType) } - if err := m.RenewBefore.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + 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.IPAddresses = append(m.IPAddresses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 7: + case 9: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DNSNames", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field URIs", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2438,11 +2849,11 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.DNSNames = append(m.DNSNames, string(dAtA[iNdEx:postIndex])) + m.URIs = append(m.URIs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 8: + case 10: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IPAddresses", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EmailAddresses", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2470,11 +2881,97 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.IPAddresses = append(m.IPAddresses, string(dAtA[iNdEx:postIndex])) + m.EmailAddresses = append(m.EmailAddresses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 9: + case 11: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field URIs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PrivateKey", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.PrivateKey == nil { + m.PrivateKey = &CertificatePrivateKey{} + } + if err := m.PrivateKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipGenerated(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthGenerated + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *ClusterInfo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ClusterInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ClusterInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UID", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2502,11 +2999,11 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.URIs = append(m.URIs, string(dAtA[iNdEx:postIndex])) + m.UID = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 10: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EmailAddresses", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2534,11 +3031,43 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.EmailAddresses = append(m.EmailAddresses, string(dAtA[iNdEx:postIndex])) + m.Name = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 11: + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PrivateKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ClusterManagers", 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.ClusterManagers = append(m.ClusterManagers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CAPI", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2565,10 +3094,10 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.PrivateKey == nil { - m.PrivateKey = &CertificatePrivateKey{} + if m.CAPI == nil { + m.CAPI = &CAPIClusterInfo{} } - if err := m.PrivateKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.CAPI.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -2750,6 +3279,134 @@ func (m *ClusterMetadata) Unmarshal(dAtA []byte) error { } m.Provider = HostingProvider(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OwnerID", 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.OwnerID = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field OwnerType", 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.OwnerType = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field APIEndpoint", 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.APIEndpoint = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CABundle", 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.CABundle = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/api/v1/generated.proto b/api/v1/generated.proto index d8fc1a444..4750fd4ff 100644 --- a/api/v1/generated.proto +++ b/api/v1/generated.proto @@ -27,6 +27,14 @@ import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; // Package-wide variables from generator "generated". option go_package = "kmodules.xyz/client-go/api/v1"; +message CAPIClusterInfo { + optional string provider = 1; + + optional string namespace = 2; + + optional string clusterName = 3; +} + // CertificatePrivateKey contains configuration options for private keys // used by the Certificate controller. // This allows control of how private keys are rotated. @@ -62,10 +70,6 @@ message CertificateSpec { // +optional optional k8s.io.apimachinery.pkg.apis.meta.v1.Duration duration = 5; - // Certificate renew before expiration duration - // +optional - optional k8s.io.apimachinery.pkg.apis.meta.v1.Duration renewBefore = 6; - // DNSNames is a list of subject alt names to be used on the Certificate. // +optional repeated string dnsNames = 7; @@ -87,6 +91,18 @@ message CertificateSpec { optional CertificatePrivateKey privateKey = 11; } +// ClusterInfo used in ace-installer +message ClusterInfo { + optional string uid = 1; + + optional string name = 2; + + repeated string clusterManagers = 3; + + // +optional + optional CAPIClusterInfo capi = 4; +} + message ClusterMetadata { optional string uid = 1; @@ -95,6 +111,14 @@ message ClusterMetadata { optional string displayName = 3; optional string provider = 4; + + optional string ownerID = 5; + + optional string ownerType = 6; + + optional string apiEndpoint = 7; + + optional string caBundle = 8; } // Condition defines an observation of a object operational state. diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go index f44550fbd..5a89f3e10 100644 --- a/api/v1/zz_generated.deepcopy.go +++ b/api/v1/zz_generated.deepcopy.go @@ -76,11 +76,6 @@ func (in *CertificateSpec) DeepCopyInto(out *CertificateSpec) { *out = new(metav1.Duration) **out = **in } - if in.RenewBefore != nil { - in, out := &in.RenewBefore, &out.RenewBefore - *out = new(metav1.Duration) - **out = **in - } if in.DNSNames != nil { in, out := &in.DNSNames, &out.DNSNames *out = make([]string, len(*in))