mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
add import-alias for k8s.io/api/certificates/v1beta1
This commit is contained in:
parent
4b38206230
commit
291658725b
@ -11,5 +11,6 @@
|
|||||||
"k8s.io/api/authorization/v1beta1": "authorizationv1beta1",
|
"k8s.io/api/authorization/v1beta1": "authorizationv1beta1",
|
||||||
"k8s.io/api/autoscaling/v1": "autoscalingv1",
|
"k8s.io/api/autoscaling/v1": "autoscalingv1",
|
||||||
"k8s.io/api/batch/v1": "batchv1",
|
"k8s.io/api/batch/v1": "batchv1",
|
||||||
"k8s.io/api/batch/v1beta1": "batchv1beta1"
|
"k8s.io/api/batch/v1beta1": "batchv1beta1",
|
||||||
|
"k8s.io/api/certificates/v1beta1": "certificatesv1beta1"
|
||||||
}
|
}
|
@ -20,9 +20,7 @@ import (
|
|||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"crypto/x509/pkix"
|
"crypto/x509/pkix"
|
||||||
"encoding/pem"
|
"encoding/pem"
|
||||||
"time"
|
certificatesv1beta1 "k8s.io/api/certificates/v1beta1"
|
||||||
|
|
||||||
"k8s.io/api/certificates/v1beta1"
|
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
v1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
|
v1beta1client "k8s.io/client-go/kubernetes/typed/certificates/v1beta1"
|
||||||
@ -30,6 +28,7 @@ import (
|
|||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
|
||||||
"k8s.io/kubernetes/test/utils"
|
"k8s.io/kubernetes/test/utils"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/onsi/ginkgo"
|
"github.com/onsi/ginkgo"
|
||||||
)
|
)
|
||||||
@ -52,16 +51,16 @@ var _ = SIGDescribe("Certificates API", func() {
|
|||||||
csrb, err := cert.MakeCSR(pk, &pkix.Name{CommonName: commonName, Organization: []string{"system:masters"}}, nil, nil)
|
csrb, err := cert.MakeCSR(pk, &pkix.Name{CommonName: commonName, Organization: []string{"system:masters"}}, nil, nil)
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
|
|
||||||
csr := &v1beta1.CertificateSigningRequest{
|
csr := &certificatesv1beta1.CertificateSigningRequest{
|
||||||
ObjectMeta: metav1.ObjectMeta{
|
ObjectMeta: metav1.ObjectMeta{
|
||||||
GenerateName: commonName + "-",
|
GenerateName: commonName + "-",
|
||||||
},
|
},
|
||||||
Spec: v1beta1.CertificateSigningRequestSpec{
|
Spec: certificatesv1beta1.CertificateSigningRequestSpec{
|
||||||
Request: csrb,
|
Request: csrb,
|
||||||
Usages: []v1beta1.KeyUsage{
|
Usages: []certificatesv1beta1.KeyUsage{
|
||||||
v1beta1.UsageSigning,
|
certificatesv1beta1.UsageSigning,
|
||||||
v1beta1.UsageKeyEncipherment,
|
certificatesv1beta1.UsageKeyEncipherment,
|
||||||
v1beta1.UsageClientAuth,
|
certificatesv1beta1.UsageClientAuth,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -75,9 +74,9 @@ var _ = SIGDescribe("Certificates API", func() {
|
|||||||
|
|
||||||
e2elog.Logf("approving CSR")
|
e2elog.Logf("approving CSR")
|
||||||
framework.ExpectNoError(wait.Poll(5*time.Second, time.Minute, func() (bool, error) {
|
framework.ExpectNoError(wait.Poll(5*time.Second, time.Minute, func() (bool, error) {
|
||||||
csr.Status.Conditions = []v1beta1.CertificateSigningRequestCondition{
|
csr.Status.Conditions = []certificatesv1beta1.CertificateSigningRequestCondition{
|
||||||
{
|
{
|
||||||
Type: v1beta1.CertificateApproved,
|
Type: certificatesv1beta1.CertificateApproved,
|
||||||
Reason: "E2E",
|
Reason: "E2E",
|
||||||
Message: "Set from an e2e test",
|
Message: "Set from an e2e test",
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user