Skip to content

Commit

Permalink
Merge pull request #118 from testwill/pkg-import
Browse files Browse the repository at this point in the history
chore: import packages only once
  • Loading branch information
openshift-merge-robot authored Sep 27, 2023
2 parents a66556e + 3e6d66b commit 98de8aa
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import (

memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
networkv1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
networkv1beta1 "github.com/openstack-k8s-operators/infra-operator/apis/network/v1beta1"
rabbitmqv1beta1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
redisv1 "github.com/openstack-k8s-operators/infra-operator/apis/redis/v1beta1"
memcachedcontrollers "github.com/openstack-k8s-operators/infra-operator/controllers/memcached"
Expand All @@ -61,7 +60,6 @@ func init() {
utilruntime.Must(memcachedv1.AddToScheme(scheme))
utilruntime.Must(redisv1.AddToScheme(scheme))
utilruntime.Must(networkv1.AddToScheme(scheme))
utilruntime.Must(networkv1beta1.AddToScheme(scheme))
//+kubebuilder:scaffold:scheme
}

Expand Down Expand Up @@ -208,11 +206,11 @@ func main() {
setupLog.Error(err, "unable to create webhook", "webhook", "NetConfig")
os.Exit(1)
}
if err = (&networkv1beta1.Reservation{}).SetupWebhookWithManager(mgr); err != nil {
if err = (&networkv1.Reservation{}).SetupWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create webhook", "webhook", "Reservation")
os.Exit(1)
}
if err = (&networkv1beta1.IPSet{}).SetupWebhookWithManager(mgr); err != nil {
if err = (&networkv1.IPSet{}).SetupWebhookWithManager(mgr); err != nil {
setupLog.Error(err, "unable to create webhook", "webhook", "IPSet")
os.Exit(1)
}
Expand Down

0 comments on commit 98de8aa

Please sign in to comment.