Merge pull request kubernetes-sigs#57 from mengqiy/fs_writer

Implement fs writer

Author: k8s-ci-robot

pkg/admission/cert/writer/certwriter.go

@@ -25,7 +25,6 @@ import (
 	"net/url"
 
 	admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/admission/cert/generator"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -66,13 +65,13 @@ func NewCertWriter(ops Options) (CertWriter, error) {
 		Client:        ops.Client,
 		CertGenerator: ops.CertGenerator,
 	}
-	//f := &FSCertWriter{
-	//	CertGenerator: ops.CertGenerator,
-	//}
+	f := &FSCertWriter{
+		CertGenerator: ops.CertGenerator,
+	}
 	return &MultiCertWriter{
 		CertWriters: []CertWriter{
 			s,
-			//f,
+			f,
 		},
 	}, nil
 }
@@ -113,12 +112,12 @@ func handleCommon(webhook *admissionregistrationv1beta1.Webhook, ch certReadWrit
 func createIfNotExists(webhookName string, ch certReadWriter) (*generator.Artifacts, error) {
 	// Try to read first
 	certs, err := ch.read(webhookName)
-	if apierrors.IsNotFound(err) {
+	if isNotFound(err) {
 		// Create if not exists
 		certs, err = ch.write(webhookName)
 		switch {
 		// This may happen if there is another racer.
-		case apierrors.IsAlreadyExists(err):
+		case isAlreadyExists(err):
 			certs, err = ch.read(webhookName)
 			if err != nil {
 				return certs, err

pkg/admission/cert/writer/certwriter_test.go

@@ -57,9 +57,9 @@ var _ = Describe("NewProvider", func() {
 						Client:        cl,
 						CertGenerator: &generator.SelfSignedCertGenerator{},
 					},
-					//&FSCertWriterProvider{
-					//	CertGenerator: &certgenerator.SelfSignedCertGenerator{},
-					//},
+					&FSCertWriter{
+						CertGenerator: &generator.SelfSignedCertGenerator{},
+					},
 				},
 			}
 			close(done)
@@ -188,7 +188,7 @@ var _ = Describe("handleCommon", func() {
 			certrw := &fakeCertReadWriter{
 				readCertAndErr: []certAndErr{
 					{
-						err:  errors.NewNotFound(schema.GroupResource{}, "foo"),
+						err:  notFoundError{errors.NewNotFound(schema.GroupResource{}, "foo")},
 						cert: cert,
 					},
 				},
@@ -204,7 +204,7 @@ var _ = Describe("handleCommon", func() {
 			certrw := &fakeCertReadWriter{
 				readCertAndErr: []certAndErr{
 					{
-						err: errors.NewNotFound(schema.GroupResource{}, "foo"),
+						err: notFoundError{errors.NewNotFound(schema.GroupResource{}, "foo")},
 					},
 				},
 				writeCertAndErr: []certAndErr{
@@ -318,15 +318,15 @@ var _ = Describe("handleCommon", func() {
 			certrw := &fakeCertReadWriter{
 				readCertAndErr: []certAndErr{
 					{
-						err: errors.NewNotFound(schema.GroupResource{}, "foo"),
+						err: notFoundError{errors.NewNotFound(schema.GroupResource{}, "foo")},
 					},
 					{
 						cert: cert,
 					},
 				},
 				writeCertAndErr: []certAndErr{
 					{
-						err: errors.NewAlreadyExists(schema.GroupResource{}, "foo"),
+						err: alreadyExistError{errors.NewAlreadyExists(schema.GroupResource{}, "foo")},
 					},
 				},
 			}
@@ -341,15 +341,15 @@ var _ = Describe("handleCommon", func() {
 			certrw := &fakeCertReadWriter{
 				readCertAndErr: []certAndErr{
 					{
-						err: errors.NewNotFound(schema.GroupResource{}, "foo"),
+						err: notFoundError{errors.NewNotFound(schema.GroupResource{}, "foo")},
 					},
 					{
 						err: goerrors.New("failed to read"),
 					},
 				},
 				writeCertAndErr: []certAndErr{
 					{
-						err: errors.NewAlreadyExists(schema.GroupResource{}, "foo"),
+						err: alreadyExistError{errors.NewAlreadyExists(schema.GroupResource{}, "foo")},
 					},
 				},
 			}

pkg/admission/cert/writer/error.go

@@ -0,0 +1,43 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package writer
+
+type notFoundError struct {
+	err error
+}
+
+func (e notFoundError) Error() string {
+	return e.err.Error()
+}
+
+func isNotFound(err error) bool {
+	_, ok := err.(notFoundError)
+	return ok
+}
+
+type alreadyExistError struct {
+	err error
+}
+
+func (e alreadyExistError) Error() string {
+	return e.err.Error()
+}
+
+func isAlreadyExists(err error) bool {
+	_, ok := err.(alreadyExistError)
+	return ok
+}