Skip to content

feat(test): introduce a test that executes the validatingwebhook #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
diranged merged 10 commits into from
Aug 16, 2023
Merged

feat(test): introduce a test that executes the validatingwebhook #168

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
abd282b
feat(test): introduce a test that executes the validatingwebhook
diranged Aug 16, 2023
2726f70
feat(test): introduce a test that executes the validatingwebhook
diranged Aug 16, 2023
70b2df0
bump gmo
diranged Aug 16, 2023
63d9f8d
pass decoder differently
diranged Aug 16, 2023
6d448af
goalang
diranged Aug 16, 2023
fbdc43a
new_rand
diranged Aug 16, 2023
cc2958a
cleanup
diranged Aug 16, 2023
0f78d7b
faster
diranged Aug 16, 2023
dfdfbe6
better
diranged Aug 16, 2023
075f213
better2
diranged Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
pass decoder differently
  • Loading branch information
@diranged
diranged committed Aug 16, 2023
commit 63d9f8dccff6b2d4bfc7cad9b0d4f924cad38354
3 changes: 1 addition & 2 deletions internal/controllers/podwatcher/handle_attach.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ func (w *PodWatcher) HandleAttach(ctx context.Context, req admission.Request) ad
logger := log.FromContext(ctx)

opts := &corev1.PodAttachOptions{}
decoder := admission.NewDecoder(w.Client.Scheme())
err := decoder.Decode(req, opts)
err := w.decoder.Decode(req, opts)
if err != nil {
logger.Error(err, "Couldnt decode")
return admission.Errored(http.StatusBadRequest, err)
Expand Down
3 changes: 1 addition & 2 deletions internal/controllers/podwatcher/handle_exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ func (w *PodWatcher) HandleExec(ctx context.Context, req admission.Request) admi
logger := log.FromContext(ctx)

// Parse the request into a set of PodExecOptions that we can understand
decoder := admission.NewDecoder(w.Client.Scheme())
opts := &corev1.PodExecOptions{}
err := decoder.Decode(req, opts)
err := w.decoder.Decode(req, opts)
if err != nil {
logger.Error(err, "Couldnt decode")
return admission.Errored(http.StatusBadRequest, err)
Expand Down
1 change: 1 addition & 0 deletions internal/controllers/podwatcher/handle_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ var _ = Describe("PodWatcher", Ordered, func() {
recorder = record.NewFakeRecorder(50)
watcher = &PodWatcher{
Client: k8sClient,
decoder: *admission.NewDecoder(runtime.NewScheme()),
recorder: recorder,
}
resource = metav1.GroupVersionResource{
Expand Down
3 changes: 2 additions & 1 deletion internal/controllers/podwatcher/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
. "github.com/onsi/gomega"
"go.uber.org/zap/zapcore"

"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -75,7 +76,7 @@ var _ = BeforeSuite(func() {

//+kubebuilder:scaffold:scheme

k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
k8sClient, err = client.New(cfg, client.Options{Scheme: runtime.NewScheme()})
Expect(err).NotTo(HaveOccurred())
Expect(k8sClient).NotTo(BeNil())
})
Expand Down
3 changes: 3 additions & 0 deletions internal/controllers/podwatcher/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/webhook"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
)

// example code: https://github.com/kubernetes-sigs/controller-runtime/blob/master/examples/builtins/validatingwebhook.go
Expand All @@ -17,6 +18,7 @@ import (
// layer of security for Pod Exec access.
type PodWatcher struct {
Client client.Client
decoder admission.Decoder
recorder record.EventRecorder
}

Expand All @@ -32,6 +34,7 @@ func NewPodWatcherRegistration(
&webhook.Admission{
Handler: &PodWatcher{
Client: mgr.GetClient(),
decoder: *admission.NewDecoder(mgr.GetScheme()),
recorder: mgr.GetEventRecorderFor(controllers.EventRecorderName),
},
},
Expand Down