Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set default failure policy (config) #572

Merged
merged 8 commits into from
Dec 21, 2023
Merged

Set default failure policy (config) #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
201d39a
Set Default FailurePolicy for admission webhooks
yalosev Dec 21, 2023
a6bdc18
linter
yalosev Dec 21, 2023
120c7b5
debug
yalosev Dec 21, 2023
1d2ce84
policy
yalosev Dec 21, 2023
04cc194
+++
yalosev Dec 21, 2023
6d58174
test
yalosev Dec 21, 2023
03acf8e
+++
yalosev Dec 21, 2023
bdec071
linter
yalosev Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/app/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ func DefineValidatingWebhookFlags(cmd *kingpin.CmdClause) {
cmd.Flag("validating-webhook-client-ca", "A path to a server certificate for ValidatingWebhookConfiguration. Can be set with $VALIDATING_WEBHOOK_CLIENT_CA.").
Envar("VALIDATING_WEBHOOK_CLIENT_CA").
StringsVar(&ValidatingWebhookSettings.ClientCAPaths)
cmd.Flag("validating-failure-policy", "Defines default FailurePolicy for ValidatingWebhookConfiguration.").
cmd.Flag("validating-webhook-failure-policy", "Defines default FailurePolicy for ValidatingWebhookConfiguration.").
Default("Fail").
Envar("VALIDATING_FAILURE_POLICY").
Envar("VALIDATING_WEBHOOK_FAILURE_POLICY").
EnumVar(&ValidatingWebhookSettings.DefaultFailurePolicy, "Fail", "Ignore")
}

Expand Down
5 changes: 3 additions & 2 deletions pkg/hook/config/config_v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"

"github.com/flant/shell-operator/pkg/app"
. "github.com/flant/shell-operator/pkg/hook/types"
"github.com/flant/shell-operator/pkg/kube_events_manager"
. "github.com/flant/shell-operator/pkg/kube_events_manager/types"
Expand Down Expand Up @@ -429,7 +430,6 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (ValidatingConfig, err
cfg.IncludeSnapshotsFrom = cfgV1.IncludeSnapshotsFrom
cfg.BindingName = cfgV1.Name

DefaultFailurePolicy := v1.Fail
DefaultSideEffects := v1.SideEffectClassNone
DefaultTimeoutSeconds := int32(10)

Expand All @@ -446,7 +446,8 @@ func convertValidating(cfgV1 KubernetesAdmissionConfigV1) (ValidatingConfig, err
if cfgV1.FailurePolicy != nil {
webhook.FailurePolicy = cfgV1.FailurePolicy
} else {
webhook.FailurePolicy = &DefaultFailurePolicy
defaultFailurePolicy := v1.FailurePolicyType(app.ValidatingWebhookSettings.DefaultFailurePolicy)
webhook.FailurePolicy = &defaultFailurePolicy
}
if cfgV1.SideEffects != nil {
webhook.SideEffects = cfgV1.SideEffects
Expand Down
2 changes: 0 additions & 2 deletions pkg/shell-operator/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"

log "github.com/sirupsen/logrus"
v1 "k8s.io/api/admissionregistration/v1"

"github.com/flant/shell-operator/pkg/app"
"github.com/flant/shell-operator/pkg/config"
Expand Down Expand Up @@ -174,7 +173,6 @@ func (op *ShellOperator) setupHookManagers(hooksDir string, tempDir string) {
op.AdmissionWebhookManager = admission.NewWebhookManager(op.KubeClient)
op.AdmissionWebhookManager.Settings = app.ValidatingWebhookSettings
op.AdmissionWebhookManager.Namespace = app.Namespace
op.AdmissionWebhookManager.DefaultFailurePolicy = v1.FailurePolicyType(app.ValidatingWebhookSettings.DefaultFailurePolicy)

// Initialize conversion webhooks manager.
op.ConversionWebhookManager = conversion.NewWebhookManager()
Expand Down
6 changes: 1 addition & 5 deletions pkg/webhook/admission/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"os"

log "github.com/sirupsen/logrus"
v1 "k8s.io/api/admissionregistration/v1"

klient "github.com/flant/kube-client/client"
"github.com/flant/shell-operator/pkg/webhook/server"
Expand All @@ -27,7 +26,6 @@ type WebhookManager struct {
Namespace string

DefaultConfigurationId string
DefaultFailurePolicy v1.FailurePolicyType

Server *server.WebhookServer
ValidatingResources map[string]*ValidatingWebhookResource
Expand Down Expand Up @@ -96,9 +94,7 @@ func (m *WebhookManager) AddValidatingWebhook(config *ValidatingWebhookConfig) {
)
m.ValidatingResources[confId] = r
}
if config.FailurePolicy == nil {
config.FailurePolicy = &m.DefaultFailurePolicy
}

r.Set(config)
}

Expand Down
94 changes: 28 additions & 66 deletions pkg/webhook/admission/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,82 +17,44 @@ func Test_Manager_AddWebhook(t *testing.T) {
vs.ServerCertPath = "testdata/demo-certs/server.crt"
vs.CAPath = "testdata/demo-certs/ca.pem"
m.Settings = vs
m.DefaultFailurePolicy = v1.Ignore

err := m.Init()
if err != nil {
t.Fatalf("WebhookManager should init: %v", err)
}

t.Run("Webhook with set FailurePolicy", func(t *testing.T) {
fail := v1.Fail
none := v1.SideEffectClassNone
timeoutSeconds := int32(10)

cfg := &ValidatingWebhookConfig{
ValidatingWebhook: &v1.ValidatingWebhook{
Name: "test-validating",
Rules: []v1.RuleWithOperations{
{
Operations: []v1.OperationType{v1.OperationAll},
Rule: v1.Rule{
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"deployments"},
},
},
},
FailurePolicy: &fail,
SideEffects: &none,
TimeoutSeconds: &timeoutSeconds,
},
}
m.AddValidatingWebhook(cfg)

if len(m.ValidatingResources) != 1 {
t.Fatalf("WebhookManager should have resources: got length %d", len(m.ValidatingResources))
}

for k, v := range m.ValidatingResources {
if len(v.hooks) != 1 {
t.Fatalf("Resource '%s' should have Webhooks: got length %d", k, len(m.ValidatingResources))
}
assert.Equal(t, v1.Fail, *v.hooks[""].FailurePolicy)
}
})

t.Run("Webhook with default FailurePolicy", func(t *testing.T) {
none := v1.SideEffectClassNone
timeoutSeconds := int32(10)

cfg := &ValidatingWebhookConfig{
ValidatingWebhook: &v1.ValidatingWebhook{
Name: "test-validating",
Rules: []v1.RuleWithOperations{
{
Operations: []v1.OperationType{v1.OperationAll},
Rule: v1.Rule{
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"deployments"},
},
fail := v1.Fail
none := v1.SideEffectClassNone
timeoutSeconds := int32(10)

cfg := &ValidatingWebhookConfig{
ValidatingWebhook: &v1.ValidatingWebhook{
Name: "test-validating",
Rules: []v1.RuleWithOperations{
{
Operations: []v1.OperationType{v1.OperationAll},
Rule: v1.Rule{
APIGroups: []string{"apps"},
APIVersions: []string{"v1"},
Resources: []string{"deployments"},
},
},
SideEffects: &none,
TimeoutSeconds: &timeoutSeconds,
},
}
m.AddValidatingWebhook(cfg)
FailurePolicy: &fail,
SideEffects: &none,
TimeoutSeconds: &timeoutSeconds,
},
}
m.AddValidatingWebhook(cfg)

if len(m.ValidatingResources) != 1 {
t.Fatalf("WebhookManager should have resources: got length %d", len(m.ValidatingResources))
}
if len(m.ValidatingResources) != 1 {
t.Fatalf("WebhookManager should have resources: got length %d", len(m.ValidatingResources))
}

for k, v := range m.ValidatingResources {
if len(v.hooks) != 1 {
t.Fatalf("Resource '%s' should have Webhooks: got length %d", k, len(m.ValidatingResources))
}
assert.Equal(t, v1.Ignore, *v.hooks[""].FailurePolicy)
for k, v := range m.ValidatingResources {
if len(v.hooks) != 1 {
t.Fatalf("Resource '%s' should have Webhooks: got length %d", k, len(m.ValidatingResources))
}
})
assert.Equal(t, v1.Fail, *v.hooks[""].FailurePolicy)
}
}
Loading