@@ -21,10 +21,14 @@ import (
21
21
"flag"
22
22
"os"
23
23
24
+ "sigs.k8s.io/controller-runtime/pkg/webhook"
25
+ "sigs.k8s.io/controller-runtime/pkg/webhook/admission"
26
+
24
27
cmapi "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
25
28
26
29
dnsrecordv1alpha1 "github.com/dana-team/provider-dns/apis/record/v1alpha1"
27
30
31
+ cappv1alpha1 "github.com/dana-team/container-app-operator/api/v1alpha1"
28
32
nfspvcv1alpha1 "github.com/dana-team/nfspvc-operator/api/v1alpha1"
29
33
"github.com/go-logr/zapr"
30
34
loggingv1beta1 "github.com/kube-logging/logging-operator/pkg/sdk/logging/api/v1beta1"
@@ -44,12 +48,10 @@ import (
44
48
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
45
49
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
46
50
47
- rcsv1alpha1 "github.com/dana-team/container-app-operator/api/rcs/v1alpha1"
48
- cappv1alpha1 "github.com/dana-team/container-app-operator/api/v1alpha1"
49
51
cappcontroller "github.com/dana-team/container-app-operator/internal/kinds/capp/controllers"
50
52
"github.com/dana-team/container-app-operator/internal/kinds/capp/utils"
51
53
crcontroller "github.com/dana-team/container-app-operator/internal/kinds/capprevision/controllers"
52
- webhookrcsv1alpha1 "github.com/dana-team/container-app-operator/internal/webhook/rcs/v1alpha1"
54
+ webhooks "github.com/dana-team/container-app-operator/internal/webhook/rcs/v1alpha1"
53
55
// +kubebuilder:scaffold:imports
54
56
)
55
57
@@ -68,7 +70,6 @@ func init() {
68
70
utilruntime .Must (cmapi .AddToScheme (scheme ))
69
71
utilruntime .Must (dnsrecordv1alpha1 .AddToScheme (scheme ))
70
72
71
- utilruntime .Must (rcsv1alpha1 .AddToScheme (scheme ))
72
73
// +kubebuilder:scaffold:scheme
73
74
}
74
75
@@ -177,16 +178,17 @@ func main() {
177
178
setupLog .Error (err , "unable to create controller" , "controller" , "CappRevision" )
178
179
os .Exit (1 )
179
180
}
181
+
180
182
// nolint:goconst
181
183
if os .Getenv ("ENABLE_WEBHOOKS" ) != "false" {
182
184
hookServer := mgr .GetWebhookServer ()
183
185
decoder := admission .NewDecoder (scheme )
184
- hookServer .Register (rcswebhooks . ValidatorServingPath , & webhook.Admission {Handler : & rcswebhooks .CappValidator {
186
+ hookServer .Register ("/validate-capp" , & webhook.Admission {Handler : & webhooks .CappValidator {
185
187
Client : mgr .GetClient (),
186
188
Decoder : decoder ,
187
189
}})
188
190
189
- hookServer .Register (rcswebhooks . MutatorServingPath , & webhook.Admission {Handler : & rcswebhooks .CappMutator {
191
+ hookServer .Register ("/mutate-capp" , & webhook.Admission {Handler : & webhooks .CappMutator {
190
192
Client : mgr .GetClient (),
191
193
Decoder : decoder ,
192
194
}})
0 commit comments