diff --git a/pkg/clientNew/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go similarity index 96% rename from pkg/clientNew/clientset/versioned/clientset.go rename to pkg/client/clientset/versioned/clientset.go index 8c98dcd7db..9725f2aae2 100644 --- a/pkg/clientNew/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -19,7 +19,7 @@ limitations under the License. package versioned import ( - kyvernov1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1" + kyvernov1alpha1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/clientNew/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go similarity index 100% rename from pkg/clientNew/clientset/versioned/doc.go rename to pkg/client/clientset/versioned/doc.go diff --git a/pkg/clientNew/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 89% rename from pkg/clientNew/clientset/versioned/fake/clientset_generated.go rename to pkg/client/clientset/versioned/fake/clientset_generated.go index 18e3e0d57b..ff0c5bc16f 100644 --- a/pkg/clientNew/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - kyvernov1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1" - fakekyvernov1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake" + clientset "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + kyvernov1alpha1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1alpha1" + fakekyvernov1alpha1 "github.com/nirmata/kyverno/pkg/client/clientset/versioned/typed/kyverno/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/clientNew/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from pkg/clientNew/clientset/versioned/fake/doc.go rename to pkg/client/clientset/versioned/fake/doc.go diff --git a/pkg/clientNew/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go similarity index 100% rename from pkg/clientNew/clientset/versioned/fake/register.go rename to pkg/client/clientset/versioned/fake/register.go diff --git a/pkg/clientNew/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from pkg/clientNew/clientset/versioned/scheme/doc.go rename to pkg/client/clientset/versioned/scheme/doc.go diff --git a/pkg/clientNew/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go similarity index 100% rename from pkg/clientNew/clientset/versioned/scheme/register.go rename to pkg/client/clientset/versioned/scheme/register.go diff --git a/pkg/clientNew/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go similarity index 95% rename from pkg/clientNew/informers/externalversions/factory.go rename to pkg/client/informers/externalversions/factory.go index 07bddb9a53..e2da4e38ee 100644 --- a/pkg/clientNew/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - internalinterfaces "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/internalinterfaces" - kyverno "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno" + versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + internalinterfaces "github.com/nirmata/kyverno/pkg/client/informers/externalversions/internalinterfaces" + kyverno "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/clientNew/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go similarity index 100% rename from pkg/clientNew/informers/externalversions/generic.go rename to pkg/client/informers/externalversions/generic.go diff --git a/pkg/clientNew/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from pkg/clientNew/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 2081ff4851..65a1d1de8f 100644 --- a/pkg/clientNew/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" + versioned "github.com/nirmata/kyverno/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/doc.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/doc.go deleted file mode 100644 index df51baa4d4..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -// This package has the automatically generated typed clients. -package v1alpha1 diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/doc.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/doc.go deleted file mode 100644 index 16f4439906..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/doc.go +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -// Package fake has the automatically generated clients. -package fake diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_kyverno_client.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_kyverno_client.go deleted file mode 100644 index 244260245f..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_kyverno_client.go +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - v1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1" - rest "k8s.io/client-go/rest" - testing "k8s.io/client-go/testing" -) - -type FakeKyvernoV1alpha1 struct { - *testing.Fake -} - -func (c *FakeKyvernoV1alpha1) Policies() v1alpha1.PolicyInterface { - return &FakePolicies{c} -} - -func (c *FakeKyvernoV1alpha1) PolicyViolations() v1alpha1.PolicyViolationInterface { - return &FakePolicyViolations{c} -} - -// RESTClient returns a RESTClient that is used to communicate -// with API server by this client implementation. -func (c *FakeKyvernoV1alpha1) RESTClient() rest.Interface { - var ret *rest.RESTClient - return ret -} diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_policy.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_policy.go deleted file mode 100644 index 76bd94b95f..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_policy.go +++ /dev/null @@ -1,131 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" -) - -// FakePolicies implements PolicyInterface -type FakePolicies struct { - Fake *FakeKyvernoV1alpha1 -} - -var policiesResource = schema.GroupVersionResource{Group: "kyverno.io", Version: "v1alpha1", Resource: "policies"} - -var policiesKind = schema.GroupVersionKind{Group: "kyverno.io", Version: "v1alpha1", Kind: "Policy"} - -// Get takes name of the policy, and returns the corresponding policy object, and an error if there is any. -func (c *FakePolicies) Get(name string, options v1.GetOptions) (result *v1alpha1.Policy, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootGetAction(policiesResource, name), &v1alpha1.Policy{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Policy), err -} - -// List takes label and field selectors, and returns the list of Policies that match those selectors. -func (c *FakePolicies) List(opts v1.ListOptions) (result *v1alpha1.PolicyList, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootListAction(policiesResource, policiesKind, opts), &v1alpha1.PolicyList{}) - if obj == nil { - return nil, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.PolicyList{ListMeta: obj.(*v1alpha1.PolicyList).ListMeta} - for _, item := range obj.(*v1alpha1.PolicyList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested policies. -func (c *FakePolicies) Watch(opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchAction(policiesResource, opts)) -} - -// Create takes the representation of a policy and creates it. Returns the server's representation of the policy, and an error, if there is any. -func (c *FakePolicies) Create(policy *v1alpha1.Policy) (result *v1alpha1.Policy, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootCreateAction(policiesResource, policy), &v1alpha1.Policy{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Policy), err -} - -// Update takes the representation of a policy and updates it. Returns the server's representation of the policy, and an error, if there is any. -func (c *FakePolicies) Update(policy *v1alpha1.Policy) (result *v1alpha1.Policy, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateAction(policiesResource, policy), &v1alpha1.Policy{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Policy), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePolicies) UpdateStatus(policy *v1alpha1.Policy) (*v1alpha1.Policy, error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceAction(policiesResource, "status", policy), &v1alpha1.Policy{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Policy), err -} - -// Delete takes name of the policy and deletes it. Returns an error if one occurs. -func (c *FakePolicies) Delete(name string, options *v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteAction(policiesResource, name), &v1alpha1.Policy{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakePolicies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := testing.NewRootDeleteCollectionAction(policiesResource, listOptions) - - _, err := c.Fake.Invokes(action, &v1alpha1.PolicyList{}) - return err -} - -// Patch applies the patch and returns the patched policy. -func (c *FakePolicies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Policy, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceAction(policiesResource, name, pt, data, subresources...), &v1alpha1.Policy{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.Policy), err -} diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_policyviolation.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_policyviolation.go deleted file mode 100644 index e5306f11fe..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/fake/fake_policyviolation.go +++ /dev/null @@ -1,131 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package fake - -import ( - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" -) - -// FakePolicyViolations implements PolicyViolationInterface -type FakePolicyViolations struct { - Fake *FakeKyvernoV1alpha1 -} - -var policyviolationsResource = schema.GroupVersionResource{Group: "kyverno.io", Version: "v1alpha1", Resource: "policyviolations"} - -var policyviolationsKind = schema.GroupVersionKind{Group: "kyverno.io", Version: "v1alpha1", Kind: "PolicyViolation"} - -// Get takes name of the policyViolation, and returns the corresponding policyViolation object, and an error if there is any. -func (c *FakePolicyViolations) Get(name string, options v1.GetOptions) (result *v1alpha1.PolicyViolation, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootGetAction(policyviolationsResource, name), &v1alpha1.PolicyViolation{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PolicyViolation), err -} - -// List takes label and field selectors, and returns the list of PolicyViolations that match those selectors. -func (c *FakePolicyViolations) List(opts v1.ListOptions) (result *v1alpha1.PolicyViolationList, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootListAction(policyviolationsResource, policyviolationsKind, opts), &v1alpha1.PolicyViolationList{}) - if obj == nil { - return nil, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.PolicyViolationList{ListMeta: obj.(*v1alpha1.PolicyViolationList).ListMeta} - for _, item := range obj.(*v1alpha1.PolicyViolationList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested policyViolations. -func (c *FakePolicyViolations) Watch(opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchAction(policyviolationsResource, opts)) -} - -// Create takes the representation of a policyViolation and creates it. Returns the server's representation of the policyViolation, and an error, if there is any. -func (c *FakePolicyViolations) Create(policyViolation *v1alpha1.PolicyViolation) (result *v1alpha1.PolicyViolation, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootCreateAction(policyviolationsResource, policyViolation), &v1alpha1.PolicyViolation{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PolicyViolation), err -} - -// Update takes the representation of a policyViolation and updates it. Returns the server's representation of the policyViolation, and an error, if there is any. -func (c *FakePolicyViolations) Update(policyViolation *v1alpha1.PolicyViolation) (result *v1alpha1.PolicyViolation, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateAction(policyviolationsResource, policyViolation), &v1alpha1.PolicyViolation{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PolicyViolation), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePolicyViolations) UpdateStatus(policyViolation *v1alpha1.PolicyViolation) (*v1alpha1.PolicyViolation, error) { - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceAction(policyviolationsResource, "status", policyViolation), &v1alpha1.PolicyViolation{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PolicyViolation), err -} - -// Delete takes name of the policyViolation and deletes it. Returns an error if one occurs. -func (c *FakePolicyViolations) Delete(name string, options *v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteAction(policyviolationsResource, name), &v1alpha1.PolicyViolation{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakePolicyViolations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - action := testing.NewRootDeleteCollectionAction(policyviolationsResource, listOptions) - - _, err := c.Fake.Invokes(action, &v1alpha1.PolicyViolationList{}) - return err -} - -// Patch applies the patch and returns the patched policyViolation. -func (c *FakePolicyViolations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.PolicyViolation, err error) { - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceAction(policyviolationsResource, name, pt, data, subresources...), &v1alpha1.PolicyViolation{}) - if obj == nil { - return nil, err - } - return obj.(*v1alpha1.PolicyViolation), err -} diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/generated_expansion.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/generated_expansion.go deleted file mode 100644 index 442fa55942..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/generated_expansion.go +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -type PolicyExpansion interface{} - -type PolicyViolationExpansion interface{} diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/kyverno_client.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/kyverno_client.go deleted file mode 100644 index 93b837d4df..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/kyverno_client.go +++ /dev/null @@ -1,95 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - serializer "k8s.io/apimachinery/pkg/runtime/serializer" - rest "k8s.io/client-go/rest" -) - -type KyvernoV1alpha1Interface interface { - RESTClient() rest.Interface - PoliciesGetter - PolicyViolationsGetter -} - -// KyvernoV1alpha1Client is used to interact with features provided by the kyverno.io group. -type KyvernoV1alpha1Client struct { - restClient rest.Interface -} - -func (c *KyvernoV1alpha1Client) Policies() PolicyInterface { - return newPolicies(c) -} - -func (c *KyvernoV1alpha1Client) PolicyViolations() PolicyViolationInterface { - return newPolicyViolations(c) -} - -// NewForConfig creates a new KyvernoV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*KyvernoV1alpha1Client, error) { - config := *c - if err := setConfigDefaults(&config); err != nil { - return nil, err - } - client, err := rest.RESTClientFor(&config) - if err != nil { - return nil, err - } - return &KyvernoV1alpha1Client{client}, nil -} - -// NewForConfigOrDie creates a new KyvernoV1alpha1Client for the given config and -// panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *KyvernoV1alpha1Client { - client, err := NewForConfig(c) - if err != nil { - panic(err) - } - return client -} - -// New creates a new KyvernoV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *KyvernoV1alpha1Client { - return &KyvernoV1alpha1Client{c} -} - -func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion - config.GroupVersion = &gv - config.APIPath = "/apis" - config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} - - if config.UserAgent == "" { - config.UserAgent = rest.DefaultKubernetesUserAgent() - } - - return nil -} - -// RESTClient returns a RESTClient that is used to communicate -// with API server by this client implementation. -func (c *KyvernoV1alpha1Client) RESTClient() rest.Interface { - if c == nil { - return nil - } - return c.restClient -} diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/policy.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/policy.go deleted file mode 100644 index b7fb02600e..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/policy.go +++ /dev/null @@ -1,180 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "time" - - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - scheme "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" -) - -// PoliciesGetter has a method to return a PolicyInterface. -// A group's client should implement this interface. -type PoliciesGetter interface { - Policies() PolicyInterface -} - -// PolicyInterface has methods to work with Policy resources. -type PolicyInterface interface { - Create(*v1alpha1.Policy) (*v1alpha1.Policy, error) - Update(*v1alpha1.Policy) (*v1alpha1.Policy, error) - UpdateStatus(*v1alpha1.Policy) (*v1alpha1.Policy, error) - Delete(name string, options *v1.DeleteOptions) error - DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1alpha1.Policy, error) - List(opts v1.ListOptions) (*v1alpha1.PolicyList, error) - Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Policy, err error) - PolicyExpansion -} - -// policies implements PolicyInterface -type policies struct { - client rest.Interface -} - -// newPolicies returns a Policies -func newPolicies(c *KyvernoV1alpha1Client) *policies { - return &policies{ - client: c.RESTClient(), - } -} - -// Get takes name of the policy, and returns the corresponding policy object, and an error if there is any. -func (c *policies) Get(name string, options v1.GetOptions) (result *v1alpha1.Policy, err error) { - result = &v1alpha1.Policy{} - err = c.client.Get(). - Resource("policies"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of Policies that match those selectors. -func (c *policies) List(opts v1.ListOptions) (result *v1alpha1.PolicyList, err error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - result = &v1alpha1.PolicyList{} - err = c.client.Get(). - Resource("policies"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Do(). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested policies. -func (c *policies) Watch(opts v1.ListOptions) (watch.Interface, error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - opts.Watch = true - return c.client.Get(). - Resource("policies"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Watch() -} - -// Create takes the representation of a policy and creates it. Returns the server's representation of the policy, and an error, if there is any. -func (c *policies) Create(policy *v1alpha1.Policy) (result *v1alpha1.Policy, err error) { - result = &v1alpha1.Policy{} - err = c.client.Post(). - Resource("policies"). - Body(policy). - Do(). - Into(result) - return -} - -// Update takes the representation of a policy and updates it. Returns the server's representation of the policy, and an error, if there is any. -func (c *policies) Update(policy *v1alpha1.Policy) (result *v1alpha1.Policy, err error) { - result = &v1alpha1.Policy{} - err = c.client.Put(). - Resource("policies"). - Name(policy.Name). - Body(policy). - Do(). - Into(result) - return -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - -func (c *policies) UpdateStatus(policy *v1alpha1.Policy) (result *v1alpha1.Policy, err error) { - result = &v1alpha1.Policy{} - err = c.client.Put(). - Resource("policies"). - Name(policy.Name). - SubResource("status"). - Body(policy). - Do(). - Into(result) - return -} - -// Delete takes name of the policy and deletes it. Returns an error if one occurs. -func (c *policies) Delete(name string, options *v1.DeleteOptions) error { - return c.client.Delete(). - Resource("policies"). - Name(name). - Body(options). - Do(). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *policies) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - var timeout time.Duration - if listOptions.TimeoutSeconds != nil { - timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second - } - return c.client.Delete(). - Resource("policies"). - VersionedParams(&listOptions, scheme.ParameterCodec). - Timeout(timeout). - Body(options). - Do(). - Error() -} - -// Patch applies the patch and returns the patched policy. -func (c *policies) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Policy, err error) { - result = &v1alpha1.Policy{} - err = c.client.Patch(pt). - Resource("policies"). - SubResource(subresources...). - Name(name). - Body(data). - Do(). - Into(result) - return -} diff --git a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/policyviolation.go b/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/policyviolation.go deleted file mode 100644 index bc93b28281..0000000000 --- a/pkg/clientNew/clientset/versioned/typed/kyverno/v1alpha1/policyviolation.go +++ /dev/null @@ -1,180 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by client-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "time" - - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - scheme "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - rest "k8s.io/client-go/rest" -) - -// PolicyViolationsGetter has a method to return a PolicyViolationInterface. -// A group's client should implement this interface. -type PolicyViolationsGetter interface { - PolicyViolations() PolicyViolationInterface -} - -// PolicyViolationInterface has methods to work with PolicyViolation resources. -type PolicyViolationInterface interface { - Create(*v1alpha1.PolicyViolation) (*v1alpha1.PolicyViolation, error) - Update(*v1alpha1.PolicyViolation) (*v1alpha1.PolicyViolation, error) - UpdateStatus(*v1alpha1.PolicyViolation) (*v1alpha1.PolicyViolation, error) - Delete(name string, options *v1.DeleteOptions) error - DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1alpha1.PolicyViolation, error) - List(opts v1.ListOptions) (*v1alpha1.PolicyViolationList, error) - Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.PolicyViolation, err error) - PolicyViolationExpansion -} - -// policyViolations implements PolicyViolationInterface -type policyViolations struct { - client rest.Interface -} - -// newPolicyViolations returns a PolicyViolations -func newPolicyViolations(c *KyvernoV1alpha1Client) *policyViolations { - return &policyViolations{ - client: c.RESTClient(), - } -} - -// Get takes name of the policyViolation, and returns the corresponding policyViolation object, and an error if there is any. -func (c *policyViolations) Get(name string, options v1.GetOptions) (result *v1alpha1.PolicyViolation, err error) { - result = &v1alpha1.PolicyViolation{} - err = c.client.Get(). - Resource("policyviolations"). - Name(name). - VersionedParams(&options, scheme.ParameterCodec). - Do(). - Into(result) - return -} - -// List takes label and field selectors, and returns the list of PolicyViolations that match those selectors. -func (c *policyViolations) List(opts v1.ListOptions) (result *v1alpha1.PolicyViolationList, err error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - result = &v1alpha1.PolicyViolationList{} - err = c.client.Get(). - Resource("policyviolations"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Do(). - Into(result) - return -} - -// Watch returns a watch.Interface that watches the requested policyViolations. -func (c *policyViolations) Watch(opts v1.ListOptions) (watch.Interface, error) { - var timeout time.Duration - if opts.TimeoutSeconds != nil { - timeout = time.Duration(*opts.TimeoutSeconds) * time.Second - } - opts.Watch = true - return c.client.Get(). - Resource("policyviolations"). - VersionedParams(&opts, scheme.ParameterCodec). - Timeout(timeout). - Watch() -} - -// Create takes the representation of a policyViolation and creates it. Returns the server's representation of the policyViolation, and an error, if there is any. -func (c *policyViolations) Create(policyViolation *v1alpha1.PolicyViolation) (result *v1alpha1.PolicyViolation, err error) { - result = &v1alpha1.PolicyViolation{} - err = c.client.Post(). - Resource("policyviolations"). - Body(policyViolation). - Do(). - Into(result) - return -} - -// Update takes the representation of a policyViolation and updates it. Returns the server's representation of the policyViolation, and an error, if there is any. -func (c *policyViolations) Update(policyViolation *v1alpha1.PolicyViolation) (result *v1alpha1.PolicyViolation, err error) { - result = &v1alpha1.PolicyViolation{} - err = c.client.Put(). - Resource("policyviolations"). - Name(policyViolation.Name). - Body(policyViolation). - Do(). - Into(result) - return -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - -func (c *policyViolations) UpdateStatus(policyViolation *v1alpha1.PolicyViolation) (result *v1alpha1.PolicyViolation, err error) { - result = &v1alpha1.PolicyViolation{} - err = c.client.Put(). - Resource("policyviolations"). - Name(policyViolation.Name). - SubResource("status"). - Body(policyViolation). - Do(). - Into(result) - return -} - -// Delete takes name of the policyViolation and deletes it. Returns an error if one occurs. -func (c *policyViolations) Delete(name string, options *v1.DeleteOptions) error { - return c.client.Delete(). - Resource("policyviolations"). - Name(name). - Body(options). - Do(). - Error() -} - -// DeleteCollection deletes a collection of objects. -func (c *policyViolations) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { - var timeout time.Duration - if listOptions.TimeoutSeconds != nil { - timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second - } - return c.client.Delete(). - Resource("policyviolations"). - VersionedParams(&listOptions, scheme.ParameterCodec). - Timeout(timeout). - Body(options). - Do(). - Error() -} - -// Patch applies the patch and returns the patched policyViolation. -func (c *policyViolations) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.PolicyViolation, err error) { - result = &v1alpha1.PolicyViolation{} - err = c.client.Patch(pt). - Resource("policyviolations"). - SubResource(subresources...). - Name(name). - Body(data). - Do(). - Into(result) - return -} diff --git a/pkg/clientNew/informers/externalversions/kyverno/interface.go b/pkg/clientNew/informers/externalversions/kyverno/interface.go deleted file mode 100644 index ee3f322230..0000000000 --- a/pkg/clientNew/informers/externalversions/kyverno/interface.go +++ /dev/null @@ -1,46 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by informer-gen. DO NOT EDIT. - -package kyverno - -import ( - internalinterfaces "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno/v1alpha1" -) - -// Interface provides access to each of this group's versions. -type Interface interface { - // V1alpha1 provides access to shared informers for resources in V1alpha1. - V1alpha1() v1alpha1.Interface -} - -type group struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &group{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// V1alpha1 returns a new v1alpha1.Interface. -func (g *group) V1alpha1() v1alpha1.Interface { - return v1alpha1.New(g.factory, g.namespace, g.tweakListOptions) -} diff --git a/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/interface.go b/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/interface.go deleted file mode 100644 index ceead2b318..0000000000 --- a/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/interface.go +++ /dev/null @@ -1,52 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - internalinterfaces "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/internalinterfaces" -) - -// Interface provides access to all the informers in this group version. -type Interface interface { - // Policies returns a PolicyInformer. - Policies() PolicyInformer - // PolicyViolations returns a PolicyViolationInformer. - PolicyViolations() PolicyViolationInformer -} - -type version struct { - factory internalinterfaces.SharedInformerFactory - namespace string - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// New returns a new Interface. -func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakListOptions internalinterfaces.TweakListOptionsFunc) Interface { - return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} -} - -// Policies returns a PolicyInformer. -func (v *version) Policies() PolicyInformer { - return &policyInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} -} - -// PolicyViolations returns a PolicyViolationInformer. -func (v *version) PolicyViolations() PolicyViolationInformer { - return &policyViolationInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} -} diff --git a/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/policy.go b/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/policy.go deleted file mode 100644 index b59ee59a86..0000000000 --- a/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/policy.go +++ /dev/null @@ -1,88 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - time "time" - - kyvernov1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - versioned "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - internalinterfaces "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" -) - -// PolicyInformer provides access to a shared informer and lister for -// Policies. -type PolicyInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.PolicyLister -} - -type policyInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// NewPolicyInformer constructs a new informer for Policy type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewPolicyInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredPolicyInformer(client, resyncPeriod, indexers, nil) -} - -// NewFilteredPolicyInformer constructs a new informer for Policy type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredPolicyInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.KyvernoV1alpha1().Policies().List(options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.KyvernoV1alpha1().Policies().Watch(options) - }, - }, - &kyvernov1alpha1.Policy{}, - resyncPeriod, - indexers, - ) -} - -func (f *policyInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredPolicyInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *policyInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kyvernov1alpha1.Policy{}, f.defaultInformer) -} - -func (f *policyInformer) Lister() v1alpha1.PolicyLister { - return v1alpha1.NewPolicyLister(f.Informer().GetIndexer()) -} diff --git a/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/policyviolation.go b/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/policyviolation.go deleted file mode 100644 index 286b015fd9..0000000000 --- a/pkg/clientNew/informers/externalversions/kyverno/v1alpha1/policyviolation.go +++ /dev/null @@ -1,88 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by informer-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - time "time" - - kyvernov1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - versioned "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - internalinterfaces "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" -) - -// PolicyViolationInformer provides access to a shared informer and lister for -// PolicyViolations. -type PolicyViolationInformer interface { - Informer() cache.SharedIndexInformer - Lister() v1alpha1.PolicyViolationLister -} - -type policyViolationInformer struct { - factory internalinterfaces.SharedInformerFactory - tweakListOptions internalinterfaces.TweakListOptionsFunc -} - -// NewPolicyViolationInformer constructs a new informer for PolicyViolation type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewPolicyViolationInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { - return NewFilteredPolicyViolationInformer(client, resyncPeriod, indexers, nil) -} - -// NewFilteredPolicyViolationInformer constructs a new informer for PolicyViolation type. -// Always prefer using an informer factory to get a shared informer instead of getting an independent -// one. This reduces memory footprint and number of connections to the server. -func NewFilteredPolicyViolationInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { - return cache.NewSharedIndexInformer( - &cache.ListWatch{ - ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.KyvernoV1alpha1().PolicyViolations().List(options) - }, - WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - if tweakListOptions != nil { - tweakListOptions(&options) - } - return client.KyvernoV1alpha1().PolicyViolations().Watch(options) - }, - }, - &kyvernov1alpha1.PolicyViolation{}, - resyncPeriod, - indexers, - ) -} - -func (f *policyViolationInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { - return NewFilteredPolicyViolationInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) -} - -func (f *policyViolationInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&kyvernov1alpha1.PolicyViolation{}, f.defaultInformer) -} - -func (f *policyViolationInformer) Lister() v1alpha1.PolicyViolationLister { - return v1alpha1.NewPolicyViolationLister(f.Informer().GetIndexer()) -} diff --git a/pkg/clientNew/listers/kyverno/v1alpha1/expansion_generated.go b/pkg/clientNew/listers/kyverno/v1alpha1/expansion_generated.go deleted file mode 100644 index f37f2e4f76..0000000000 --- a/pkg/clientNew/listers/kyverno/v1alpha1/expansion_generated.go +++ /dev/null @@ -1,101 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "fmt" - - kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" -) - -// PolicyListerExpansion allows custom methods to be added to -// PolicyLister. -type PolicyListerExpansion interface { - GetPolicyForPolicyViolation(pv *kyverno.PolicyViolation) ([]*kyverno.Policy, error) - ListResources(selector labels.Selector) (ret []*v1alpha1.Policy, err error) -} - -// PolicyViolationListerExpansion allows custom methods to be added to -// PolicyViolationLister. -type PolicyViolationListerExpansion interface { - // List lists all PolicyViolations in the indexer with GVK. - // List lists all PolicyViolations in the indexer with GVK. - ListResources(selector labels.Selector) (ret []*v1alpha1.PolicyViolation, err error) -} - -//ListResources is a wrapper to List and adds the resource kind information -// as the lister is specific to a gvk we can harcode the values here -func (pvl *policyViolationLister) ListResources(selector labels.Selector) (ret []*v1alpha1.PolicyViolation, err error) { - policyviolations, err := pvl.List(selector) - for index := range policyviolations { - policyviolations[index].SetGroupVersionKind(kyverno.SchemeGroupVersion.WithKind("PolicyViolation")) - } - return policyviolations, nil -} - -//ListResources is a wrapper to List and adds the resource kind information -// as the lister is specific to a gvk we can harcode the values here -func (pl *policyLister) ListResources(selector labels.Selector) (ret []*v1alpha1.Policy, err error) { - policies, err := pl.List(selector) - for index := range policies { - policies[index].SetGroupVersionKind(kyverno.SchemeGroupVersion.WithKind("Policy")) - } - return policies, err -} - -func (pl *policyLister) GetPolicyForPolicyViolation(pv *kyverno.PolicyViolation) ([]*kyverno.Policy, error) { - if len(pv.Labels) == 0 { - return nil, fmt.Errorf("no Policy found for PolicyViolation %v because it has no labels", pv.Name) - } - - pList, err := pl.List(labels.Everything()) - if err != nil { - return nil, err - } - - var policies []*kyverno.Policy - for _, p := range pList { - policyLabelmap := map[string]string{"policy": p.Name} - - ls := &metav1.LabelSelector{} - err = metav1.Convert_Map_string_To_string_To_v1_LabelSelector(&policyLabelmap, ls, nil) - if err != nil { - return nil, fmt.Errorf("failed to generate label sector of Policy name %s: %v", p.Name, err) - } - selector, err := metav1.LabelSelectorAsSelector(ls) - if err != nil { - return nil, fmt.Errorf("invalid label selector: %v", err) - } - // If a policy with a nil or empty selector creeps in, it should match nothing, not everything. - if selector.Empty() || !selector.Matches(labels.Set(pv.Labels)) { - continue - } - policies = append(policies, p) - } - - if len(policies) == 0 { - return nil, fmt.Errorf("could not find Policy set for PolicyViolation %s with labels: %v", pv.Name, pv.Labels) - } - - return policies, nil - -} diff --git a/pkg/clientNew/listers/kyverno/v1alpha1/policy.go b/pkg/clientNew/listers/kyverno/v1alpha1/policy.go deleted file mode 100644 index c981855c33..0000000000 --- a/pkg/clientNew/listers/kyverno/v1alpha1/policy.go +++ /dev/null @@ -1,65 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// PolicyLister helps list Policies. -type PolicyLister interface { - // List lists all Policies in the indexer. - List(selector labels.Selector) (ret []*v1alpha1.Policy, err error) - // Get retrieves the Policy from the index for a given name. - Get(name string) (*v1alpha1.Policy, error) - PolicyListerExpansion -} - -// policyLister implements the PolicyLister interface. -type policyLister struct { - indexer cache.Indexer -} - -// NewPolicyLister returns a new PolicyLister. -func NewPolicyLister(indexer cache.Indexer) PolicyLister { - return &policyLister{indexer: indexer} -} - -// List lists all Policies in the indexer. -func (s *policyLister) List(selector labels.Selector) (ret []*v1alpha1.Policy, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.Policy)) - }) - return ret, err -} - -// Get retrieves the Policy from the index for a given name. -func (s *policyLister) Get(name string) (*v1alpha1.Policy, error) { - obj, exists, err := s.indexer.GetByKey(name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("policy"), name) - } - return obj.(*v1alpha1.Policy), nil -} diff --git a/pkg/clientNew/listers/kyverno/v1alpha1/policyviolation.go b/pkg/clientNew/listers/kyverno/v1alpha1/policyviolation.go deleted file mode 100644 index e93ec95228..0000000000 --- a/pkg/clientNew/listers/kyverno/v1alpha1/policyviolation.go +++ /dev/null @@ -1,65 +0,0 @@ -/* -Copyright The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// Code generated by lister-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/tools/cache" -) - -// PolicyViolationLister helps list PolicyViolations. -type PolicyViolationLister interface { - // List lists all PolicyViolations in the indexer. - List(selector labels.Selector) (ret []*v1alpha1.PolicyViolation, err error) - // Get retrieves the PolicyViolation from the index for a given name. - Get(name string) (*v1alpha1.PolicyViolation, error) - PolicyViolationListerExpansion -} - -// policyViolationLister implements the PolicyViolationLister interface. -type policyViolationLister struct { - indexer cache.Indexer -} - -// NewPolicyViolationLister returns a new PolicyViolationLister. -func NewPolicyViolationLister(indexer cache.Indexer) PolicyViolationLister { - return &policyViolationLister{indexer: indexer} -} - -// List lists all PolicyViolations in the indexer. -func (s *policyViolationLister) List(selector labels.Selector) (ret []*v1alpha1.PolicyViolation, err error) { - err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.PolicyViolation)) - }) - return ret, err -} - -// Get retrieves the PolicyViolation from the index for a given name. -func (s *policyViolationLister) Get(name string) (*v1alpha1.PolicyViolation, error) { - obj, exists, err := s.indexer.GetByKey(name) - if err != nil { - return nil, err - } - if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("policyviolation"), name) - } - return obj.(*v1alpha1.PolicyViolation), nil -} diff --git a/pkg/event/controller.go b/pkg/event/controller.go index 6fc0d57a0f..8cf6a234e3 100644 --- a/pkg/event/controller.go +++ b/pkg/event/controller.go @@ -5,10 +5,9 @@ import ( "github.com/golang/glog" - "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - policyscheme "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - informer "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno/v1alpha1" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme" + kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha1" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" client "github.com/nirmata/kyverno/pkg/dclient" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" @@ -22,7 +21,7 @@ import ( //Generator generate events type Generator struct { client *client.Client - pLister lister.PolicyLister + pLister kyvernolister.PolicyLister queue workqueue.RateLimitingInterface recorder record.EventRecorder } @@ -34,7 +33,7 @@ type Interface interface { //NewEventGenerator to generate a new event controller func NewEventGenerator(client *client.Client, - pInformer informer.PolicyInformer) *Generator { + pInformer kyvernoinformer.PolicyInformer) *Generator { gen := Generator{ client: client, @@ -48,7 +47,7 @@ func NewEventGenerator(client *client.Client, func initRecorder(client *client.Client) record.EventRecorder { // Initliaze Event Broadcaster - err := policyscheme.AddToScheme(scheme.Scheme) + err := scheme.AddToScheme(scheme.Scheme) if err != nil { glog.Error(err) return nil diff --git a/pkg/namespace/controller.go b/pkg/namespace/controller.go index fae6b7539f..78e6340a3f 100644 --- a/pkg/namespace/controller.go +++ b/pkg/namespace/controller.go @@ -10,9 +10,9 @@ import ( "github.com/nirmata/kyverno/pkg/event" "k8s.io/apimachinery/pkg/api/errors" - kyvernoclient "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - informer "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno/v1alpha1" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha1" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" v1 "k8s.io/api/core/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" v1Informer "k8s.io/client-go/informers/core/v1" @@ -39,11 +39,11 @@ type NamespaceController struct { // nsListerSynced returns true if the Namespace store has been synced at least once nsListerSynced cache.InformerSynced // pvLister can list/get policy violation from the shared informer's store - pLister lister.PolicyLister + pLister kyvernolister.PolicyLister // pvListerSynced retrns true if the Policy store has been synced at least once pvListerSynced cache.InformerSynced // pvLister can list/get policy violation from the shared informer's store - pvLister lister.PolicyViolationLister + pvLister kyvernolister.PolicyViolationLister // eventGen provides interface to generate evenets eventGen event.Interface @@ -57,8 +57,8 @@ type NamespaceController struct { func NewNamespaceController(kyvernoClient *kyvernoclient.Clientset, client *client.Client, nsInformer v1Informer.NamespaceInformer, - pInformer informer.PolicyInformer, - pvInformer informer.PolicyViolationInformer, + pInformer kyvernoinformer.PolicyInformer, + pvInformer kyvernoinformer.PolicyViolationInformer, eventGen event.Interface) *NamespaceController { //TODO: do we need to event recorder for this controller? // create the controller diff --git a/pkg/namespace/generation.go b/pkg/namespace/generation.go index c21dc50638..18a6a2908d 100644 --- a/pkg/namespace/generation.go +++ b/pkg/namespace/generation.go @@ -11,7 +11,7 @@ import ( kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" "github.com/nirmata/kyverno/pkg/info" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" @@ -116,7 +116,7 @@ func (nsc *NamespaceController) processNamespace(namespace corev1.Namespace) []i return policyInfos } -func listpolicies(ns unstructured.Unstructured, pLister lister.PolicyLister) []*kyverno.Policy { +func listpolicies(ns unstructured.Unstructured, pLister kyvernolister.PolicyLister) []*kyverno.Policy { var filteredpolicies []*kyverno.Policy glog.V(4).Infof("listing policies for namespace %s", ns.GetName()) policies, err := pLister.List(labels.NewSelector()) diff --git a/pkg/policy/controller.go b/pkg/policy/controller.go index 9f71dc1542..142f28594f 100644 --- a/pkg/policy/controller.go +++ b/pkg/policy/controller.go @@ -9,10 +9,10 @@ import ( "github.com/golang/glog" kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - kyvernoclient "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - informer "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno/v1alpha1" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme" + kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha1" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" client "github.com/nirmata/kyverno/pkg/dclient" "github.com/nirmata/kyverno/pkg/event" "github.com/nirmata/kyverno/pkg/utils" @@ -57,9 +57,9 @@ type PolicyController struct { // Policys that need to be synced queue workqueue.RateLimitingInterface // pLister can list/get policy from the shared informer's store - pLister lister.PolicyLister + pLister kyvernolister.PolicyLister // pvLister can list/get policy violation from the shared informer's store - pvLister lister.PolicyViolationLister + pvLister kyvernolister.PolicyViolationLister // pListerSynced returns true if the Policy store has been synced at least once pListerSynced cache.InformerSynced // pvListerSynced retrns true if the Policy store has been synced at least once @@ -71,7 +71,7 @@ type PolicyController struct { } // NewPolicyController create a new PolicyController -func NewPolicyController(kyvernoClient *kyvernoclient.Clientset, client *client.Client, pInformer informer.PolicyInformer, pvInformer informer.PolicyViolationInformer, eventGen event.Interface) (*PolicyController, error) { +func NewPolicyController(kyvernoClient *kyvernoclient.Clientset, client *client.Client, pInformer kyvernoinformer.PolicyInformer, pvInformer kyvernoinformer.PolicyViolationInformer, eventGen event.Interface) (*PolicyController, error) { // Event broad caster eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) diff --git a/pkg/policyviolation/controller.go b/pkg/policyviolation/controller.go index 0c1ff50741..9447199fa9 100644 --- a/pkg/policyviolation/controller.go +++ b/pkg/policyviolation/controller.go @@ -7,10 +7,10 @@ import ( "github.com/golang/glog" kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - kyvernoclient "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned/scheme" - informer "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno/v1alpha1" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + "github.com/nirmata/kyverno/pkg/client/clientset/versioned/scheme" + kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha1" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" client "github.com/nirmata/kyverno/pkg/dclient" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -47,9 +47,9 @@ type PolicyViolationController struct { // Policys that need to be synced queue workqueue.RateLimitingInterface // pvLister can list/get policy violation from the shared informer's store - pvLister lister.PolicyViolationLister + pvLister kyvernolister.PolicyViolationLister // pLister can list/get policy from the shared informer's store - pLister lister.PolicyLister + pLister kyvernolister.PolicyLister // pListerSynced returns true if the Policy store has been synced at least once pListerSynced cache.InformerSynced // pvListerSynced retrns true if the Policy store has been synced at least once @@ -59,7 +59,7 @@ type PolicyViolationController struct { } //NewPolicyViolationController creates a new NewPolicyViolationController -func NewPolicyViolationController(client *client.Client, kyvernoClient *kyvernoclient.Clientset, pInformer informer.PolicyInformer, pvInformer informer.PolicyViolationInformer) (*PolicyViolationController, error) { +func NewPolicyViolationController(client *client.Client, kyvernoClient *kyvernoclient.Clientset, pInformer kyvernoinformer.PolicyInformer, pvInformer kyvernoinformer.PolicyViolationInformer) (*PolicyViolationController, error) { // Event broad caster eventBroadcaster := record.NewBroadcaster() eventBroadcaster.StartLogging(glog.Infof) diff --git a/pkg/policyviolation/helpers.go b/pkg/policyviolation/helpers.go index ae62e87b5a..98ab01c0a9 100644 --- a/pkg/policyviolation/helpers.go +++ b/pkg/policyviolation/helpers.go @@ -6,8 +6,8 @@ import ( "github.com/golang/glog" kyverno "github.com/nirmata/kyverno/pkg/api/kyverno/v1alpha1" - kyvernoclient "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" "github.com/nirmata/kyverno/pkg/info" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" @@ -54,7 +54,7 @@ func buildPolicyViolationsForAPolicy(pi info.PolicyInfo) kyverno.PolicyViolation //generatePolicyViolations generate policyViolation resources for the rules that failed //TODO: check if pvListerSynced is needed -func GeneratePolicyViolations(pvListerSynced cache.InformerSynced, pvLister lister.PolicyViolationLister, client *kyvernoclient.Clientset, policyInfos []info.PolicyInfo) { +func GeneratePolicyViolations(pvListerSynced cache.InformerSynced, pvLister kyvernolister.PolicyViolationLister, client *kyvernoclient.Clientset, policyInfos []info.PolicyInfo) { var pvs []kyverno.PolicyViolation for _, policyInfo := range policyInfos { if !policyInfo.IsSuccessful() { @@ -100,7 +100,7 @@ func GeneratePolicyViolations(pvListerSynced cache.InformerSynced, pvLister list } //TODO: change the name -func getExistingPolicyViolationIfAny(pvListerSynced cache.InformerSynced, pvLister lister.PolicyViolationLister, newPv kyverno.PolicyViolation) (*kyverno.PolicyViolation, error) { +func getExistingPolicyViolationIfAny(pvListerSynced cache.InformerSynced, pvLister kyvernolister.PolicyViolationLister, newPv kyverno.PolicyViolation) (*kyverno.PolicyViolation, error) { // TODO: check for existing ov using label selectors on resource and policy labelMap := map[string]string{"policy": newPv.Spec.Policy, "resource": newPv.Spec.ResourceSpec.ToKey()} ls := &metav1.LabelSelector{} diff --git a/pkg/webhooks/server.go b/pkg/webhooks/server.go index 77d3858e62..649a0f3f9d 100644 --- a/pkg/webhooks/server.go +++ b/pkg/webhooks/server.go @@ -11,9 +11,9 @@ import ( "time" "github.com/golang/glog" - kyvernoclient "github.com/nirmata/kyverno/pkg/clientNew/clientset/versioned" - informer "github.com/nirmata/kyverno/pkg/clientNew/informers/externalversions/kyverno/v1alpha1" - lister "github.com/nirmata/kyverno/pkg/clientNew/listers/kyverno/v1alpha1" + kyvernoclient "github.com/nirmata/kyverno/pkg/client/clientset/versioned" + kyvernoinformer "github.com/nirmata/kyverno/pkg/client/informers/externalversions/kyverno/v1alpha1" + kyvernolister "github.com/nirmata/kyverno/pkg/client/listers/kyverno/v1alpha1" "github.com/nirmata/kyverno/pkg/config" client "github.com/nirmata/kyverno/pkg/dclient" "github.com/nirmata/kyverno/pkg/event" @@ -29,8 +29,8 @@ type WebhookServer struct { server http.Server client *client.Client kyvernoClient *kyvernoclient.Clientset - pLister lister.PolicyLister - pvLister lister.PolicyViolationLister + pLister kyvernolister.PolicyLister + pvLister kyvernolister.PolicyViolationLister pListerSynced cache.InformerSynced pvListerSynced cache.InformerSynced eventGen event.Interface @@ -43,8 +43,8 @@ func NewWebhookServer( kyvernoClient *kyvernoclient.Clientset, client *client.Client, tlsPair *tlsutils.TlsPemPair, - pInformer informer.PolicyInformer, - pvInormer informer.PolicyViolationInformer, + pInformer kyvernoinformer.PolicyInformer, + pvInormer kyvernoinformer.PolicyViolationInformer, eventGen event.Interface, filterK8Resources string) (*WebhookServer, error) { diff --git a/scripts/new_update-codegen.sh b/scripts/new_update-codegen.sh deleted file mode 100755 index 38f54515e6..0000000000 --- a/scripts/new_update-codegen.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -set -o errexit -set -o nounset -set -o pipefail - -case "$(uname -s)" in - Linux*) linkutil=readlink;; - Darwin*) linkutil=greadlink;; - *) machine="UNKNOWN:${unameOut}" -esac - -# get nirmata root -NIRMATA_DIR=$(dirname ${BASH_SOURCE})/.. -NIRMATA_ROOT=$(${linkutil} -f ${NIRMATA_DIR}) - -# get relative path to code generation script -CODEGEN_PKG=${NIRMATA_DIR}/vendor/k8s.io/code-generator - -# get relative path of nirmata -NIRMATA_PKG=${NIRMATA_ROOT#"${GOPATH}/src/"} - -# perform code generation -${CODEGEN_PKG}/generate-groups.sh \ - "deepcopy,client,informer,lister" \ - ${NIRMATA_PKG}/pkg/clientNew \ - ${NIRMATA_PKG}/pkg/api \ - kyverno:v1alpha1 diff --git a/scripts/update-codegen.sh b/scripts/update-codegen.sh index fd53c78cb5..b339547fa8 100755 --- a/scripts/update-codegen.sh +++ b/scripts/update-codegen.sh @@ -23,5 +23,5 @@ NIRMATA_PKG=${NIRMATA_ROOT#"${GOPATH}/src/"} ${CODEGEN_PKG}/generate-groups.sh \ "deepcopy,client,informer,lister" \ ${NIRMATA_PKG}/pkg/client \ - ${NIRMATA_PKG}/pkg/apis \ - policy:v1alpha1 + ${NIRMATA_PKG}/pkg/api \ + kyverno:v1alpha1