mirrors/kyverno
mirrors/kyverno
1
0
Fork 0
mirror of https://github.com/kyverno/kyverno.git synced 2025-03-31 03:45:17 +00:00
Code Activity

refactor

Browse source
This commit is contained in:
shivkumar dudhani 2019-11-19 10:13:03 -08:00
parent 89d0cc8799
commit 0d4bbb5a38
9 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/initContainer/main.go
View file

@ -94,7 +94,7 @@ func removeWebhookIfExists(client *client.Client, kind string, name string) erro
return err return err
} }
// Delete resource // Delete resource
err = client.DeleteResouce(kind, "", name, false) err = client.DeleteResource(kind, "", name, false)
if err != nil { if err != nil {
glog.Errorf("failed to delete resource %s(%s)", name, kind) glog.Errorf("failed to delete resource %s(%s)", name, kind)
return err return err

5
cmd/kyverno/main.go
View file

@ -75,14 +75,11 @@ func main() {
} }
// WERBHOOK REGISTRATION CLIENT // WERBHOOK REGISTRATION CLIENT
webhookRegistrationClient, err := webhookconfig.NewWebhookRegistrationClient( webhookRegistrationClient := webhookconfig.NewWebhookRegistrationClient(
clientConfig, clientConfig,
client, client,
serverIP, serverIP,
int32(webhookTimeout)) int32(webhookTimeout))
if err != nil {
glog.Fatalf("Unable to register admission webhooks on cluster: %v\n", err)
}
// KYVERNO CRD INFORMER // KYVERNO CRD INFORMER
// watches CRD resources: // watches CRD resources:

2
pkg/dclient/certificates.go
View file

@ -82,7 +82,7 @@ func (c *Client) submitAndApproveCertificateRequest(req *certificates.Certificat
for _, csr := range csrList.Items { for _, csr := range csrList.Items {
if csr.GetName() == req.ObjectMeta.Name { if csr.GetName() == req.ObjectMeta.Name {
err := c.DeleteResouce(CSRs, "", csr.GetName(), false) err := c.DeleteResource(CSRs, "", csr.GetName(), false)
if err != nil { if err != nil {
return nil, fmt.Errorf("Unable to delete existing certificate request: %v", err) return nil, fmt.Errorf("Unable to delete existing certificate request: %v", err)
} }

2
pkg/dclient/client.go
View file

@ -131,7 +131,7 @@ func (c *Client) ListResource(kind string, namespace string, lselector *meta.Lab
} }
// DeleteResouce deletes the specified resource // DeleteResouce deletes the specified resource
func (c *Client) DeleteResouce(kind string, namespace string, name string, dryRun bool) error { func (c *Client) DeleteResource(kind string, namespace string, name string, dryRun bool) error {
options := meta.DeleteOptions{} options := meta.DeleteOptions{}
if dryRun { if dryRun {
options = meta.DeleteOptions{DryRun: []string{meta.DryRunAll}} options = meta.DeleteOptions{DryRun: []string{meta.DryRunAll}}

2
pkg/dclient/client_test.go
View file

@ -74,7 +74,7 @@ func TestCRUDResource(t *testing.T) {
t.Errorf("ListResource not working: %s", err) t.Errorf("ListResource not working: %s", err)
} }
// DeleteResouce // DeleteResouce
err = f.client.DeleteResouce("thekind", "ns-foo", "name-bar", false) err = f.client.DeleteResource("thekind", "ns-foo", "name-bar", false)
if err != nil { if err != nil {
t.Errorf("DeleteResouce not working: %s", err) t.Errorf("DeleteResouce not working: %s", err)
} }

2
pkg/webhookconfig/checker.go
View file

@ -67,7 +67,7 @@ func (wrc *WebhookRegistrationClient) removeVerifyWebhookMutatingWebhookConfig()
mutatingConfig = config.VerifyMutatingWebhookConfigurationName mutatingConfig = config.VerifyMutatingWebhookConfigurationName
} }
glog.V(4).Infof("removing webhook configuration %s", mutatingConfig) glog.V(4).Infof("removing webhook configuration %s", mutatingConfig)
err = wrc.client.DeleteResouce(MutatingWebhookConfigurationKind, "", mutatingConfig, false) err = wrc.client.DeleteResource(MutatingWebhookConfigurationKind, "", mutatingConfig, false)
if errorsapi.IsNotFound(err) { if errorsapi.IsNotFound(err) {
glog.V(4).Infof("verify webhook configuration %s, does not exits. not deleting", mutatingConfig) glog.V(4).Infof("verify webhook configuration %s, does not exits. not deleting", mutatingConfig)
} else if err != nil { } else if err != nil {

4
pkg/webhookconfig/policy.go
View file

@ -118,7 +118,7 @@ func (wrc *WebhookRegistrationClient) removePolicyWebhookConfigurations() {
validatingConfig = config.PolicyValidatingWebhookConfigurationName validatingConfig = config.PolicyValidatingWebhookConfigurationName
} }
glog.V(4).Infof("removing webhook configuration %s", validatingConfig) glog.V(4).Infof("removing webhook configuration %s", validatingConfig)
err = wrc.client.DeleteResouce(ValidatingWebhookConfigurationKind, "", validatingConfig, false) err = wrc.client.DeleteResource(ValidatingWebhookConfigurationKind, "", validatingConfig, false)
if errorsapi.IsNotFound(err) { if errorsapi.IsNotFound(err) {
glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", validatingConfig) glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", validatingConfig)
} else if err != nil { } else if err != nil {
@ -136,7 +136,7 @@ func (wrc *WebhookRegistrationClient) removePolicyWebhookConfigurations() {
} }
glog.V(4).Infof("removing webhook configuration %s", mutatingConfig) glog.V(4).Infof("removing webhook configuration %s", mutatingConfig)
err = wrc.client.DeleteResouce(MutatingWebhookConfigurationKind, "", mutatingConfig, false) err = wrc.client.DeleteResource(MutatingWebhookConfigurationKind, "", mutatingConfig, false)
if errorsapi.IsNotFound(err) { if errorsapi.IsNotFound(err) {
glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", mutatingConfig) glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", mutatingConfig)
} else if err != nil { } else if err != nil {

6
pkg/webhookconfig/registration.go
View file

@ -6,6 +6,7 @@ import (
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/nirmata/kyverno/pkg/config"
client "github.com/nirmata/kyverno/pkg/dclient" client "github.com/nirmata/kyverno/pkg/dclient"
admregapi "k8s.io/api/admissionregistration/v1beta1" admregapi "k8s.io/api/admissionregistration/v1beta1"
errorsapi "k8s.io/apimachinery/pkg/api/errors" errorsapi "k8s.io/apimachinery/pkg/api/errors"
@ -249,7 +250,7 @@ func (wrc *WebhookRegistrationClient) removePolicyMutatingWebhookConfiguration(w
} }
glog.V(4).Infof("removing webhook configuration %s", mutatingConfig) glog.V(4).Infof("removing webhook configuration %s", mutatingConfig)
err := wrc.registrationClient.MutatingWebhookConfigurations().Delete(mutatingConfig, &v1.DeleteOptions{}) err := wrc.client.DeleteResource(MutatingWebhookConfigurationKind, "", mutatingConfig, false)
if errorsapi.IsNotFound(err) { if errorsapi.IsNotFound(err) {
glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", mutatingConfig) glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", mutatingConfig)
} else if err != nil { } else if err != nil {
@ -264,7 +265,6 @@ func (wrc *WebhookRegistrationClient) removePolicyMutatingWebhookConfiguration(w
func (wrc *WebhookRegistrationClient) removePolicyValidatingWebhookConfiguration(wg *sync.WaitGroup) { func (wrc *WebhookRegistrationClient) removePolicyValidatingWebhookConfiguration(wg *sync.WaitGroup) {
defer wg.Done() defer wg.Done()
// Validating webhook configuration // Validating webhook configuration
var err error
var validatingConfig string var validatingConfig string
if wrc.serverIP != "" { if wrc.serverIP != "" {
validatingConfig = config.PolicyValidatingWebhookConfigurationDebugName validatingConfig = config.PolicyValidatingWebhookConfigurationDebugName
@ -272,7 +272,7 @@ func (wrc *WebhookRegistrationClient) removePolicyValidatingWebhookConfiguration
validatingConfig = config.PolicyValidatingWebhookConfigurationName validatingConfig = config.PolicyValidatingWebhookConfigurationName
} }
glog.V(4).Infof("removing webhook configuration %s", validatingConfig) glog.V(4).Infof("removing webhook configuration %s", validatingConfig)
err = wrc.registrationClient.ValidatingWebhookConfigurations().Delete(validatingConfig, &v1.DeleteOptions{}) err := wrc.client.DeleteResource(ValidatingWebhookConfigurationKind, "", validatingConfig, false)
if errorsapi.IsNotFound(err) { if errorsapi.IsNotFound(err) {
glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", validatingConfig) glog.V(4).Infof("policy webhook configuration %s, does not exits. not deleting", validatingConfig)
} else if err != nil { } else if err != nil {

2
pkg/webhookconfig/resource.go
View file

@ -71,7 +71,7 @@ func (wrc *WebhookRegistrationClient) RemoveResourceMutatingWebhookConfiguration
configName := wrc.GetResourceMutatingWebhookConfigName() configName := wrc.GetResourceMutatingWebhookConfigName()
// delete webhook configuration // delete webhook configuration
err := wrc.client.DeleteResouce(MutatingWebhookConfigurationKind, "", configName, false) err := wrc.client.DeleteResource(MutatingWebhookConfigurationKind, "", configName, false)
if errors.IsNotFound(err) { if errors.IsNotFound(err) {
glog.V(4).Infof("resource webhook configuration %s does not exits, so not deleting", configName) glog.V(4).Infof("resource webhook configuration %s does not exits, so not deleting", configName)
return nil return nil