Skip to content

Commit 416d4ef

Browse files
author
Phillip Wittrock
authored
Merge pull request #11 from pwittrock/iterations
Move admission package to internal until it is ready
2 parents da529bb + 0e74e51 commit 416d4ef

File tree

11 files changed

+4
-9
lines changed

11 files changed

+4
-9
lines changed

pkg/inject/args/args.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"time"
2121

2222
"github.com/golang/glog"
23-
"github.com/kubernetes-sigs/kubebuilder/pkg/admission"
2423
"github.com/kubernetes-sigs/kubebuilder/pkg/controller"
2524
"github.com/kubernetes-sigs/kubebuilder/pkg/inject/run"
2625
corev1 "k8s.io/api/core/v1"
@@ -49,9 +48,6 @@ type InjectArgs struct {
4948
// ControllerManager is the controller manager
5049
ControllerManager *controller.ControllerManager
5150

52-
// AdmissionManager is the admission webhook manager
53-
AdmissionHandler *admission.AdmissionManager
54-
5551
// EventBroadcaster
5652
EventBroadcaster record.EventBroadcaster
5753
}
@@ -72,7 +68,6 @@ func CreateInjectArgs(config *rest.Config) InjectArgs {
7268
KubernetesClientSet: cs,
7369
KubernetesInformers: informers.NewSharedInformerFactory(cs, 2*time.Minute),
7470
ControllerManager: &controller.ControllerManager{},
75-
AdmissionHandler: &admission.AdmissionManager{},
7671
EventBroadcaster: eventBroadcaster,
7772
}
7873
}
File renamed without changes.
File renamed without changes.

pkg/admission/example_admissionfunc_test.go renamed to pkg/internal/admission/example_admissionfunc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package admission_test
1919
import (
2020
"fmt"
2121

22-
"github.com/kubernetes-sigs/kubebuilder/pkg/admission"
22+
"github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission"
2323
"k8s.io/api/admission/v1beta1"
2424
corev1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/admission/example_decode_test.go renamed to pkg/internal/admission/example_decode_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package admission_test
1818

1919
import (
2020
"fmt"
21-
"github.com/kubernetes-sigs/kubebuilder/pkg/admission"
21+
"github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission"
2222
"k8s.io/api/admission/v1beta1"
2323
corev1 "k8s.io/api/core/v1"
2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/admission/example_handlefunc_test.go renamed to pkg/internal/admission/example_handlefunc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package admission_test
1919
import (
2020
"fmt"
2121

22-
"github.com/kubernetes-sigs/kubebuilder/pkg/admission"
22+
"github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission"
2323
"k8s.io/api/admission/v1beta1"
2424
corev1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/admission/example_test.go renamed to pkg/internal/admission/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package admission_test
1919
import (
2020
"fmt"
2121

22-
"github.com/kubernetes-sigs/kubebuilder/pkg/admission"
22+
"github.com/kubernetes-sigs/kubebuilder/pkg/internal/admission"
2323
"k8s.io/api/admission/v1beta1"
2424
corev1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)