Skip to content

Commit

Permalink
making staticcheck happy
Browse files Browse the repository at this point in the history
  • Loading branch information
Yusuf Kanchwala committed Mar 30, 2021
1 parent 0686262 commit 5045296
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
3 changes: 1 addition & 2 deletions pkg/k8s/admission-webhook/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package admissionwebhook

import (
admissionv1 "k8s.io/api/admission/v1"
v1 "k8s.io/api/admission/v1"
)

// AdmissionWebhook interface needs to be implemented by all k8s admission
Expand All @@ -34,5 +33,5 @@ type AdmissionWebhook interface {

// ProcessWebhook processes the incoming AdmissionReview and creates
// a AdmissionResponse
ProcessWebhook(review admissionv1.AdmissionReview, serverURL string) (*v1.AdmissionReview, error)
ProcessWebhook(review admissionv1.AdmissionReview, serverURL string) (*admissionv1.AdmissionReview, error)
}
11 changes: 5 additions & 6 deletions pkg/k8s/admission-webhook/validating-webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (
"go.uber.org/zap"

admissionv1 "k8s.io/api/admission/v1"
v1 "k8s.io/api/admission/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtimeK8s "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
Expand Down Expand Up @@ -118,7 +117,7 @@ func (w ValidatingWebhook) DecodeAdmissionReviewRequest(requestBody []byte) (adm

// ProcessWebhook processes the incoming AdmissionReview and creates
// a response
func (w ValidatingWebhook) ProcessWebhook(review admissionv1.AdmissionReview, serverURL string) (*v1.AdmissionReview, error) {
func (w ValidatingWebhook) ProcessWebhook(review admissionv1.AdmissionReview, serverURL string) (*admissionv1.AdmissionReview, error) {

var (
output runtime.Output
Expand Down Expand Up @@ -264,17 +263,17 @@ func (w ValidatingWebhook) logWebhook(output runtime.Output,
// createAdmissionResponse creates a admission review response which is sent
// to calling kubernetes API server
func (w ValidatingWebhook) createResponseAdmissionReview(
requestedAdmissionReview v1.AdmissionReview,
requestedAdmissionReview admissionv1.AdmissionReview,
allowed bool,
output runtime.Output,
logPath string) *v1.AdmissionReview {
logPath string) *admissionv1.AdmissionReview {

// create an admission review request to be sent as response
responseAdmissionReview := &v1.AdmissionReview{}
responseAdmissionReview := &admissionv1.AdmissionReview{}
responseAdmissionReview.SetGroupVersionKind(requestedAdmissionReview.GroupVersionKind())

// populate admission response
responseAdmissionReview.Response = &v1.AdmissionResponse{
responseAdmissionReview.Response = &admissionv1.AdmissionResponse{
UID: requestedAdmissionReview.Request.UID,
Allowed: allowed,
}
Expand Down

0 comments on commit 5045296

Please sign in to comment.