From 0e74e5113b794bdb27e5e923bfc6f2ae76a9f9e1 Mon Sep 17 00:00:00 2001 From: Phillip Wittrock Date: Mon, 19 Mar 2018 12:26:49 -0700 Subject: [PATCH] Move admission package to internal until it is ready --- pkg/inject/args/args.go | 5 ----- pkg/{ => internal}/admission/decode.go | 0 pkg/{ => internal}/admission/doc.go | 0 pkg/{ => internal}/admission/example_admissionfunc_test.go | 2 +- pkg/{ => internal}/admission/example_decode_test.go | 2 +- pkg/{ => internal}/admission/example_handlefunc_test.go | 2 +- pkg/{ => internal}/admission/example_test.go | 2 +- pkg/{ => internal}/admission/handler.go | 0 pkg/{ => internal}/admission/http.go | 0 pkg/{ => internal}/admission/response.go | 0 pkg/{ => internal}/admission/tls.go | 0 11 files changed, 4 insertions(+), 9 deletions(-) rename pkg/{ => internal}/admission/decode.go (100%) rename pkg/{ => internal}/admission/doc.go (100%) rename pkg/{ => internal}/admission/example_admissionfunc_test.go (95%) rename pkg/{ => internal}/admission/example_decode_test.go (95%) rename pkg/{ => internal}/admission/example_handlefunc_test.go (96%) rename pkg/{ => internal}/admission/example_test.go (95%) rename pkg/{ => internal}/admission/handler.go (100%) rename pkg/{ => internal}/admission/http.go (100%) rename pkg/{ => internal}/admission/response.go (100%) rename pkg/{ => internal}/admission/tls.go (100%) diff --git a/pkg/inject/args/args.go b/pkg/inject/args/args.go index 58db0f5dd7..8f706b6219 100644 --- a/pkg/inject/args/args.go +++ b/pkg/inject/args/args.go @@ -20,7 +20,6 @@ import ( "time" "github.com/golang/glog" - "github.com/kubernetes-sigs/kubebuilder/pkg/admission" "github.com/kubernetes-sigs/kubebuilder/pkg/controller" "github.com/kubernetes-sigs/kubebuilder/pkg/inject/run" corev1 "k8s.io/api/core/v1" @@ -49,9 +48,6 @@ type InjectArgs struct { // ControllerManager is the controller manager ControllerManager *controller.ControllerManager - // AdmissionManager is the admission webhook manager - AdmissionHandler *admission.AdmissionManager - // EventBroadcaster EventBroadcaster record.EventBroadcaster } @@ -72,7 +68,6 @@ func CreateInjectArgs(config *rest.Config) InjectArgs { KubernetesClientSet: cs, KubernetesInformers: informers.NewSharedInformerFactory(cs, 2*time.Minute), ControllerManager: &controller.ControllerManager{}, - AdmissionHandler: &admission.AdmissionManager{}, EventBroadcaster: eventBroadcaster, } } diff --git a/pkg/admission/decode.go b/pkg/internal/admission/decode.go similarity index 100% rename from pkg/admission/decode.go rename to pkg/internal/admission/decode.go diff --git a/pkg/admission/doc.go b/pkg/internal/admission/doc.go similarity index 100% rename from pkg/admission/doc.go rename to pkg/internal/admission/doc.go diff --git a/pkg/admission/example_admissionfunc_test.go b/pkg/internal/admission/example_admissionfunc_test.go similarity index 95% rename from pkg/admission/example_admissionfunc_test.go rename to pkg/internal/admission/example_admissionfunc_test.go index b361df7e04..788cad258c 100644 --- a/pkg/admission/example_admissionfunc_test.go +++ b/pkg/internal/admission/example_admissionfunc_test.go @@ -19,7 +19,7 @@ package admission_test import ( "fmt" - "github.com/kubernetes-sigs/kubebuilder/pkg/admission" + "github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission" "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/admission/example_decode_test.go b/pkg/internal/admission/example_decode_test.go similarity index 95% rename from pkg/admission/example_decode_test.go rename to pkg/internal/admission/example_decode_test.go index e8249f5ae6..368f0bacf7 100644 --- a/pkg/admission/example_decode_test.go +++ b/pkg/internal/admission/example_decode_test.go @@ -18,7 +18,7 @@ package admission_test import ( "fmt" - "github.com/kubernetes-sigs/kubebuilder/pkg/admission" + "github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission" "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/admission/example_handlefunc_test.go b/pkg/internal/admission/example_handlefunc_test.go similarity index 96% rename from pkg/admission/example_handlefunc_test.go rename to pkg/internal/admission/example_handlefunc_test.go index dde4a8951a..fe26dd1dd9 100644 --- a/pkg/admission/example_handlefunc_test.go +++ b/pkg/internal/admission/example_handlefunc_test.go @@ -19,7 +19,7 @@ package admission_test import ( "fmt" - "github.com/kubernetes-sigs/kubebuilder/pkg/admission" + "github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission" "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/admission/example_test.go b/pkg/internal/admission/example_test.go similarity index 95% rename from pkg/admission/example_test.go rename to pkg/internal/admission/example_test.go index 95254c0752..3f04040717 100644 --- a/pkg/admission/example_test.go +++ b/pkg/internal/admission/example_test.go @@ -19,7 +19,7 @@ package admission_test import ( "fmt" - "github.com/kubernetes-sigs/kubebuilder/pkg/admission" + "github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission" "k8s.io/api/admission/v1beta1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/admission/handler.go b/pkg/internal/admission/handler.go similarity index 100% rename from pkg/admission/handler.go rename to pkg/internal/admission/handler.go diff --git a/pkg/admission/http.go b/pkg/internal/admission/http.go similarity index 100% rename from pkg/admission/http.go rename to pkg/internal/admission/http.go diff --git a/pkg/admission/response.go b/pkg/internal/admission/response.go similarity index 100% rename from pkg/admission/response.go rename to pkg/internal/admission/response.go diff --git a/pkg/admission/tls.go b/pkg/internal/admission/tls.go similarity index 100% rename from pkg/admission/tls.go rename to pkg/internal/admission/tls.go