From e29c27245633567eab3df36c8f83ced324537b61 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Thu, 6 Aug 2020 01:14:37 -0700 Subject: [PATCH] Update Kubernetes v1.18.3 dependencies (#34) Signed-off-by: 1gtm <1gtm@appscode.com> --- .../v1alpha1/openapi_generated.go | 7 + apis/stash/v1alpha1/openapi_generated.go | 7 + apis/stash/v1beta1/openapi_generated.go | 7 + go.mod | 2 +- go.sum | 4 +- .../client-go/api/v1/certificates.go | 21 +- .../client-go/api/v1/generated.pb.go | 183 +++++++++++------- .../client-go/api/v1/generated.proto | 21 +- .../client-go/api/v1/openapi_generated.go | 7 + vendor/modules.txt | 2 +- 10 files changed, 172 insertions(+), 89 deletions(-) diff --git a/apis/repositories/v1alpha1/openapi_generated.go b/apis/repositories/v1alpha1/openapi_generated.go index 3eee197a9..61e67d42a 100644 --- a/apis/repositories/v1alpha1/openapi_generated.go +++ b/apis/repositories/v1alpha1/openapi_generated.go @@ -15594,6 +15594,13 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, + "keyEncoding": { + SchemaProps: spec.SchemaProps{ + Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", + Type: []string{"string"}, + Format: "", + }, + }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", diff --git a/apis/stash/v1alpha1/openapi_generated.go b/apis/stash/v1alpha1/openapi_generated.go index bf26aa48a..adfc17f03 100644 --- a/apis/stash/v1alpha1/openapi_generated.go +++ b/apis/stash/v1alpha1/openapi_generated.go @@ -15606,6 +15606,13 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, + "keyEncoding": { + SchemaProps: spec.SchemaProps{ + Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", + Type: []string{"string"}, + Format: "", + }, + }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", diff --git a/apis/stash/v1beta1/openapi_generated.go b/apis/stash/v1beta1/openapi_generated.go index 94253cc33..006e9f6fe 100644 --- a/apis/stash/v1beta1/openapi_generated.go +++ b/apis/stash/v1beta1/openapi_generated.go @@ -15640,6 +15640,13 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, + "keyEncoding": { + SchemaProps: spec.SchemaProps{ + Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", + Type: []string{"string"}, + Format: "", + }, + }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", diff --git a/go.mod b/go.mod index d738d99f1..4af95369e 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( k8s.io/client-go v12.0.0+incompatible k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 k8s.io/kubernetes v1.18.3 - kmodules.xyz/client-go v0.0.0-20200730042423-9c59c231fe96 + kmodules.xyz/client-go v0.0.0-20200805154632-5bf10f227624 kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d diff --git a/go.sum b/go.sum index 5d070c576..0adf2495b 100644 --- a/go.sum +++ b/go.sum @@ -915,8 +915,8 @@ kmodules.xyz/client-go v0.0.0-20200521005126-35ce6bd4ed46/go.mod h1:sY/eoe4ktxZE kmodules.xyz/client-go v0.0.0-20200521065424-173e32c78a20/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk= kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= -kmodules.xyz/client-go v0.0.0-20200730042423-9c59c231fe96 h1:D7jxUvUOZDnWNFyG7mlhGkyDXlrtTgeugTFfbbs3rnU= -kmodules.xyz/client-go v0.0.0-20200730042423-9c59c231fe96/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= +kmodules.xyz/client-go v0.0.0-20200805154632-5bf10f227624 h1:ZIyizuhoEmGNdrlZTks8smohLJe/UpHqfOSj4yMGL7M= +kmodules.xyz/client-go v0.0.0-20200805154632-5bf10f227624/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 h1:v0S/+ftzL6Xrs9XevgchAOJyPKlRQXPiZf87xotj3X4= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk= diff --git a/vendor/kmodules.xyz/client-go/api/v1/certificates.go b/vendor/kmodules.xyz/client-go/api/v1/certificates.go index 9acdaf9b7..54d1ff7c0 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/certificates.go +++ b/vendor/kmodules.xyz/client-go/api/v1/certificates.go @@ -25,34 +25,41 @@ type CertificateSpec struct { // +optional SecretName string `json:"secretName,omitempty" protobuf:"bytes,2,opt,name=secretName"` + // KeyEncoding is the private key cryptography standards (PKCS) + // for this certificate's private key to be encoded in. + // If provided, allowed values are "pkcs1" and "pkcs8". + // If KeyEncoding is not specified, then PKCS#1 will be used by default. + // +optional + KeyEncoding string `json:"keyEncoding,omitempty" protobuf:"bytes,3,opt,name=keyEncoding"` + // Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name). // +optional - Subject *X509Subject `json:"subject,omitempty" protobuf:"bytes,3,opt,name=subject"` + Subject *X509Subject `json:"subject,omitempty" protobuf:"bytes,4,opt,name=subject"` // Certificate default Duration // +optional - Duration *metav1.Duration `json:"duration,omitempty" protobuf:"bytes,4,opt,name=duration"` + 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,5,opt,name=renewBefore"` + 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,6,rep,name=dnsNames"` + DNSNames []string `json:"dnsNames,omitempty" protobuf:"bytes,7,rep,name=dnsNames"` // IPAddresses is a list of IP addresses to be used on the Certificate // +optional - IPAddresses []string `json:"ipAddresses,omitempty" protobuf:"bytes,7,rep,name=ipAddresses"` + IPAddresses []string `json:"ipAddresses,omitempty" protobuf:"bytes,8,rep,name=ipAddresses"` // URISANs is a list of URI Subject Alternative Names to be set on this // Certificate. // +optional - URISANs []string `json:"uriSANs,omitempty" protobuf:"bytes,8,rep,name=uriSANs"` + URISANs []string `json:"uriSANs,omitempty" protobuf:"bytes,9,rep,name=uriSANs"` // EmailSANs is a list of email subjectAltNames to be set on the Certificate. // +optional - EmailSANs []string `json:"emailSANs,omitempty" protobuf:"bytes,9,rep,name=emailSANs"` + EmailSANs []string `json:"emailSANs,omitempty" protobuf:"bytes,10,rep,name=emailSANs"` } // X509Subject Full X509 name specification 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 9243ef5c2..16995356d 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -167,64 +167,65 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 899 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xdf, 0x6e, 0xe3, 0xc4, - 0x17, 0x6e, 0x9a, 0x36, 0x7f, 0x26, 0xe9, 0x46, 0xbf, 0xe9, 0x4f, 0xc2, 0xaa, 0x44, 0x5c, 0x82, - 0x40, 0x61, 0x51, 0x1d, 0x5a, 0x81, 0xd8, 0xbd, 0xe0, 0xa2, 0x09, 0x08, 0x15, 0x95, 0xb6, 0x4c, - 0xba, 0xd2, 0x6a, 0x6f, 0xd0, 0xc4, 0x3e, 0x71, 0x87, 0x3a, 0x1e, 0x6b, 0x66, 0x1c, 0xc8, 0x5e, - 0xf1, 0x08, 0xbc, 0x07, 0x0f, 0x42, 0x2f, 0x97, 0xbb, 0xbd, 0xb2, 0xa8, 0x79, 0x0b, 0x6e, 0x40, - 0x33, 0x76, 0x62, 0x67, 0x1b, 0xad, 0x10, 0x77, 0x9e, 0xef, 0xfb, 0xce, 0x77, 0xc6, 0xe7, 0x9c, - 0x39, 0xe8, 0xe8, 0x76, 0xc6, 0xbd, 0x38, 0x00, 0xe9, 0xfc, 0xb4, 0x78, 0x39, 0x70, 0x03, 0x06, - 0xa1, 0x3a, 0xf2, 0xf9, 0x80, 0x46, 0x6c, 0x30, 0x3f, 0x1e, 0xf8, 0x10, 0x82, 0xa0, 0x0a, 0x3c, - 0x27, 0x12, 0x5c, 0x71, 0xfc, 0x6e, 0x59, 0xee, 0x64, 0xf2, 0xef, 0x7d, 0xee, 0xd0, 0x88, 0x39, - 0xf3, 0xe3, 0x83, 0x23, 0x9f, 0xa9, 0x9b, 0x78, 0xe2, 0xb8, 0x7c, 0x36, 0xf0, 0xb9, 0xcf, 0x07, - 0x26, 0x6a, 0x12, 0x4f, 0xcd, 0xc9, 0x1c, 0xcc, 0x57, 0xe6, 0x76, 0xd0, 0xbb, 0x7d, 0x22, 0x1d, - 0x96, 0x25, 0x73, 0xb9, 0x80, 0x0d, 0x19, 0x0f, 0x3e, 0x2d, 0x34, 0x33, 0xea, 0xde, 0xb0, 0x10, - 0xc4, 0x62, 0x10, 0xdd, 0xfa, 0x1a, 0x90, 0x83, 0x19, 0x28, 0xba, 0x21, 0xaa, 0xf7, 0xeb, 0x0e, - 0xea, 0x8c, 0x40, 0x28, 0x36, 0x65, 0x2e, 0x55, 0x30, 0x8e, 0xc0, 0xc5, 0xef, 0xa3, 0x5d, 0x1a, - 0x30, 0x2a, 0xad, 0xca, 0x61, 0xa5, 0xdf, 0x1c, 0xee, 0xdd, 0x25, 0xf6, 0x56, 0x9a, 0xd8, 0xbb, - 0xa7, 0x1a, 0x24, 0x19, 0x87, 0x4f, 0x10, 0x92, 0xe0, 0x0a, 0x50, 0x17, 0x74, 0x06, 0xd6, 0xb6, - 0x51, 0xe2, 0x5c, 0x89, 0xc6, 0x2b, 0x86, 0x94, 0x54, 0xf8, 0x3b, 0x54, 0x97, 0xf1, 0xe4, 0x07, - 0x70, 0x95, 0x55, 0x3d, 0xac, 0xf4, 0x5b, 0x27, 0x8f, 0x9d, 0xb7, 0x96, 0xc9, 0x79, 0xfe, 0xd9, - 0x27, 0x4f, 0xc7, 0x59, 0xc4, 0xb0, 0x95, 0x26, 0x76, 0x3d, 0x3f, 0x90, 0xa5, 0x0f, 0x7e, 0x8e, - 0x1a, 0x5e, 0x2c, 0xa8, 0x62, 0x3c, 0xb4, 0x76, 0x8c, 0xa7, 0xe3, 0x64, 0x85, 0x70, 0xca, 0x85, - 0x70, 0xa2, 0x5b, 0x5f, 0x03, 0xd2, 0xd1, 0x85, 0xd0, 0xd6, 0x5f, 0xe6, 0x51, 0xc3, 0x76, 0x9a, - 0xd8, 0x8d, 0xe5, 0x89, 0xac, 0xdc, 0x30, 0x45, 0x2d, 0x01, 0x21, 0xfc, 0x38, 0x84, 0x29, 0x17, - 0x60, 0xed, 0xfe, 0x27, 0xf3, 0x4e, 0x9a, 0xd8, 0x2d, 0x52, 0xd8, 0x90, 0xb2, 0x27, 0xee, 0xa3, - 0x86, 0x17, 0x4a, 0x5d, 0x1a, 0x69, 0xd5, 0x0e, 0xab, 0xfd, 0x66, 0x7e, 0x99, 0x8b, 0xb1, 0xc1, - 0xc8, 0x8a, 0xc5, 0xc7, 0xa8, 0xc5, 0xa2, 0x53, 0xcf, 0x13, 0x20, 0x25, 0x48, 0xab, 0x6e, 0xc4, - 0xc6, 0xfc, 0xec, 0x6a, 0x05, 0x93, 0xb2, 0x06, 0x7f, 0x80, 0xea, 0xb1, 0x60, 0xe3, 0xd3, 0x0b, - 0x69, 0x35, 0x8c, 0xdc, 0x14, 0xf0, 0x19, 0x39, 0xd3, 0x10, 0x59, 0x72, 0xf8, 0x63, 0xd4, 0x84, - 0x19, 0x65, 0x81, 0x11, 0x36, 0x8d, 0x70, 0x2f, 0x4d, 0xec, 0xe6, 0x57, 0x4b, 0x90, 0x14, 0x7c, - 0xef, 0xef, 0x6d, 0xd4, 0x1c, 0xf1, 0xd0, 0x63, 0xa6, 0x42, 0x87, 0x68, 0x47, 0x2d, 0x22, 0xc8, - 0xc7, 0xa4, 0x9d, 0x37, 0x7f, 0xe7, 0x7a, 0x11, 0x01, 0x31, 0x0c, 0x7e, 0x8a, 0x6a, 0x52, 0x51, - 0x15, 0xcb, 0x7c, 0x40, 0xde, 0xcb, 0x35, 0xb5, 0xb1, 0x41, 0xff, 0x4a, 0xec, 0xce, 0xca, 0x2e, - 0x83, 0x48, 0x1e, 0x80, 0xbf, 0x41, 0x98, 0x4f, 0x24, 0x88, 0x39, 0x78, 0x5f, 0x67, 0x33, 0xab, - 0x5b, 0xac, 0xc7, 0xa6, 0x3a, 0x3c, 0xc8, 0x6d, 0xf0, 0xe5, 0x03, 0x05, 0xd9, 0x10, 0x85, 0xe7, - 0x08, 0x07, 0x54, 0xaa, 0x6b, 0x41, 0x43, 0x69, 0x72, 0x5d, 0xb3, 0x19, 0xe4, 0xe3, 0xf2, 0xf8, - 0xdf, 0x75, 0x54, 0x47, 0x14, 0x79, 0xcf, 0x1f, 0xb8, 0x91, 0x0d, 0x19, 0xf0, 0x87, 0xa8, 0x26, - 0x80, 0x4a, 0x1e, 0x9a, 0xe9, 0x69, 0x0e, 0x1f, 0x2d, 0x7f, 0x9f, 0x18, 0x94, 0xe4, 0x2c, 0xfe, - 0x08, 0xd5, 0x67, 0x20, 0x25, 0xf5, 0xc1, 0xaa, 0x19, 0x61, 0x27, 0x17, 0xd6, 0xbf, 0xcd, 0x60, - 0xb2, 0xe4, 0x7b, 0xbf, 0x57, 0x50, 0xf3, 0xfa, 0x7c, 0x3c, 0xe2, 0xe1, 0x94, 0xf9, 0xf8, 0x05, - 0x6a, 0x32, 0x29, 0x63, 0x10, 0x04, 0xa6, 0xa6, 0x0d, 0xad, 0x93, 0xa3, 0xd2, 0xff, 0x38, 0x7a, - 0x57, 0x98, 0xdb, 0x2f, 0x22, 0xf0, 0xce, 0xb9, 0x4b, 0x83, 0xcb, 0xec, 0xfd, 0xc0, 0x14, 0x04, - 0x84, 0x2e, 0x64, 0xbd, 0x3e, 0x5b, 0x7a, 0x90, 0xc2, 0x0e, 0xdf, 0xa0, 0xb6, 0x5b, 0x2c, 0x06, - 0xdd, 0xc1, 0x6a, 0xf6, 0x00, 0xde, 0xfa, 0x62, 0xdf, 0xd8, 0x25, 0xc3, 0xff, 0xe7, 0x7f, 0xd2, - 0x2e, 0x11, 0x92, 0xac, 0x39, 0xf7, 0x7e, 0xab, 0xa2, 0x56, 0xe9, 0xa5, 0xe3, 0xcf, 0xd1, 0x1e, - 0x17, 0x3e, 0x0d, 0xd9, 0x4b, 0xd3, 0x3e, 0xbd, 0x87, 0xf4, 0x58, 0xfe, 0x2f, 0x4d, 0xec, 0xbd, - 0xcb, 0x32, 0x41, 0xd6, 0x75, 0x7a, 0x96, 0x5d, 0x1e, 0x87, 0x4a, 0xb0, 0xfc, 0xbe, 0xf9, 0x2c, - 0x8f, 0x96, 0x20, 0x29, 0x78, 0x7c, 0x86, 0xf6, 0xcb, 0xd1, 0x34, 0x78, 0x16, 0x32, 0x25, 0xad, - 0xaa, 0x09, 0x7b, 0x27, 0x4d, 0xec, 0xfd, 0xcb, 0x87, 0x34, 0xd9, 0x14, 0x83, 0x1d, 0x84, 0x02, - 0x5d, 0x5c, 0xa6, 0x74, 0xe2, 0x1d, 0xe3, 0xf0, 0x48, 0xef, 0xc1, 0xf3, 0x15, 0x4a, 0x4a, 0x0a, - 0x7d, 0xcf, 0x48, 0xf0, 0x39, 0x0b, 0x5d, 0x90, 0xd6, 0x6e, 0x71, 0xcf, 0xab, 0x25, 0x48, 0x0a, - 0x1e, 0x7f, 0x81, 0x3a, 0x52, 0x09, 0x00, 0x55, 0x3c, 0xff, 0x6c, 0x57, 0xec, 0xa7, 0x89, 0xdd, - 0x19, 0xaf, 0x53, 0xe4, 0x4d, 0xad, 0xde, 0x1c, 0x11, 0x97, 0x8a, 0x06, 0x23, 0xee, 0xad, 0x6f, - 0x8e, 0xab, 0x02, 0x26, 0x65, 0x0d, 0x7e, 0x82, 0xda, 0x12, 0x04, 0xa3, 0xc1, 0x45, 0x3c, 0x9b, - 0x80, 0xb0, 0x1a, 0x66, 0x26, 0x57, 0x9d, 0x1c, 0x97, 0x38, 0xb2, 0xa6, 0x1c, 0xf6, 0xef, 0xee, - 0xbb, 0x5b, 0xaf, 0xee, 0xbb, 0x5b, 0xaf, 0xef, 0xbb, 0x5b, 0x3f, 0xa7, 0xdd, 0xca, 0x5d, 0xda, - 0xad, 0xbc, 0x4a, 0xbb, 0x95, 0xd7, 0x69, 0xb7, 0xf2, 0x47, 0xda, 0xad, 0xfc, 0xf2, 0x67, 0x77, - 0xeb, 0xc5, 0xf6, 0xfc, 0xf8, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, 0x8a, 0x7e, 0x68, 0x4f, - 0x07, 0x00, 0x00, + // 917 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x41, 0x6f, 0xe3, 0x44, + 0x14, 0x4e, 0x36, 0x69, 0x12, 0x4f, 0xd2, 0x8d, 0x98, 0x22, 0x61, 0x55, 0x22, 0x29, 0x41, 0xa0, + 0x00, 0xaa, 0x43, 0x2b, 0x56, 0xec, 0x1e, 0x38, 0x34, 0x61, 0x85, 0x0a, 0xa5, 0x2d, 0x93, 0xae, + 0xb4, 0xda, 0x0b, 0x9a, 0xd8, 0x2f, 0xee, 0x10, 0xc7, 0x63, 0xcd, 0x8c, 0x03, 0xd9, 0x13, 0x3f, + 0x81, 0x7f, 0x45, 0x8f, 0xcb, 0x6d, 0x4f, 0x11, 0x35, 0xff, 0x82, 0x0b, 0x68, 0xc6, 0x4e, 0xec, + 0x6e, 0xa3, 0x15, 0xe2, 0xe6, 0xf9, 0xbe, 0xef, 0x7d, 0x6f, 0xfc, 0xde, 0x9b, 0x87, 0x0e, 0x67, + 0x73, 0xee, 0xc5, 0x01, 0x48, 0xe7, 0x97, 0xe5, 0xcb, 0x81, 0x1b, 0x30, 0x08, 0xd5, 0xa1, 0xcf, + 0x07, 0x34, 0x62, 0x83, 0xc5, 0xd1, 0xc0, 0x87, 0x10, 0x04, 0x55, 0xe0, 0x39, 0x91, 0xe0, 0x8a, + 0xe3, 0xf7, 0x8b, 0x72, 0x27, 0x95, 0xff, 0xe8, 0x73, 0x87, 0x46, 0xcc, 0x59, 0x1c, 0xed, 0x1f, + 0xfa, 0x4c, 0x5d, 0xc7, 0x13, 0xc7, 0xe5, 0xf3, 0x81, 0xcf, 0x7d, 0x3e, 0x30, 0x51, 0x93, 0x78, + 0x6a, 0x4e, 0xe6, 0x60, 0xbe, 0x52, 0xb7, 0xfd, 0xde, 0xec, 0xb1, 0x74, 0x58, 0x9a, 0xcc, 0xe5, + 0x02, 0xb6, 0x64, 0xdc, 0xff, 0x22, 0xd7, 0xcc, 0xa9, 0x7b, 0xcd, 0x42, 0x10, 0xcb, 0x41, 0x34, + 0xf3, 0x35, 0x20, 0x07, 0x73, 0x50, 0x74, 0x4b, 0x54, 0x2f, 0xa9, 0xa2, 0xf6, 0x08, 0x84, 0x62, + 0x53, 0xe6, 0x52, 0x05, 0xe3, 0x08, 0x5c, 0xfc, 0x21, 0xda, 0xa1, 0x01, 0xa3, 0xd2, 0x2e, 0x1f, + 0x94, 0xfb, 0xd6, 0x70, 0xf7, 0x66, 0xd5, 0x2d, 0x25, 0xab, 0xee, 0xce, 0x89, 0x06, 0x49, 0xca, + 0xe1, 0x63, 0x84, 0x24, 0xb8, 0x02, 0xd4, 0x39, 0x9d, 0x83, 0xfd, 0xc0, 0x28, 0x71, 0xa6, 0x44, + 0xe3, 0x0d, 0x43, 0x0a, 0x2a, 0xfc, 0x08, 0x35, 0x67, 0xb0, 0x7c, 0x1a, 0xba, 0xdc, 0x63, 0xa1, + 0x6f, 0x57, 0x4c, 0xd0, 0x5e, 0x16, 0xd4, 0xfc, 0x2e, 0xa7, 0x48, 0x51, 0x87, 0x7f, 0x40, 0x75, + 0x19, 0x4f, 0x7e, 0x02, 0x57, 0xd9, 0xd5, 0x83, 0x72, 0xbf, 0x79, 0xfc, 0xa9, 0xf3, 0xd6, 0xea, + 0x3a, 0xcf, 0x1f, 0x7d, 0xfe, 0x64, 0x9c, 0x46, 0x0c, 0x9b, 0xc9, 0xaa, 0x5b, 0xcf, 0x0e, 0x64, + 0xed, 0x83, 0x9f, 0xa3, 0x86, 0x17, 0x0b, 0xaa, 0x18, 0x0f, 0xed, 0x1d, 0xe3, 0xe9, 0x38, 0x69, + 0xfd, 0x9c, 0x62, 0xfd, 0x9c, 0x68, 0xe6, 0x6b, 0x40, 0x3a, 0xba, 0x7e, 0xda, 0xfa, 0xeb, 0x2c, + 0x6a, 0xd8, 0x4a, 0x56, 0xdd, 0xc6, 0xfa, 0x44, 0x36, 0x6e, 0x98, 0xa2, 0xa6, 0x80, 0x10, 0x7e, + 0x1e, 0xc2, 0x94, 0x0b, 0xb0, 0x6b, 0xff, 0xcb, 0xbc, 0xad, 0xeb, 0x41, 0x72, 0x1b, 0x52, 0xf4, + 0xc4, 0x7d, 0xd4, 0xf0, 0x42, 0xa9, 0x2b, 0x2a, 0xed, 0xfa, 0x41, 0xa5, 0x6f, 0x65, 0x97, 0x39, + 0x1f, 0x1b, 0x8c, 0x6c, 0x58, 0x7c, 0x84, 0x9a, 0x2c, 0x3a, 0xf1, 0x3c, 0x01, 0x52, 0x82, 0xb4, + 0x1b, 0x46, 0x6c, 0xcc, 0x4f, 0x2f, 0x37, 0x30, 0x29, 0x6a, 0xf0, 0x47, 0xa8, 0x1e, 0x0b, 0x36, + 0x3e, 0x39, 0x97, 0xb6, 0x65, 0xe4, 0xa6, 0x80, 0xcf, 0xc8, 0xa9, 0x86, 0xc8, 0x9a, 0xc3, 0x9f, + 0x21, 0x0b, 0xe6, 0x94, 0x05, 0x46, 0x88, 0x8c, 0x70, 0x37, 0x59, 0x75, 0xad, 0xa7, 0x6b, 0x90, + 0xe4, 0x7c, 0xef, 0x9f, 0x07, 0xc8, 0x1a, 0xf1, 0xd0, 0x63, 0xa6, 0x42, 0x07, 0xa8, 0xaa, 0x96, + 0x11, 0x64, 0xd3, 0xd5, 0xca, 0xda, 0x5f, 0xbd, 0x5a, 0x46, 0x40, 0x0c, 0x83, 0x9f, 0xa0, 0x9a, + 0x54, 0x54, 0xc5, 0x32, 0x9b, 0xab, 0x0f, 0x32, 0x4d, 0x6d, 0x6c, 0xd0, 0xbf, 0x57, 0xdd, 0xf6, + 0xc6, 0x2e, 0x85, 0x48, 0x16, 0x80, 0xbf, 0x45, 0x98, 0x4f, 0x24, 0x88, 0x05, 0x78, 0xdf, 0xa4, + 0xa3, 0xae, 0x5b, 0xac, 0x27, 0xad, 0x32, 0xdc, 0xcf, 0x6c, 0xf0, 0xc5, 0x3d, 0x05, 0xd9, 0x12, + 0x85, 0x17, 0x08, 0x07, 0x54, 0xaa, 0x2b, 0x41, 0x43, 0x69, 0x72, 0x5d, 0xb1, 0x39, 0xe4, 0x23, + 0xf8, 0x5f, 0x3a, 0xaa, 0x23, 0xf2, 0xbc, 0x67, 0xf7, 0xdc, 0xc8, 0x96, 0x0c, 0xf8, 0x63, 0x54, + 0x13, 0x40, 0x65, 0x36, 0x9a, 0xd6, 0xf0, 0xe1, 0xfa, 0xf7, 0x89, 0x41, 0x49, 0xc6, 0xe2, 0x4f, + 0x50, 0x7d, 0x0e, 0x52, 0x52, 0x3f, 0x1d, 0x33, 0x6b, 0xd8, 0xce, 0x84, 0xf5, 0xef, 0x53, 0x98, + 0xac, 0xf9, 0xde, 0x1f, 0x65, 0x64, 0x5d, 0x9d, 0x8d, 0x47, 0x3c, 0x9c, 0x32, 0x1f, 0xbf, 0x40, + 0x16, 0x93, 0x32, 0x06, 0x41, 0x60, 0x6a, 0xda, 0xd0, 0x3c, 0x3e, 0x2c, 0xfc, 0x8f, 0xa3, 0x57, + 0x8c, 0xb9, 0xfd, 0x32, 0x02, 0xef, 0x8c, 0xbb, 0x34, 0xb8, 0x48, 0xdf, 0x0f, 0x4c, 0x41, 0x40, + 0xe8, 0x42, 0xda, 0xeb, 0xd3, 0xb5, 0x07, 0xc9, 0xed, 0xf0, 0x35, 0x6a, 0xb9, 0xf9, 0x3e, 0xd1, + 0x1d, 0xac, 0xa4, 0x0f, 0xe0, 0xad, 0x2f, 0xf6, 0x8d, 0x15, 0x34, 0x7c, 0x37, 0xfb, 0x93, 0x56, + 0x81, 0x90, 0xe4, 0x8e, 0x73, 0xef, 0xf7, 0x0a, 0x6a, 0x16, 0x5e, 0x3a, 0xfe, 0x12, 0xed, 0x72, + 0xe1, 0xd3, 0x90, 0xbd, 0x34, 0xed, 0xd3, 0xeb, 0x4b, 0x8f, 0xe5, 0x3b, 0xc9, 0xaa, 0xbb, 0x7b, + 0x51, 0x24, 0xc8, 0x5d, 0x9d, 0x9e, 0x65, 0x97, 0xc7, 0xa1, 0x12, 0x2c, 0xbb, 0x6f, 0x36, 0xcb, + 0xa3, 0x35, 0x48, 0x72, 0x1e, 0x9f, 0xa2, 0xbd, 0x62, 0x34, 0x0d, 0x9e, 0x85, 0x4c, 0x49, 0xbb, + 0x62, 0xc2, 0xde, 0x4b, 0x56, 0xdd, 0xbd, 0x8b, 0xfb, 0x34, 0xd9, 0x16, 0x83, 0x1d, 0x84, 0x02, + 0x5d, 0x5c, 0xa6, 0x74, 0xe2, 0xaa, 0x71, 0x78, 0xa8, 0xd7, 0xe7, 0xd9, 0x06, 0x25, 0x05, 0x85, + 0xbe, 0x67, 0x24, 0xf8, 0x82, 0x85, 0x2e, 0x48, 0x7b, 0x27, 0xbf, 0xe7, 0xe5, 0x1a, 0x24, 0x39, + 0x8f, 0xbf, 0x42, 0x6d, 0xa9, 0x04, 0x80, 0xca, 0x9f, 0x7f, 0xcd, 0x84, 0xec, 0x25, 0xab, 0x6e, + 0x7b, 0x7c, 0x97, 0x22, 0x6f, 0x6a, 0xf5, 0xe6, 0x88, 0xb8, 0x54, 0x34, 0x18, 0x71, 0x6f, 0xb3, + 0x66, 0xcc, 0xe6, 0xb8, 0xcc, 0x61, 0x52, 0xd4, 0xe0, 0xc7, 0xa8, 0x25, 0x41, 0x30, 0x1a, 0x9c, + 0xc7, 0xf3, 0x09, 0x08, 0xbb, 0x61, 0x66, 0x72, 0xd3, 0xc9, 0x71, 0x81, 0x23, 0x77, 0x94, 0xc3, + 0xfe, 0xcd, 0x6d, 0xa7, 0xf4, 0xea, 0xb6, 0x53, 0x7a, 0x7d, 0xdb, 0x29, 0xfd, 0x9a, 0x74, 0xca, + 0x37, 0x49, 0xa7, 0xfc, 0x2a, 0xe9, 0x94, 0x5f, 0x27, 0x9d, 0xf2, 0x9f, 0x49, 0xa7, 0xfc, 0xdb, + 0x5f, 0x9d, 0xd2, 0x8b, 0x07, 0x8b, 0xa3, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xad, 0x52, 0xe1, + 0x04, 0x86, 0x07, 0x00, 0x00, } func (m *CertificateSpec) Marshal() (dAtA []byte, err error) { @@ -253,7 +254,7 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.EmailSANs[iNdEx]) i = encodeVarintGenerated(dAtA, i, uint64(len(m.EmailSANs[iNdEx]))) i-- - dAtA[i] = 0x4a + dAtA[i] = 0x52 } } if len(m.URISANs) > 0 { @@ -262,7 +263,7 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.URISANs[iNdEx]) i = encodeVarintGenerated(dAtA, i, uint64(len(m.URISANs[iNdEx]))) i-- - dAtA[i] = 0x42 + dAtA[i] = 0x4a } } if len(m.IPAddresses) > 0 { @@ -271,7 +272,7 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.IPAddresses[iNdEx]) i = encodeVarintGenerated(dAtA, i, uint64(len(m.IPAddresses[iNdEx]))) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x42 } } if len(m.DNSNames) > 0 { @@ -280,7 +281,7 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.DNSNames[iNdEx]) i = encodeVarintGenerated(dAtA, i, uint64(len(m.DNSNames[iNdEx]))) i-- - dAtA[i] = 0x32 + dAtA[i] = 0x3a } } if m.RenewBefore != nil { @@ -293,7 +294,7 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } if m.Duration != nil { { @@ -305,7 +306,7 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if m.Subject != nil { { @@ -317,8 +318,13 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } + i -= len(m.KeyEncoding) + copy(dAtA[i:], m.KeyEncoding) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.KeyEncoding))) + i-- + dAtA[i] = 0x1a i -= len(m.SecretName) copy(dAtA[i:], m.SecretName) i = encodeVarintGenerated(dAtA, i, uint64(len(m.SecretName))) @@ -549,6 +555,8 @@ func (m *CertificateSpec) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.SecretName) n += 1 + l + sovGenerated(uint64(l)) + l = len(m.KeyEncoding) + n += 1 + l + sovGenerated(uint64(l)) if m.Subject != nil { l = m.Subject.Size() n += 1 + l + sovGenerated(uint64(l)) @@ -693,6 +701,7 @@ func (this *CertificateSpec) String() string { s := strings.Join([]string{`&CertificateSpec{`, `Alias:` + fmt.Sprintf("%v", this.Alias) + `,`, `SecretName:` + fmt.Sprintf("%v", this.SecretName) + `,`, + `KeyEncoding:` + fmt.Sprintf("%v", this.KeyEncoding) + `,`, `Subject:` + strings.Replace(this.Subject.String(), "X509Subject", "X509Subject", 1) + `,`, `Duration:` + strings.Replace(fmt.Sprintf("%v", this.Duration), "Duration", "v1.Duration", 1) + `,`, `RenewBefore:` + strings.Replace(fmt.Sprintf("%v", this.RenewBefore), "Duration", "v1.Duration", 1) + `,`, @@ -854,6 +863,38 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { m.SecretName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field KeyEncoding", 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.KeyEncoding = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Subject", wireType) } @@ -889,7 +930,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Duration", wireType) } @@ -925,7 +966,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RenewBefore", wireType) } @@ -961,7 +1002,7 @@ 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 DNSNames", wireType) } @@ -993,7 +1034,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { } m.DNSNames = append(m.DNSNames, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 7: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field IPAddresses", wireType) } @@ -1025,7 +1066,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { } m.IPAddresses = append(m.IPAddresses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 8: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field URISANs", wireType) } @@ -1057,7 +1098,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { } m.URISANs = append(m.URISANs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex - case 9: + case 10: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field EmailSANs", wireType) } diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index a01410a89..1d90adf38 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -36,34 +36,41 @@ message CertificateSpec { // +optional optional string secretName = 2; + // KeyEncoding is the private key cryptography standards (PKCS) + // for this certificate's private key to be encoded in. + // If provided, allowed values are "pkcs1" and "pkcs8". + // If KeyEncoding is not specified, then PKCS#1 will be used by default. + // +optional + optional string keyEncoding = 3; + // Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name). // +optional - optional X509Subject subject = 3; + optional X509Subject subject = 4; // Certificate default Duration // +optional - optional k8s.io.apimachinery.pkg.apis.meta.v1.Duration duration = 4; + 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 = 5; + 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 = 6; + repeated string dnsNames = 7; // IPAddresses is a list of IP addresses to be used on the Certificate // +optional - repeated string ipAddresses = 7; + repeated string ipAddresses = 8; // URISANs is a list of URI Subject Alternative Names to be set on this // Certificate. // +optional - repeated string uriSANs = 8; + repeated string uriSANs = 9; // EmailSANs is a list of email subjectAltNames to be set on the Certificate. // +optional - repeated string emailSANs = 9; + repeated string emailSANs = 10; } message Condition { diff --git a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go index f446acd3f..1bd99ff25 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go @@ -56,6 +56,13 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal Format: "", }, }, + "keyEncoding": { + SchemaProps: spec.SchemaProps{ + Description: "KeyEncoding is the private key cryptography standards (PKCS) for this certificate's private key to be encoded in. If provided, allowed values are \"pkcs1\" and \"pkcs8\". If KeyEncoding is not specified, then PKCS#1 will be used by default.", + Type: []string{"string"}, + Format: "", + }, + }, "subject": { SchemaProps: spec.SchemaProps{ Description: "Full X509 name specification (https://golang.org/pkg/crypto/x509/pkix/#Name).", diff --git a/vendor/modules.txt b/vendor/modules.txt index 70c5f009c..8a95aae2e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -686,7 +686,7 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20200730042423-9c59c231fe96 +# kmodules.xyz/client-go v0.0.0-20200805154632-5bf10f227624 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 kmodules.xyz/client-go/apiextensions