diff --git a/.config/api-rules/violation_exceptions.list b/.config/api-rules/violation_exceptions.list index 6a95c7f0f..ae11e2efc 100644 --- a/.config/api-rules/violation_exceptions.list +++ b/.config/api-rules/violation_exceptions.list @@ -167,9 +167,9 @@ API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Updat API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,DNSNames -API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,EmailSANs +API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,EmailAddresses API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,IPAddresses -API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,URISANs +API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,CertificateSpec,URIs API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,TLSConfig,Certificates API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,X509Subject,Countries API rule violation: list_type_missing,kmodules.xyz/client-go/api/v1,X509Subject,Localities @@ -293,5 +293,6 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,IntVal API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,StrVal API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,Type +API rule violation: names_match,kmodules.xyz/client-go/api/v1,CertificateSpec,URIs API rule violation: names_match,kmodules.xyz/offshoot-api/api/v1,ContainerRuntimeSettings,IONice API rule violation: names_match,stash.appscode.dev/apimachinery/apis/stash/v1beta1,BackupTarget,VolumeSnapshotClassName diff --git a/apis/repositories/v1alpha1/openapi_generated.go b/apis/repositories/v1alpha1/openapi_generated.go index dc4abbd0d..91f644ce8 100644 --- a/apis/repositories/v1alpha1/openapi_generated.go +++ b/apis/repositories/v1alpha1/openapi_generated.go @@ -15648,9 +15648,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "uriSANs": { + "uris": { SchemaProps: spec.SchemaProps{ - Description: "URISANs is a list of URI Subject Alternative Names to be set on this Certificate.", + Description: "URIs is a list of URI subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -15662,9 +15662,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "emailSANs": { + "emailAddresses": { SchemaProps: spec.SchemaProps{ - Description: "EmailSANs is a list of email subjectAltNames to be set on the Certificate.", + Description: "EmailAddresses is a list of email subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/apis/stash/v1alpha1/openapi_generated.go b/apis/stash/v1alpha1/openapi_generated.go index e535b08a4..1e956d598 100644 --- a/apis/stash/v1alpha1/openapi_generated.go +++ b/apis/stash/v1alpha1/openapi_generated.go @@ -15660,9 +15660,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "uriSANs": { + "uris": { SchemaProps: spec.SchemaProps{ - Description: "URISANs is a list of URI Subject Alternative Names to be set on this Certificate.", + Description: "URIs is a list of URI subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -15674,9 +15674,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "emailSANs": { + "emailAddresses": { SchemaProps: spec.SchemaProps{ - Description: "EmailSANs is a list of email subjectAltNames to be set on the Certificate.", + Description: "EmailAddresses is a list of email subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/apis/stash/v1beta1/openapi_generated.go b/apis/stash/v1beta1/openapi_generated.go index 867efc141..21e03b455 100644 --- a/apis/stash/v1beta1/openapi_generated.go +++ b/apis/stash/v1beta1/openapi_generated.go @@ -15694,9 +15694,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "uriSANs": { + "uris": { SchemaProps: spec.SchemaProps{ - Description: "URISANs is a list of URI Subject Alternative Names to be set on this Certificate.", + Description: "URIs is a list of URI subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -15708,9 +15708,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "emailSANs": { + "emailAddresses": { SchemaProps: spec.SchemaProps{ - Description: "EmailSANs is a list of email subjectAltNames to be set on the Certificate.", + Description: "EmailAddresses is a list of email subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/go.mod b/go.mod index b9d7e6213..b98c5d3a6 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-20200903033732-dab39b86c81b + kmodules.xyz/client-go v0.0.0-20200905112811-2e29b973ee0c 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 f9b57d8d3..5eec21873 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-20200903033732-dab39b86c81b h1:Erhqi9TZEqKmiIO2Lc7gX18JMH474wIJsoZ6xf//Lf0= -kmodules.xyz/client-go v0.0.0-20200903033732-dab39b86c81b/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY= +kmodules.xyz/client-go v0.0.0-20200905112811-2e29b973ee0c h1:OLIlqEm+Gb2aGgJ4sL4KV52RpfkwCFf4OUI7WG1JUoA= +kmodules.xyz/client-go v0.0.0-20200905112811-2e29b973ee0c/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 230d8361e..0c7b2d9b9 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/certificates.go +++ b/vendor/kmodules.xyz/client-go/api/v1/certificates.go @@ -73,14 +73,13 @@ type CertificateSpec struct { // +optional 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. + // URIs is a list of URI subjectAltNames to be set on the Certificate. // +optional - URISANs []string `json:"uriSANs,omitempty" protobuf:"bytes,9,rep,name=uriSANs"` + URIs []string `json:"uris,omitempty" protobuf:"bytes,9,rep,name=uris"` - // EmailSANs is a list of email subjectAltNames to be set on the Certificate. + // EmailAddresses is a list of email subjectAltNames to be set on the Certificate. // +optional - EmailSANs []string `json:"emailSANs,omitempty" protobuf:"bytes,10,rep,name=emailSANs"` + EmailAddresses []string `json:"emailAddresses,omitempty" protobuf:"bytes,10,rep,name=emailAddresses"` } // 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 16995356d..de59a17fb 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -167,65 +167,65 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 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, + // 921 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0x6f, 0x36, 0x69, 0x1b, 0x4f, 0xda, 0x46, 0x4c, 0x91, 0xb0, 0x2a, 0x88, 0x4b, 0x90, 0x50, + 0x00, 0xd5, 0xa1, 0x15, 0x2b, 0x76, 0x91, 0x38, 0xac, 0xc3, 0x0a, 0x15, 0x4a, 0x5b, 0x26, 0x5d, + 0x69, 0xb5, 0x17, 0x34, 0xb1, 0x5f, 0xdc, 0x21, 0x8e, 0xc7, 0x9a, 0x19, 0x07, 0xb2, 0x27, 0x3e, + 0x02, 0xdf, 0x8a, 0x1e, 0x97, 0xdb, 0x9e, 0x2c, 0x6a, 0x2e, 0x7c, 0x06, 0x2e, 0x20, 0x8f, 0x9d, + 0xd8, 0x69, 0xa3, 0x15, 0xe2, 0x66, 0xff, 0xfe, 0xcd, 0xcc, 0x9b, 0x37, 0x0f, 0x1d, 0x4d, 0xa6, + 0xdc, 0x8b, 0x03, 0x90, 0xf6, 0xcf, 0xf3, 0x97, 0x7d, 0x37, 0x60, 0x10, 0xaa, 0x23, 0x9f, 0xf7, + 0x69, 0xc4, 0xfa, 0xb3, 0xe3, 0xbe, 0x0f, 0x21, 0x08, 0xaa, 0xc0, 0xb3, 0x23, 0xc1, 0x15, 0xc7, + 0xef, 0x55, 0xe5, 0x76, 0x2e, 0xff, 0xc1, 0xe7, 0x36, 0x8d, 0x98, 0x3d, 0x3b, 0x3e, 0x38, 0xf2, + 0x99, 0xba, 0x8e, 0x47, 0xb6, 0xcb, 0xa7, 0x7d, 0x9f, 0xfb, 0xbc, 0xaf, 0x5d, 0xa3, 0x78, 0xac, + 0xff, 0xf4, 0x8f, 0xfe, 0xca, 0xd3, 0x0e, 0xba, 0x93, 0x47, 0xd2, 0x66, 0xf9, 0x62, 0x2e, 0x17, + 0xb0, 0x66, 0xc5, 0x83, 0xcf, 0x4a, 0xcd, 0x94, 0xba, 0xd7, 0x2c, 0x04, 0x31, 0xef, 0x47, 0x13, + 0x3f, 0x03, 0x64, 0x7f, 0x0a, 0x8a, 0xae, 0x71, 0x75, 0xff, 0x6a, 0xa0, 0xf6, 0x00, 0x84, 0x62, + 0x63, 0xe6, 0x52, 0x05, 0xc3, 0x08, 0x5c, 0xfc, 0x01, 0xda, 0xa4, 0x01, 0xa3, 0xd2, 0xac, 0x1d, + 0xd6, 0x7a, 0x86, 0xb3, 0x7b, 0x93, 0x58, 0x1b, 0x69, 0x62, 0x6d, 0x3e, 0xc9, 0x40, 0x92, 0x73, + 0xf8, 0x04, 0x21, 0x09, 0xae, 0x00, 0x75, 0x4e, 0xa7, 0x60, 0x3e, 0xd0, 0x4a, 0x5c, 0x28, 0xd1, + 0x70, 0xc9, 0x90, 0x8a, 0x0a, 0x3f, 0x44, 0xad, 0x09, 0xcc, 0x9f, 0x86, 0x2e, 0xf7, 0x58, 0xe8, + 0x9b, 0x75, 0x6d, 0xda, 0x2f, 0x4c, 0xad, 0x6f, 0x4b, 0x8a, 0x54, 0x75, 0xf8, 0x7b, 0xb4, 0x2d, + 0xe3, 0xd1, 0x8f, 0xe0, 0x2a, 0xb3, 0x71, 0x58, 0xeb, 0xb5, 0x4e, 0x3e, 0xb6, 0xdf, 0x58, 0x5d, + 0xfb, 0xf9, 0xc3, 0x4f, 0x1f, 0x0f, 0x73, 0x87, 0xd3, 0x4a, 0x13, 0x6b, 0xbb, 0xf8, 0x21, 0x8b, + 0x1c, 0xfc, 0x1c, 0x35, 0xbd, 0x58, 0x50, 0xc5, 0x78, 0x68, 0x6e, 0xea, 0x4c, 0xdb, 0xce, 0xeb, + 0x67, 0x57, 0xeb, 0x67, 0x47, 0x13, 0x3f, 0x03, 0xa4, 0x9d, 0xd5, 0x2f, 0x8b, 0xfe, 0xaa, 0x70, + 0x39, 0x3b, 0x69, 0x62, 0x35, 0x17, 0x7f, 0x64, 0x99, 0x86, 0x29, 0x6a, 0x09, 0x08, 0xe1, 0x27, + 0x07, 0xc6, 0x5c, 0x80, 0xb9, 0xf5, 0xbf, 0xc2, 0xdb, 0x59, 0x3d, 0x48, 0x19, 0x43, 0xaa, 0x99, + 0xb8, 0x87, 0x9a, 0x5e, 0x28, 0xb3, 0x8a, 0x4a, 0x73, 0xfb, 0xb0, 0xde, 0x33, 0x8a, 0xcd, 0x9c, + 0x0f, 0x35, 0x46, 0x96, 0x2c, 0x3e, 0x46, 0x2d, 0x16, 0x3d, 0xf1, 0x3c, 0x01, 0x52, 0x82, 0x34, + 0x9b, 0x5a, 0xac, 0xc3, 0x4f, 0x2f, 0x97, 0x30, 0xa9, 0x6a, 0xf0, 0xbb, 0xa8, 0x11, 0x0b, 0x26, + 0x4d, 0x43, 0x6b, 0x9b, 0x69, 0x62, 0x35, 0x9e, 0x91, 0x53, 0x49, 0x34, 0x8a, 0xbf, 0x40, 0x7b, + 0x30, 0xa5, 0x2c, 0x28, 0x33, 0x91, 0xd6, 0xe1, 0x34, 0xb1, 0xf6, 0x9e, 0xae, 0x30, 0xe4, 0x8e, + 0xb2, 0xfb, 0xcf, 0x03, 0x64, 0x0c, 0x78, 0xe8, 0x31, 0x5d, 0xa7, 0x43, 0xd4, 0x50, 0xf3, 0x08, + 0x8a, 0x1e, 0xdb, 0x29, 0x9a, 0xa0, 0x71, 0x35, 0x8f, 0x80, 0x68, 0x06, 0x3f, 0x46, 0x5b, 0x52, + 0x51, 0x15, 0xcb, 0xa2, 0xbb, 0xde, 0x2f, 0x34, 0x5b, 0x43, 0x8d, 0xfe, 0x9d, 0x58, 0xed, 0x65, + 0x5c, 0x0e, 0x91, 0xc2, 0x80, 0xbf, 0x41, 0x98, 0x8f, 0x24, 0x88, 0x19, 0x78, 0x5f, 0xe7, 0x0d, + 0x9f, 0x5d, 0x74, 0xd6, 0x6f, 0x75, 0xe7, 0xa0, 0x88, 0xc1, 0x17, 0xf7, 0x14, 0x64, 0x8d, 0x0b, + 0xcf, 0x10, 0x0e, 0xa8, 0x54, 0x57, 0x82, 0x86, 0x52, 0xaf, 0x75, 0xc5, 0xa6, 0x50, 0x36, 0xe2, + 0x7f, 0xb9, 0xd7, 0xcc, 0x51, 0xae, 0x7b, 0x76, 0x2f, 0x8d, 0xac, 0x59, 0x01, 0x7f, 0x88, 0xb6, + 0x04, 0x50, 0x59, 0x34, 0xa8, 0xe1, 0xec, 0x2d, 0x8e, 0x4f, 0x34, 0x4a, 0x0a, 0x16, 0x7f, 0x84, + 0xb6, 0xa7, 0x20, 0x25, 0xf5, 0xf3, 0x66, 0x33, 0x9c, 0x76, 0x21, 0xdc, 0xfe, 0x2e, 0x87, 0xc9, + 0x82, 0xef, 0xfe, 0x5e, 0x43, 0xc6, 0xd5, 0xd9, 0x70, 0xc0, 0xc3, 0x31, 0xf3, 0xf1, 0x0b, 0x64, + 0x30, 0x29, 0x63, 0x10, 0x04, 0xc6, 0xfa, 0x1a, 0x5a, 0x27, 0x47, 0x95, 0xf3, 0xd8, 0xd9, 0xa0, + 0xd1, 0xbb, 0x9f, 0x47, 0xe0, 0x9d, 0x71, 0x97, 0x06, 0x17, 0xf9, 0x2b, 0x82, 0x31, 0x08, 0x08, + 0x5d, 0x70, 0x76, 0xd3, 0xc4, 0x32, 0x4e, 0x17, 0x19, 0xa4, 0x8c, 0xc3, 0xd7, 0x68, 0xc7, 0x2d, + 0xa7, 0x4a, 0x76, 0x83, 0xf5, 0xfc, 0x19, 0xbc, 0xf1, 0xdd, 0xde, 0x19, 0x44, 0xce, 0xdb, 0xc5, + 0x49, 0x76, 0x2a, 0x84, 0x24, 0x2b, 0xc9, 0xdd, 0xdf, 0xea, 0xa8, 0x55, 0x79, 0xef, 0xf8, 0x73, + 0xb4, 0xcb, 0x85, 0x4f, 0x43, 0xf6, 0x52, 0x5f, 0x5f, 0x36, 0xc4, 0xb2, 0x06, 0x7d, 0x2b, 0x4d, + 0xac, 0xdd, 0x8b, 0x2a, 0x41, 0x56, 0x75, 0xf8, 0x13, 0x64, 0xb8, 0x3c, 0x0e, 0x95, 0x60, 0xc5, + 0x7e, 0x8d, 0xfc, 0x7c, 0x83, 0x05, 0x48, 0x4a, 0x1e, 0x9f, 0xa2, 0xfd, 0xaa, 0x9b, 0x06, 0xcf, + 0x42, 0xa6, 0xa4, 0x59, 0xd7, 0xb6, 0x77, 0xd2, 0xc4, 0xda, 0xbf, 0xb8, 0x4f, 0x93, 0x75, 0x1e, + 0x6c, 0x23, 0x14, 0x64, 0xc5, 0x65, 0x2a, 0x5b, 0xb8, 0xa1, 0x13, 0xf6, 0xb2, 0x21, 0x7a, 0xb6, + 0x44, 0x49, 0x45, 0x91, 0xed, 0x33, 0x12, 0x7c, 0xc6, 0x42, 0x17, 0xa4, 0xb9, 0x59, 0xee, 0xf3, + 0x72, 0x01, 0x92, 0x92, 0xc7, 0x5f, 0xa2, 0xb6, 0x54, 0x02, 0x40, 0x95, 0x0f, 0x76, 0x4b, 0x5b, + 0xf6, 0xd3, 0xc4, 0x6a, 0x0f, 0x57, 0x29, 0x72, 0x57, 0x9b, 0xcd, 0x8f, 0x88, 0x4b, 0x45, 0x83, + 0x01, 0xf7, 0x96, 0xc3, 0x46, 0xcf, 0x8f, 0xcb, 0x12, 0x26, 0x55, 0x0d, 0x7e, 0x84, 0x76, 0x24, + 0x08, 0x46, 0x83, 0xf3, 0x78, 0x3a, 0x02, 0x61, 0x36, 0x75, 0x4f, 0x2e, 0x6f, 0x72, 0x58, 0xe1, + 0xc8, 0x8a, 0xd2, 0xe9, 0xdd, 0xdc, 0x76, 0x36, 0x5e, 0xdd, 0x76, 0x36, 0x5e, 0xdf, 0x76, 0x36, + 0x7e, 0x49, 0x3b, 0xb5, 0x9b, 0xb4, 0x53, 0x7b, 0x95, 0x76, 0x6a, 0xaf, 0xd3, 0x4e, 0xed, 0x8f, + 0xb4, 0x53, 0xfb, 0xf5, 0xcf, 0xce, 0xc6, 0x8b, 0x07, 0xb3, 0xe3, 0x7f, 0x03, 0x00, 0x00, 0xff, + 0xff, 0x71, 0x7b, 0xcc, 0x87, 0x8c, 0x07, 0x00, 0x00, } func (m *CertificateSpec) Marshal() (dAtA []byte, err error) { @@ -248,20 +248,20 @@ func (m *CertificateSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.EmailSANs) > 0 { - for iNdEx := len(m.EmailSANs) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.EmailSANs[iNdEx]) - copy(dAtA[i:], m.EmailSANs[iNdEx]) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.EmailSANs[iNdEx]))) + if len(m.EmailAddresses) > 0 { + for iNdEx := len(m.EmailAddresses) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.EmailAddresses[iNdEx]) + copy(dAtA[i:], m.EmailAddresses[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.EmailAddresses[iNdEx]))) i-- dAtA[i] = 0x52 } } - if len(m.URISANs) > 0 { - for iNdEx := len(m.URISANs) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.URISANs[iNdEx]) - copy(dAtA[i:], m.URISANs[iNdEx]) - i = encodeVarintGenerated(dAtA, i, uint64(len(m.URISANs[iNdEx]))) + if len(m.URIs) > 0 { + for iNdEx := len(m.URIs) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.URIs[iNdEx]) + copy(dAtA[i:], m.URIs[iNdEx]) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.URIs[iNdEx]))) i-- dAtA[i] = 0x4a } @@ -581,14 +581,14 @@ func (m *CertificateSpec) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } - if len(m.URISANs) > 0 { - for _, s := range m.URISANs { + if len(m.URIs) > 0 { + for _, s := range m.URIs { l = len(s) n += 1 + l + sovGenerated(uint64(l)) } } - if len(m.EmailSANs) > 0 { - for _, s := range m.EmailSANs { + if len(m.EmailAddresses) > 0 { + for _, s := range m.EmailAddresses { l = len(s) n += 1 + l + sovGenerated(uint64(l)) } @@ -707,8 +707,8 @@ func (this *CertificateSpec) String() string { `RenewBefore:` + strings.Replace(fmt.Sprintf("%v", this.RenewBefore), "Duration", "v1.Duration", 1) + `,`, `DNSNames:` + fmt.Sprintf("%v", this.DNSNames) + `,`, `IPAddresses:` + fmt.Sprintf("%v", this.IPAddresses) + `,`, - `URISANs:` + fmt.Sprintf("%v", this.URISANs) + `,`, - `EmailSANs:` + fmt.Sprintf("%v", this.EmailSANs) + `,`, + `URIs:` + fmt.Sprintf("%v", this.URIs) + `,`, + `EmailAddresses:` + fmt.Sprintf("%v", this.EmailAddresses) + `,`, `}`, }, "") return s @@ -1068,7 +1068,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 9: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field URISANs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field URIs", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1096,11 +1096,11 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.URISANs = append(m.URISANs, string(dAtA[iNdEx:postIndex])) + m.URIs = append(m.URIs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex case 10: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EmailSANs", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EmailAddresses", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1128,7 +1128,7 @@ func (m *CertificateSpec) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.EmailSANs = append(m.EmailSANs, string(dAtA[iNdEx:postIndex])) + m.EmailAddresses = append(m.EmailAddresses, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index 6db4749fd..79943f098 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -63,14 +63,13 @@ message CertificateSpec { // +optional repeated string ipAddresses = 8; - // URISANs is a list of URI Subject Alternative Names to be set on this - // Certificate. + // URIs is a list of URI subjectAltNames to be set on the Certificate. // +optional - repeated string uriSANs = 9; + repeated string uris = 9; - // EmailSANs is a list of email subjectAltNames to be set on the Certificate. + // EmailAddresses is a list of email subjectAltNames to be set on the Certificate. // +optional - repeated string emailSANs = 10; + repeated string emailAddresses = 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 6db5f3629..dce82e213 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go @@ -110,9 +110,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "uriSANs": { + "uris": { SchemaProps: spec.SchemaProps{ - Description: "URISANs is a list of URI Subject Alternative Names to be set on this Certificate.", + Description: "URIs is a list of URI subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ @@ -124,9 +124,9 @@ func schema_kmodulesxyz_client_go_api_v1_CertificateSpec(ref common.ReferenceCal }, }, }, - "emailSANs": { + "emailAddresses": { SchemaProps: spec.SchemaProps{ - Description: "EmailSANs is a list of email subjectAltNames to be set on the Certificate.", + Description: "EmailAddresses is a list of email subjectAltNames to be set on the Certificate.", Type: []string{"array"}, Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index 695e58e24..e21123916 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -53,13 +53,13 @@ func (in *CertificateSpec) DeepCopyInto(out *CertificateSpec) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.URISANs != nil { - in, out := &in.URISANs, &out.URISANs + if in.URIs != nil { + in, out := &in.URIs, &out.URIs *out = make([]string, len(*in)) copy(*out, *in) } - if in.EmailSANs != nil { - in, out := &in.EmailSANs, &out.EmailSANs + if in.EmailAddresses != nil { + in, out := &in.EmailAddresses, &out.EmailAddresses *out = make([]string, len(*in)) copy(*out, *in) } diff --git a/vendor/modules.txt b/vendor/modules.txt index 2a03ee8e0..ab7a193b9 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-20200903033732-dab39b86c81b +# kmodules.xyz/client-go v0.0.0-20200905112811-2e29b973ee0c kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 kmodules.xyz/client-go/apiextensions