Skip to content
Open
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
3 changes: 1 addition & 2 deletions cmd/internal/webhook/test/validatingwebhook_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@ import (
"github.com/securesign/policy-controller-operator/cmd/internal/webhook"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
)

func TestPolicyControllerValidator(t *testing.T) {
validator := webhook.PolicyControllerValidator{}
tests := []struct {
name string
obj runtime.Object
obj *unstructured.Unstructured
expectErr bool
}{
{
Expand Down
20 changes: 6 additions & 14 deletions cmd/internal/webhook/validatingwebhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (

"github.com/securesign/policy-controller-operator/cmd/internal/constants"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"

logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
Expand All @@ -17,34 +16,27 @@ import (
type PolicyControllerValidator struct{}

// validate validates PolicyControllerResources namespace
func (v *PolicyControllerValidator) validate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
func (v *PolicyControllerValidator) validate(ctx context.Context, obj *unstructured.Unstructured) (admission.Warnings, error) {
log := logf.FromContext(ctx)

u, ok := obj.(*unstructured.Unstructured)
if !ok {
err := fmt.Errorf("expected *unstructured.Unstructured, got %T", obj)
log.Error(err, "unable to convert incoming object")
return nil, err
}

if ns := u.GetNamespace(); ns != constants.PolicyControllerInstallNs {
err := fmt.Errorf("%s objects may only be created in the %q namespace (got %q)", u.GetKind(), constants.PolicyControllerInstallNs, ns)
if ns := obj.GetNamespace(); ns != constants.PolicyControllerInstallNs {
err := fmt.Errorf("%s objects may only be created in the %q namespace (got %q)", obj.GetKind(), constants.PolicyControllerInstallNs, ns)
log.Info("denying creation: wrong namespace", "namespace", ns)
return nil, err
}

return nil, nil
}

func (v *PolicyControllerValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
func (v *PolicyControllerValidator) ValidateCreate(ctx context.Context, obj *unstructured.Unstructured) (admission.Warnings, error) {
return v.validate(ctx, obj)
}

func (v *PolicyControllerValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
func (v *PolicyControllerValidator) ValidateUpdate(ctx context.Context, oldObj, newObj *unstructured.Unstructured) (admission.Warnings, error) {
return v.validate(ctx, newObj)
}

func (v *PolicyControllerValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
func (v *PolicyControllerValidator) ValidateDelete(ctx context.Context, obj *unstructured.Unstructured) (admission.Warnings, error) {
// Allow all delete operations
return nil, nil
}
5 changes: 2 additions & 3 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,9 @@ func main() {

policyController := &unstructured.Unstructured{}
policyController.SetGroupVersionKind(policyControllerGVK)
if err := builder.WebhookManagedBy(mgr).
For(policyController).
if err := builder.WebhookManagedBy(mgr, policyController).
WithValidator(&rhtas_webhook.PolicyControllerValidator{}).
WithCustomPath("/validate").
WithValidatorCustomPath("/validate").
Complete(); err != nil {
entryLog.Error(err, "unable to create webhook for PolicyController")
os.Exit(1)
Expand Down
60 changes: 27 additions & 33 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
module github.com/securesign/policy-controller-operator

go 1.24.0
go 1.25.0

require (
github.com/google/go-containerregistry v0.20.7
github.com/onsi/ginkgo/v2 v2.27.2
github.com/onsi/gomega v1.38.2
github.com/stretchr/testify v1.11.1
github.com/theupdateframework/go-tuf/v2 v2.2.0
k8s.io/api v0.34.2
k8s.io/apimachinery v0.34.2
k8s.io/client-go v0.34.2
sigs.k8s.io/controller-runtime v0.22.4
github.com/theupdateframework/go-tuf/v2 v2.3.0
k8s.io/api v0.35.0
k8s.io/apimachinery v0.35.0
k8s.io/client-go v0.35.0
sigs.k8s.io/controller-runtime v0.23.1
sigs.k8s.io/e2e-framework v0.6.0
)

require (
github.com/Masterminds/semver/v3 v3.4.0 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.18.1 // indirect
github.com/containerd/stargz-snapshotter/estargz v0.18.2 // indirect
github.com/docker/cli v29.0.3+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.4 // indirect
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
github.com/docker/docker-credential-helpers v0.9.5 // indirect
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
github.com/go-openapi/swag/conv v0.25.4 // indirect
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
Expand All @@ -34,26 +33,21 @@ require (
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/klauspost/compress v1.18.2 // indirect
github.com/letsencrypt/boulder v0.20250721.0 // indirect
github.com/klauspost/compress v1.18.3 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
github.com/sigstore/protobuf-specs v0.5.0 // indirect
github.com/sigstore/sigstore v1.9.6-0.20251017153808-5089bd7668f3 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
github.com/sigstore/sigstore v1.10.4 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/vbatts/tar-split v0.12.2 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/mod v0.31.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251222181119-0a764e51fe1b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect
google.golang.org/grpc v1.75.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
golang.org/x/crypto v0.47.0 // indirect
golang.org/x/mod v0.32.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
)

require (
Expand All @@ -73,7 +67,7 @@ require (
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.1 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 // indirect
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
github.com/google/uuid v1.6.0
github.com/json-iterator/go v1.1.12 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -82,30 +76,30 @@ require (
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.67.4 // indirect
github.com/prometheus/common v0.67.5 // indirect
github.com/prometheus/procfs v0.19.2 // indirect
github.com/sigstore/sigstore-go v1.1.3
github.com/sigstore/sigstore-go v1.1.4
github.com/spf13/pflag v1.0.10 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.48.0 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.39.0 // indirect
golang.org/x/term v0.38.0 // indirect
golang.org/x/text v0.32.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/time v0.14.0 // indirect
golang.org/x/tools v0.40.0 // indirect
golang.org/x/tools v0.41.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.34.2 // indirect
k8s.io/apiextensions-apiserver v0.35.0 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
k8s.io/utils v0.0.0-20251222233032-718f0e51e6d2
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
k8s.io/utils v0.0.0-20260108192941-914a6e750570
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
Expand Down
Loading