Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions internal/webhook/featureflag_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ import (
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
)

type FeatureFlagCustomValidator struct {
}
type FeatureFlagCustomValidator struct{}

// log is for logging in this package.
var featureFlagLog = logf.Log.WithName("featureflag-resource validator")
var compiledSchema *gojsonschema.Schema
var schemaInitOnce sync.Once
var (
featureFlagLog = logf.Log.WithName("featureflag-resource validator")
compiledSchema *gojsonschema.Schema
schemaInitOnce sync.Once
)

func (v *FeatureFlagCustomValidator) SetupWebhookWithManager(mgr ctrl.Manager) error {
return ctrl.NewWebhookManagedBy(mgr).
Expand Down Expand Up @@ -71,10 +72,10 @@ func (v *FeatureFlagCustomValidator) ValidateCreate(ctx context.Context, obj run

// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type
func (v *FeatureFlagCustomValidator) ValidateUpdate(ctx context.Context, oldObj runtime.Object, newObj runtime.Object) (warnings admission.Warnings, err error) {
featureFlag, ok := oldObj.(*v1beta1.FeatureFlag)
featureFlag, ok := newObj.(*v1beta1.FeatureFlag)

if !ok {
return nil, fmt.Errorf("expected a FeatureFlag object but got %T", oldObj)
return nil, fmt.Errorf("expected a FeatureFlag object but got %T", newObj)
}

featureFlagLog.Info("validate update", "name", featureFlag.Name)
Expand Down Expand Up @@ -135,7 +136,6 @@ func initSchemas() (*gojsonschema.Schema, error) {
if err == nil {
compiledSchema, err = schemaLoader.Compile(gojsonschema.NewStringLoader(schema.FlagSchema))
}

})

return compiledSchema, err
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
apiVersion: chainsaw.kyverno.io/v1alpha1
kind: Test
metadata:
name: validate-featureflag
name: validate-featureflag-create
spec:
steps:
- name: step-00
Expand Down
17 changes: 17 additions & 0 deletions test/e2e/chainsaw/validate-featureflag-update/chainsaw-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
apiVersion: chainsaw.kyverno.io/v1alpha1
kind: Test
metadata:
name: validate-featureflag-update
spec:
steps:
- name: step-00
try:
- apply:
file: featureflag_good_empty.yaml
- update:
file: featureflag_good.yaml
- error:
file: featureflag_bad.yaml
- update:
file: featureflag_good_empty.yaml
22 changes: 22 additions & 0 deletions test/e2e/chainsaw/validate-featureflag-update/featureflag_bad.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: core.openfeature.dev/v1beta1
kind: FeatureFlag
metadata:
name: featureflag-sample
spec:
flagSpec:
flags:
fibAlgo:
variants:
recursive: recursive
memo: memo
loop: loop
binet: binet
defaultVariant: recursive
state: ENABLED
targeting:
fractional:
- "invalid"
- ["clubs", 25]
- ["diamonds", 25]
- ["hearts", 25]
- ["spades", 25]
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
apiVersion: core.openfeature.dev/v1beta1
kind: FeatureFlag
metadata:
name: featureflag-sample
spec:
flagSpec:
flags:
fibAlgo:
variants:
recursive: recursive
memo: memo
loop: loop
binet: binet
defaultVariant: recursive
state: ENABLED
targeting:
if:
- "$ref": emailWithFaas
- binet
- null
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
apiVersion: core.openfeature.dev/v1beta1
kind: FeatureFlag
metadata:
name: featureflag-sample
spec:
flagSpec:
flags:
fibAlgo:
variants:
recursive: recursive
memo: memo
loop: loop
binet: binet
defaultVariant: recursive
state: ENABLED
Loading