diff --git a/Makefile b/Makefile index 7339482c40a..4d9ff75c26d 100644 --- a/Makefile +++ b/Makefile @@ -105,10 +105,7 @@ cross: .PHONY: manifests manifests: - controller-gen object crd:trivialVersions=true,preserveUnknownFields=false rbac:roleName=cosigned-rbac webhook paths="./pkg/cosign/kubernetes/apis/..." output:crd:artifacts:config=config output:webhook:artifacts:config=config - $(eval SVCNAME=$(shell yq e '.metadata.name' ./config/400-webhook-service.yaml)) - $(eval SVCNAMESPACE=$(shell yq e '.metadata.namespace' ./config/400-webhook-service.yaml)) - yq --inplace e 'with(.webhooks[0].clientConfig.service; .name = "$(SVCNAME)" | .namespace = "$(SVCNAMESPACE)")' ./config/manifests.yaml + controller-gen object crd:trivialVersions=true,preserveUnknownFields=false paths="./pkg/cosign/kubernetes/apis/..." output:crd:artifacts:config=config ##################### # lint / test section diff --git a/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_defaults.go b/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_defaults.go index c5fcc95649f..4eff8e4a515 100644 --- a/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_defaults.go +++ b/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_defaults.go @@ -4,14 +4,5 @@ import ( "context" ) -// +kubebuilder:webhook:verbs=create;update,path=/default-sigstore-dev-v1alpha1-clusterimagepolicy,mutating=true,failurePolicy=fail,matchPolicy=Equivalent,groups=sigstore.dev,resources=clusterimagepolicies,versions=v1alpha1,name=defaulting.clusterimagepolicy.sigstore.dev,sideEffects=None,admissionReviewVersions=v1 - func (ip *ClusterImagePolicy) SetDefaults(ctx context.Context) { - /* - ip.Spec = ClusterImagePolicySpec{ - Images: []ImagePattern{ - ImagePattern{"*"}, - }, - } - */ } diff --git a/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_validation.go b/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_validation.go index 52c6a21bf70..19e8ffad7f5 100644 --- a/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_validation.go +++ b/pkg/cosign/kubernetes/apis/v1alpha1/clusterimagepolicy_validation.go @@ -6,8 +6,6 @@ import ( "knative.dev/pkg/apis" ) -// +kubebuilder:webhook:verbs=create;update,path=/validate-sigstore-dev-v1alpha1-clusterimagepolicy,mutating=false,failurePolicy=fail,matchPolicy=Equivalent,groups=sigstore.dev,resources=clusterimagepolicies,versions=v1alpha1,name=validation.clusterimagepolicy.sigstore.dev,sideEffects=None,admissionReviewVersions=v1 - func (ip *ClusterImagePolicy) Validate(ctx context.Context) *apis.FieldError { return nil } diff --git a/pkg/cosign/kubernetes/apis/v1alpha1/zz_generated.deepcopy.go b/pkg/cosign/kubernetes/apis/v1alpha1/zz_generated.deepcopy.go index 3a7981f4b72..7b9d366164a 100644 --- a/pkg/cosign/kubernetes/apis/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/cosign/kubernetes/apis/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated // Code generated by controller-gen. DO NOT EDIT.