@@ -18,26 +18,16 @@ package v1beta2
1818
1919import (
2020 "context"
21- "crypto/tls"
22- "fmt"
2321 "go/build"
24- "net"
2522 "path/filepath"
2623 "testing"
27- "time"
28-
29- "sigs.k8s.io/controller-runtime/pkg/metrics/server"
30- crwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
3124
3225 . "github.com/onsi/ginkgo/v2"
3326 . "github.com/onsi/gomega"
3427
3528 applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
3629 toolkit "github.com/konflux-ci/operator-toolkit/test"
37- admissionv1 "k8s.io/api/admission/v1"
3830 "k8s.io/apimachinery/pkg/runtime"
39- "k8s.io/client-go/rest"
40- ctrl "sigs.k8s.io/controller-runtime"
4131 "sigs.k8s.io/controller-runtime/pkg/client"
4232 "sigs.k8s.io/controller-runtime/pkg/envtest"
4333 logf "sigs.k8s.io/controller-runtime/pkg/log"
4939 testEnv * envtest.Environment
5040 ctx context.Context
5141 cancel context.CancelFunc
52- cfg * rest.Config
5342)
5443
5544func TestIntegrationAPIs (t * testing.T ) {
@@ -72,23 +61,16 @@ var _ = BeforeSuite(func() {
7261 ),
7362 },
7463 ErrorIfCRDPathMissing : false ,
75- WebhookInstallOptions : envtest.WebhookInstallOptions {
76- Paths : []string {filepath .Join (".." , ".." , "config" , "webhook" )},
77- },
7864 }
7965
8066 var err error
81- // cfg is defined in this file globally.
82- cfg , err = testEnv .Start ()
67+ cfg , err := testEnv .Start ()
8368 Expect (err ).NotTo (HaveOccurred ())
8469 Expect (cfg ).NotTo (BeNil ())
8570
8671 scheme := runtime .NewScheme ()
8772 Expect (AddToScheme (scheme )).To (Succeed ())
8873
89- err = admissionv1 .AddToScheme (scheme )
90- Expect (err ).NotTo (HaveOccurred ())
91-
9274 err = applicationapiv1alpha1 .AddToScheme (scheme )
9375 Expect (err ).NotTo (HaveOccurred ())
9476
@@ -97,43 +79,6 @@ var _ = BeforeSuite(func() {
9779 k8sClient , err = client .New (cfg , client.Options {Scheme : scheme })
9880 Expect (err ).NotTo (HaveOccurred ())
9981 Expect (k8sClient ).NotTo (BeNil ())
100-
101- // start webhook server using Manager
102- webhookInstallOptions := & testEnv .WebhookInstallOptions
103- mgr , err := ctrl .NewManager (cfg , ctrl.Options {
104- Scheme : scheme ,
105- WebhookServer : crwebhook .NewServer (crwebhook.Options {
106- CertDir : webhookInstallOptions .LocalServingCertDir ,
107- Host : webhookInstallOptions .LocalServingHost ,
108- Port : webhookInstallOptions .LocalServingPort ,
109- }),
110- Metrics : server.Options {
111- BindAddress : "0" , // disables metrics
112- },
113- LeaderElection : false ,
114- })
115- Expect (err ).NotTo (HaveOccurred ())
116-
117- //+kubebuilder:scaffold:webhook
118-
119- go func () {
120- defer GinkgoRecover ()
121- err = mgr .Start (ctx )
122- Expect (err ).NotTo (HaveOccurred ())
123- }()
124-
125- // wait for the webhook server to get ready
126- dialer := & net.Dialer {Timeout : time .Second }
127- addrPort := fmt .Sprintf ("%s:%d" , webhookInstallOptions .LocalServingHost , webhookInstallOptions .LocalServingPort )
128- Eventually (func () error {
129- conn , err := tls .DialWithDialer (dialer , "tcp" , addrPort , & tls.Config {InsecureSkipVerify : true })
130- if err != nil {
131- return err
132- }
133- conn .Close ()
134- return nil
135- }).Should (Succeed ())
136-
13782})
13883
13984var _ = AfterSuite (func () {
0 commit comments