Skip to content

Commit 24f9711

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4449 from mateusoliveira43/fix/webhook-test-suite-scheme
🐛 (go/v4): Align webhook suite test with controller's suite test
2 parents 7ee23df + c122bee commit 24f9711

File tree

13 files changed

+54
-121
lines changed

13 files changed

+54
-121
lines changed

‎docs/book/src/cronjob-tutorial/testdata/project/internal/webhook/v1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
33-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
32+
"k8s.io/client-go/kubernetes/scheme"
3433
"k8s.io/client-go/rest"
3534
ctrl "sigs.k8s.io/controller-runtime"
3635
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -67,11 +66,7 @@ var _ = BeforeSuite(func() {
6766
ctx, cancel = context.WithCancel(context.TODO())
6867

6968
var err error
70-
scheme := apimachineryruntime.NewScheme()
71-
err = batchv1.AddToScheme(scheme)
72-
Expect(err).NotTo(HaveOccurred())
73-
74-
err = admissionv1.AddToScheme(scheme)
69+
err = batchv1.AddToScheme(scheme.Scheme)
7570
Expect(err).NotTo(HaveOccurred())
7671

7772
// +kubebuilder:scaffold:scheme
@@ -96,14 +91,14 @@ var _ = BeforeSuite(func() {
9691
Expect(err).NotTo(HaveOccurred())
9792
Expect(cfg).NotTo(BeNil())
9893

99-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
94+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
10095
Expect(err).NotTo(HaveOccurred())
10196
Expect(k8sClient).NotTo(BeNil())
10297

10398
// start webhook server using Manager.
10499
webhookInstallOptions := &testEnv.WebhookInstallOptions
105100
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
106-
Scheme: scheme,
101+
Scheme: scheme.Scheme,
107102
WebhookServer: webhook.NewServer(webhook.Options{
108103
Host: webhookInstallOptions.LocalServingHost,
109104
Port: webhookInstallOptions.LocalServingPort,

‎docs/book/src/multiversion-tutorial/testdata/project/internal/webhook/v1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
33-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
32+
"k8s.io/client-go/kubernetes/scheme"
3433
"k8s.io/client-go/rest"
3534
ctrl "sigs.k8s.io/controller-runtime"
3635
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -67,11 +66,7 @@ var _ = BeforeSuite(func() {
6766
ctx, cancel = context.WithCancel(context.TODO())
6867

6968
var err error
70-
scheme := apimachineryruntime.NewScheme()
71-
err = batchv1.AddToScheme(scheme)
72-
Expect(err).NotTo(HaveOccurred())
73-
74-
err = admissionv1.AddToScheme(scheme)
69+
err = batchv1.AddToScheme(scheme.Scheme)
7570
Expect(err).NotTo(HaveOccurred())
7671

7772
// +kubebuilder:scaffold:scheme
@@ -96,14 +91,14 @@ var _ = BeforeSuite(func() {
9691
Expect(err).NotTo(HaveOccurred())
9792
Expect(cfg).NotTo(BeNil())
9893

99-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
94+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
10095
Expect(err).NotTo(HaveOccurred())
10196
Expect(k8sClient).NotTo(BeNil())
10297

10398
// start webhook server using Manager.
10499
webhookInstallOptions := &testEnv.WebhookInstallOptions
105100
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
106-
Scheme: scheme,
101+
Scheme: scheme.Scheme,
107102
WebhookServer: webhook.NewServer(webhook.Options{
108103
Host: webhookInstallOptions.LocalServingHost,
109104
Port: webhookInstallOptions.LocalServingPort,

‎docs/book/src/multiversion-tutorial/testdata/project/internal/webhook/v2/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
33-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
32+
"k8s.io/client-go/kubernetes/scheme"
3433
"k8s.io/client-go/rest"
3534
ctrl "sigs.k8s.io/controller-runtime"
3635
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -67,11 +66,7 @@ var _ = BeforeSuite(func() {
6766
ctx, cancel = context.WithCancel(context.TODO())
6867

6968
var err error
70-
scheme := apimachineryruntime.NewScheme()
71-
err = batchv2.AddToScheme(scheme)
72-
Expect(err).NotTo(HaveOccurred())
73-
74-
err = admissionv1.AddToScheme(scheme)
69+
err = batchv2.AddToScheme(scheme.Scheme)
7570
Expect(err).NotTo(HaveOccurred())
7671

7772
// +kubebuilder:scaffold:scheme
@@ -96,14 +91,14 @@ var _ = BeforeSuite(func() {
9691
Expect(err).NotTo(HaveOccurred())
9792
Expect(cfg).NotTo(BeNil())
9893

99-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
94+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
10095
Expect(err).NotTo(HaveOccurred())
10196
Expect(k8sClient).NotTo(BeNil())
10297

10398
// start webhook server using Manager.
10499
webhookInstallOptions := &testEnv.WebhookInstallOptions
105100
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
106-
Scheme: scheme,
101+
Scheme: scheme.Scheme,
107102
WebhookServer: webhook.NewServer(webhook.Options{
108103
Host: webhookInstallOptions.LocalServingHost,
109104
Port: webhookInstallOptions.LocalServingPort,

‎pkg/plugins/golang/v4/scaffolds/internal/templates/webhooks/webhook_suitetest.go

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ func (f *WebhookSuite) SetTemplateDefaults() error {
8383
} else {
8484
f.TemplateBody = fmt.Sprintf(webhookTestSuiteTemplate,
8585
machinery.NewMarkerFor(f.Path, importMarker),
86-
f.Resource.ImportAlias(), admissionImportAlias,
86+
f.Resource.ImportAlias(),
8787
machinery.NewMarkerFor(f.Path, addSchemeMarker),
8888
machinery.NewMarkerFor(f.Path, addWebhookManagerMarker),
8989
"%s",
@@ -148,19 +148,17 @@ func (f *WebhookSuite) GetCodeFragments() machinery.CodeFragmentsMap {
148148

149149
// Generate import code fragments
150150
imports := make([]string, 0)
151-
if !f.IsLegacyPath {
152-
imports = append(imports, fmt.Sprintf(apiImportCodeFragment, f.Resource.ImportAlias(), f.Resource.Path))
153-
}
154-
imports = append(imports, fmt.Sprintf(apiImportCodeFragment, admissionImportAlias, admissionPath))
155151

156152
// Generate add scheme code fragments
157153
addScheme := make([]string, 0)
158154

159155
// Generate add webhookManager code fragments
160156
addWebhookManager := make([]string, 0)
161157
if f.IsLegacyPath {
158+
imports = append(imports, fmt.Sprintf(apiImportCodeFragment, admissionImportAlias, admissionPath))
162159
addWebhookManager = append(addWebhookManager, fmt.Sprintf(addWebhookManagerCodeFragmentLegacy, f.Resource.Kind))
163160
} else {
161+
imports = append(imports, fmt.Sprintf(apiImportCodeFragment, f.Resource.ImportAlias(), f.Resource.Path))
164162
addWebhookManager = append(addWebhookManager, fmt.Sprintf(addWebhookManagerCodeFragment, f.Resource.Kind))
165163
}
166164

@@ -195,7 +193,6 @@ import (
195193
. "github.com/onsi/ginkgo/v2"
196194
. "github.com/onsi/gomega"
197195
198-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
199196
"k8s.io/client-go/kubernetes/scheme"
200197
"k8s.io/client-go/rest"
201198
ctrl "sigs.k8s.io/controller-runtime"
@@ -230,11 +227,7 @@ var _ = BeforeSuite(func() {
230227
ctx, cancel = context.WithCancel(context.TODO())
231228
232229
var err error
233-
scheme := apimachineryruntime.NewScheme()
234-
err = %s.AddToScheme(scheme)
235-
Expect(err).NotTo(HaveOccurred())
236-
237-
err = %s.AddToScheme(scheme)
230+
err = %s.AddToScheme(scheme.Scheme)
238231
Expect(err).NotTo(HaveOccurred())
239232
240233
%s
@@ -259,14 +252,14 @@ var _ = BeforeSuite(func() {
259252
Expect(err).NotTo(HaveOccurred())
260253
Expect(cfg).NotTo(BeNil())
261254
262-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
255+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
263256
Expect(err).NotTo(HaveOccurred())
264257
Expect(k8sClient).NotTo(BeNil())
265258
266259
// start webhook server using Manager.
267260
webhookInstallOptions := &testEnv.WebhookInstallOptions
268261
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
269-
Scheme: scheme,
262+
Scheme: scheme.Scheme,
270263
WebhookServer: webhook.NewServer(webhook.Options{
271264
Host: webhookInstallOptions.LocalServingHost,
272265
Port: webhookInstallOptions.LocalServingPort,

‎testdata/project-v4-multigroup/internal/webhook/apps/v1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
3332
appsv1 "k8s.io/api/apps/v1"
34-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
33+
"k8s.io/client-go/kubernetes/scheme"
3534
"k8s.io/client-go/rest"
3635
ctrl "sigs.k8s.io/controller-runtime"
3736
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -66,11 +65,7 @@ var _ = BeforeSuite(func() {
6665
ctx, cancel = context.WithCancel(context.TODO())
6766

6867
var err error
69-
scheme := apimachineryruntime.NewScheme()
70-
err = appsv1.AddToScheme(scheme)
71-
Expect(err).NotTo(HaveOccurred())
72-
73-
err = admissionv1.AddToScheme(scheme)
68+
err = appsv1.AddToScheme(scheme.Scheme)
7469
Expect(err).NotTo(HaveOccurred())
7570

7671
// +kubebuilder:scaffold:scheme
@@ -95,14 +90,14 @@ var _ = BeforeSuite(func() {
9590
Expect(err).NotTo(HaveOccurred())
9691
Expect(cfg).NotTo(BeNil())
9792

98-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
93+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
9994
Expect(err).NotTo(HaveOccurred())
10095
Expect(k8sClient).NotTo(BeNil())
10196

10297
// start webhook server using Manager.
10398
webhookInstallOptions := &testEnv.WebhookInstallOptions
10499
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
105-
Scheme: scheme,
100+
Scheme: scheme.Scheme,
106101
WebhookServer: webhook.NewServer(webhook.Options{
107102
Host: webhookInstallOptions.LocalServingHost,
108103
Port: webhookInstallOptions.LocalServingPort,

‎testdata/project-v4-multigroup/internal/webhook/cert-manager/v1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ import (
3030
. "github.com/onsi/gomega"
3131

3232
certmanagerv1 "github.com/cert-manager/cert-manager/pkg/apis/certmanager/v1"
33-
admissionv1 "k8s.io/api/admission/v1"
34-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
33+
"k8s.io/client-go/kubernetes/scheme"
3534
"k8s.io/client-go/rest"
3635
ctrl "sigs.k8s.io/controller-runtime"
3736
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -66,11 +65,7 @@ var _ = BeforeSuite(func() {
6665
ctx, cancel = context.WithCancel(context.TODO())
6766

6867
var err error
69-
scheme := apimachineryruntime.NewScheme()
70-
err = certmanagerv1.AddToScheme(scheme)
71-
Expect(err).NotTo(HaveOccurred())
72-
73-
err = admissionv1.AddToScheme(scheme)
68+
err = certmanagerv1.AddToScheme(scheme.Scheme)
7469
Expect(err).NotTo(HaveOccurred())
7570

7671
// +kubebuilder:scaffold:scheme
@@ -95,14 +90,14 @@ var _ = BeforeSuite(func() {
9590
Expect(err).NotTo(HaveOccurred())
9691
Expect(cfg).NotTo(BeNil())
9792

98-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
93+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
9994
Expect(err).NotTo(HaveOccurred())
10095
Expect(k8sClient).NotTo(BeNil())
10196

10297
// start webhook server using Manager.
10398
webhookInstallOptions := &testEnv.WebhookInstallOptions
10499
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
105-
Scheme: scheme,
100+
Scheme: scheme.Scheme,
106101
WebhookServer: webhook.NewServer(webhook.Options{
107102
Host: webhookInstallOptions.LocalServingHost,
108103
Port: webhookInstallOptions.LocalServingPort,

‎testdata/project-v4-multigroup/internal/webhook/core/v1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
3332
corev1 "k8s.io/api/core/v1"
34-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
33+
"k8s.io/client-go/kubernetes/scheme"
3534
"k8s.io/client-go/rest"
3635
ctrl "sigs.k8s.io/controller-runtime"
3736
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -66,11 +65,7 @@ var _ = BeforeSuite(func() {
6665
ctx, cancel = context.WithCancel(context.TODO())
6766

6867
var err error
69-
scheme := apimachineryruntime.NewScheme()
70-
err = corev1.AddToScheme(scheme)
71-
Expect(err).NotTo(HaveOccurred())
72-
73-
err = admissionv1.AddToScheme(scheme)
68+
err = corev1.AddToScheme(scheme.Scheme)
7469
Expect(err).NotTo(HaveOccurred())
7570

7671
// +kubebuilder:scaffold:scheme
@@ -95,14 +90,14 @@ var _ = BeforeSuite(func() {
9590
Expect(err).NotTo(HaveOccurred())
9691
Expect(cfg).NotTo(BeNil())
9792

98-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
93+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
9994
Expect(err).NotTo(HaveOccurred())
10095
Expect(k8sClient).NotTo(BeNil())
10196

10297
// start webhook server using Manager.
10398
webhookInstallOptions := &testEnv.WebhookInstallOptions
10499
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
105-
Scheme: scheme,
100+
Scheme: scheme.Scheme,
106101
WebhookServer: webhook.NewServer(webhook.Options{
107102
Host: webhookInstallOptions.LocalServingHost,
108103
Port: webhookInstallOptions.LocalServingPort,

‎testdata/project-v4-multigroup/internal/webhook/crew/v1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
33-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
32+
"k8s.io/client-go/kubernetes/scheme"
3433
"k8s.io/client-go/rest"
3534
ctrl "sigs.k8s.io/controller-runtime"
3635
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -67,11 +66,7 @@ var _ = BeforeSuite(func() {
6766
ctx, cancel = context.WithCancel(context.TODO())
6867

6968
var err error
70-
scheme := apimachineryruntime.NewScheme()
71-
err = crewv1.AddToScheme(scheme)
72-
Expect(err).NotTo(HaveOccurred())
73-
74-
err = admissionv1.AddToScheme(scheme)
69+
err = crewv1.AddToScheme(scheme.Scheme)
7570
Expect(err).NotTo(HaveOccurred())
7671

7772
// +kubebuilder:scaffold:scheme
@@ -96,14 +91,14 @@ var _ = BeforeSuite(func() {
9691
Expect(err).NotTo(HaveOccurred())
9792
Expect(cfg).NotTo(BeNil())
9893

99-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
94+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
10095
Expect(err).NotTo(HaveOccurred())
10196
Expect(k8sClient).NotTo(BeNil())
10297

10398
// start webhook server using Manager.
10499
webhookInstallOptions := &testEnv.WebhookInstallOptions
105100
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
106-
Scheme: scheme,
101+
Scheme: scheme.Scheme,
107102
WebhookServer: webhook.NewServer(webhook.Options{
108103
Host: webhookInstallOptions.LocalServingHost,
109104
Port: webhookInstallOptions.LocalServingPort,

‎testdata/project-v4-multigroup/internal/webhook/example.com/v1alpha1/webhook_suite_test.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ import (
2929
. "github.com/onsi/ginkgo/v2"
3030
. "github.com/onsi/gomega"
3131

32-
admissionv1 "k8s.io/api/admission/v1"
33-
apimachineryruntime "k8s.io/apimachinery/pkg/runtime"
32+
"k8s.io/client-go/kubernetes/scheme"
3433
"k8s.io/client-go/rest"
3534
ctrl "sigs.k8s.io/controller-runtime"
3635
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -67,11 +66,7 @@ var _ = BeforeSuite(func() {
6766
ctx, cancel = context.WithCancel(context.TODO())
6867

6968
var err error
70-
scheme := apimachineryruntime.NewScheme()
71-
err = examplecomv1alpha1.AddToScheme(scheme)
72-
Expect(err).NotTo(HaveOccurred())
73-
74-
err = admissionv1.AddToScheme(scheme)
69+
err = examplecomv1alpha1.AddToScheme(scheme.Scheme)
7570
Expect(err).NotTo(HaveOccurred())
7671

7772
// +kubebuilder:scaffold:scheme
@@ -96,14 +91,14 @@ var _ = BeforeSuite(func() {
9691
Expect(err).NotTo(HaveOccurred())
9792
Expect(cfg).NotTo(BeNil())
9893

99-
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme})
94+
k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme})
10095
Expect(err).NotTo(HaveOccurred())
10196
Expect(k8sClient).NotTo(BeNil())
10297

10398
// start webhook server using Manager.
10499
webhookInstallOptions := &testEnv.WebhookInstallOptions
105100
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
106-
Scheme: scheme,
101+
Scheme: scheme.Scheme,
107102
WebhookServer: webhook.NewServer(webhook.Options{
108103
Host: webhookInstallOptions.LocalServingHost,
109104
Port: webhookInstallOptions.LocalServingPort,

0 commit comments

Comments
 (0)