mirror of
https://github.com/kyverno/kyverno.git
synced 2025-03-15 12:17:56 +00:00
NK-10: Fixed group name in crd.yaml and register.go.
Fixed crash in controller, removed name checking in the root of admission request.
This commit is contained in:
parent
eb5c486ae1
commit
ae952f73ab
4 changed files with 12 additions and 7 deletions
|
@ -2,6 +2,7 @@ package controller
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log"
|
"log"
|
||||||
|
"os"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"k8s.io/apimachinery/pkg/labels"
|
"k8s.io/apimachinery/pkg/labels"
|
||||||
|
@ -23,6 +24,10 @@ type PolicyController struct {
|
||||||
|
|
||||||
// NewPolicyController from cmd args
|
// NewPolicyController from cmd args
|
||||||
func NewPolicyController(masterURL, kubeconfigPath string, logger *log.Logger) (*PolicyController, error) {
|
func NewPolicyController(masterURL, kubeconfigPath string, logger *log.Logger) (*PolicyController, error) {
|
||||||
|
if logger == nil {
|
||||||
|
logger = log.New(os.Stdout, "", log.LstdFlags|log.Lshortfile)
|
||||||
|
}
|
||||||
|
|
||||||
cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
|
cfg, err := clientcmd.BuildConfigFromFlags(masterURL, kubeconfigPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Printf("Error building kubeconfig: %v\n", err)
|
logger.Printf("Error building kubeconfig: %v\n", err)
|
||||||
|
@ -41,6 +46,7 @@ func NewPolicyController(masterURL, kubeconfigPath string, logger *log.Logger) (
|
||||||
controller := &PolicyController{
|
controller := &PolicyController{
|
||||||
policyInformerFactory: policyInformerFactory,
|
policyInformerFactory: policyInformerFactory,
|
||||||
policyLister: policyInformer.Lister(),
|
policyLister: policyInformer.Lister(),
|
||||||
|
logger: logger,
|
||||||
}
|
}
|
||||||
|
|
||||||
policyInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
policyInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
|
||||||
|
@ -54,7 +60,7 @@ func NewPolicyController(masterURL, kubeconfigPath string, logger *log.Logger) (
|
||||||
|
|
||||||
// Run is main controller thread
|
// Run is main controller thread
|
||||||
func (c *PolicyController) Run(stopCh <-chan struct{}) {
|
func (c *PolicyController) Run(stopCh <-chan struct{}) {
|
||||||
//c.policyInformerFactory.Start(stopCh)
|
c.policyInformerFactory.Start(stopCh)
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetPolicies retrieves all policy resources
|
// GetPolicies retrieves all policy resources
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
apiVersion: apiextensions.k8s.io/v1beta1
|
apiVersion: apiextensions.k8s.io/v1beta1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
name: policies.nirmata.io
|
name: policies.policy.nirmata.io
|
||||||
spec:
|
spec:
|
||||||
group: nirmata.io
|
group: policy.nirmata.io
|
||||||
versions:
|
versions:
|
||||||
- name: v1alpha1
|
- name: v1alpha1
|
||||||
served: true
|
served: true
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
package policy
|
package policy
|
||||||
|
|
||||||
const (
|
const (
|
||||||
GroupName = "nirmata.io"
|
GroupName = "policy.nirmata.io"
|
||||||
)
|
)
|
||||||
|
|
|
@ -48,8 +48,7 @@ func IsRuleResourceFitsRequest(resource types.PolicyResource, request *v1beta1.A
|
||||||
if resource.Kind != request.Kind.Kind {
|
if resource.Kind != request.Kind.Kind {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
if resource.Name != nil && *resource.Name != request.Name {
|
// TODO: resource.Name must be equal to request.Object.Raw -> /metadata/name
|
||||||
return false
|
|
||||||
}
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue