mirror of
https://github.com/kyverno/kyverno.git
synced 2025-03-31 03:45:17 +00:00
- fix 811; - suppress log
This commit is contained in:
parent
6f039147c8
commit
ddf89b4803
4 changed files with 29 additions and 5 deletions
2
Makefile
2
Makefile
|
@ -10,7 +10,7 @@ TIMESTAMP := $(shell date '+%Y-%m-%d_%I:%M:%S%p')
|
||||||
|
|
||||||
REGISTRY=index.docker.io
|
REGISTRY=index.docker.io
|
||||||
REPO=$(REGISTRY)/nirmata/kyverno
|
REPO=$(REGISTRY)/nirmata/kyverno
|
||||||
IMAGE_TAG=$(GIT_VERSION)
|
IMAGE_TAG?=$(GIT_VERSION)
|
||||||
GOOS ?= $(shell go env GOOS)
|
GOOS ?= $(shell go env GOOS)
|
||||||
PACKAGE ?=github.com/nirmata/kyverno
|
PACKAGE ?=github.com/nirmata/kyverno
|
||||||
LD_FLAGS="-s -w -X $(PACKAGE)/pkg/version.BuildVersion=$(GIT_VERSION) -X $(PACKAGE)/pkg/version.BuildHash=$(GIT_HASH) -X $(PACKAGE)/pkg/version.BuildTime=$(TIMESTAMP)"
|
LD_FLAGS="-s -w -X $(PACKAGE)/pkg/version.BuildVersion=$(GIT_VERSION) -X $(PACKAGE)/pkg/version.BuildHash=$(GIT_HASH) -X $(PACKAGE)/pkg/version.BuildTime=$(TIMESTAMP)"
|
||||||
|
|
|
@ -712,7 +712,7 @@ spec:
|
||||||
- name: kyverno
|
- name: kyverno
|
||||||
image: nirmata/kyverno:v1.1.5
|
image: nirmata/kyverno:v1.1.5
|
||||||
args:
|
args:
|
||||||
- "--filterK8Resources=[Event,*,*][*,kube-system,*][*,kube-public,*][*,kube-node-lease,*][Node,*,*][APIService,*,*][TokenReview,*,*][SubjectAccessReview,*,*][*,kyverno,*]"
|
- "--filterK8Resources=[Event,*,*][*,kube-system,*][*,kube-public,*][*,kube-node-lease,*][Node,*,*][APIService,*,*][TokenReview,*,*][SubjectAccessReview,*,*][*,kyverno,*][Binding,*,*][ReplicaSet,*,*]"
|
||||||
# customize webhook timout
|
# customize webhook timout
|
||||||
# - "--webhooktimeout=4"
|
# - "--webhooktimeout=4"
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -72,7 +72,9 @@ func (ws *WebhookServer) HandleMutation(request *v1beta1.AdmissionRequest, resou
|
||||||
}
|
}
|
||||||
// gather patches
|
// gather patches
|
||||||
patches = append(patches, engineResponse.GetPatches()...)
|
patches = append(patches, engineResponse.GetPatches()...)
|
||||||
logger.Info("mutation rules from policy applied succesfully", "policy", policy.Name)
|
if len(engineResponse.GetPatches()) != 0 {
|
||||||
|
logger.Info("mutation rules from policy applied succesfully", "policy", policy.Name)
|
||||||
|
}
|
||||||
|
|
||||||
policyContext.NewResource = engineResponse.PatchedResource
|
policyContext.NewResource = engineResponse.PatchedResource
|
||||||
}
|
}
|
||||||
|
|
|
@ -193,7 +193,7 @@ func (ws *WebhookServer) handlerFunc(handler func(request *v1beta1.AdmissionRequ
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ws *WebhookServer) handleMutateAdmissionRequest(request *v1beta1.AdmissionRequest) *v1beta1.AdmissionResponse {
|
func (ws *WebhookServer) handleMutateAdmissionRequest(request *v1beta1.AdmissionRequest) *v1beta1.AdmissionResponse {
|
||||||
logger := ws.log.WithValues("uid", request.UID, "kind", request.Kind.Kind, "namespace", request.Namespace, "name", request.Name, "operation", request.Operation)
|
logger := ws.log.WithName("handleMutateAdmissionRequest").WithValues("uid", request.UID, "kind", request.Kind.Kind, "namespace", request.Namespace, "name", request.Name, "operation", request.Operation)
|
||||||
policies, err := ws.pMetaStore.ListAll()
|
policies, err := ws.pMetaStore.ListAll()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Unable to connect to policy Lister to access policies
|
// Unable to connect to policy Lister to access policies
|
||||||
|
@ -288,7 +288,7 @@ func (ws *WebhookServer) handleMutateAdmissionRequest(request *v1beta1.Admission
|
||||||
}
|
}
|
||||||
|
|
||||||
func (ws *WebhookServer) handleValidateAdmissionRequest(request *v1beta1.AdmissionRequest) *v1beta1.AdmissionResponse {
|
func (ws *WebhookServer) handleValidateAdmissionRequest(request *v1beta1.AdmissionRequest) *v1beta1.AdmissionResponse {
|
||||||
logger := ws.log.WithValues("uid", request.UID, "kind", request.Kind.Kind, "namespace", request.Namespace, "name", request.Name, "operation", request.Operation)
|
logger := ws.log.WithName("handleValidateAdmissionRequest").WithValues("uid", request.UID, "kind", request.Kind.Kind, "namespace", request.Namespace, "name", request.Name, "operation", request.Operation)
|
||||||
policies, err := ws.pMetaStore.ListAll()
|
policies, err := ws.pMetaStore.ListAll()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Unable to connect to policy Lister to access policies
|
// Unable to connect to policy Lister to access policies
|
||||||
|
@ -307,6 +307,28 @@ func (ws *WebhookServer) handleValidateAdmissionRequest(request *v1beta1.Admissi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resource, err := convertResource(request.Object.Raw, request.Kind.Group, request.Kind.Version, request.Kind.Kind, request.Namespace)
|
||||||
|
if err != nil {
|
||||||
|
logger.Error(err, "failed to convert RAW resource to unstructured format")
|
||||||
|
|
||||||
|
return &v1beta1.AdmissionResponse{
|
||||||
|
Allowed: false,
|
||||||
|
Result: &metav1.Status{
|
||||||
|
Status: "Failure",
|
||||||
|
Message: err.Error(),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if checkPodTemplateAnn(resource) {
|
||||||
|
return &v1beta1.AdmissionResponse{
|
||||||
|
Allowed: true,
|
||||||
|
Result: &metav1.Status{
|
||||||
|
Status: "Success",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// VALIDATION
|
// VALIDATION
|
||||||
ok, msg := ws.HandleValidation(request, policies, nil, roles, clusterRoles)
|
ok, msg := ws.HandleValidation(request, policies, nil, roles, clusterRoles)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
|
Loading…
Add table
Reference in a new issue