Merge pull request #11 from pwittrock/iterations

Move admission package to internal until it is ready
kubernetes-sigs · Mar 19, 2018 · 416d4ef · 416d4ef
2 parents da529bb + 0e74e51
commit 416d4ef
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 9 deletions.
diff --git 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 → pkg/internal/admission/decode.go b/pkg/admission/decode.go → pkg/internal/admission/decode.go
diff --git a/pkg/admission/doc.go → pkg/internal/admission/doc.go b/pkg/admission/doc.go → pkg/internal/admission/doc.go
diff --git a/pkg/admission/example_admissionfunc_test.go → ...l/admission/example_admissionfunc_test.go b/pkg/admission/example_admissionfunc_test.go → ...l/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 → ...internal/admission/example_decode_test.go b/pkg/admission/example_decode_test.go → ...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 → ...rnal/admission/example_handlefunc_test.go b/pkg/admission/example_handlefunc_test.go → ...rnal/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 → pkg/internal/admission/example_test.go b/pkg/admission/example_test.go → 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 → pkg/internal/admission/handler.go b/pkg/admission/handler.go → pkg/internal/admission/handler.go
diff --git a/pkg/admission/http.go → pkg/internal/admission/http.go b/pkg/admission/http.go → pkg/internal/admission/http.go
diff --git a/pkg/admission/response.go → pkg/internal/admission/response.go b/pkg/admission/response.go → pkg/internal/admission/response.go
diff --git a/pkg/admission/tls.go → pkg/internal/admission/tls.go b/pkg/admission/tls.go → pkg/internal/admission/tls.go