diff --git a/go.mod b/go.mod index 15603c5e8..4f86ba30d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/submariner-io/submariner -go 1.22.0 +go 1.23.0 require ( github.com/cenkalti/backoff/v4 v4.3.0 @@ -14,22 +14,22 @@ require ( github.com/projectcalico/api v0.0.0-20230602153125-fb7148692637 github.com/prometheus-community/pro-bing v0.5.0 github.com/prometheus/client_golang v1.20.5 - github.com/submariner-io/admiral v0.20.0-m1 - github.com/submariner-io/shipyard v0.20.0-m1 + github.com/submariner-io/admiral v0.20.0-m1.0.20241212144240-4ea3a84b8259 + github.com/submariner-io/shipyard v0.20.0-m1.0.20241212143626-36aca4c3d9b7 github.com/vishvananda/netlink v1.3.0 golang.org/x/net v0.32.0 golang.org/x/sys v0.28.0 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 google.golang.org/protobuf v1.35.1 - k8s.io/api v0.31.3 - k8s.io/apimachinery v0.31.3 - k8s.io/client-go v0.31.3 + k8s.io/api v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/client-go v0.32.0 k8s.io/component-helpers v0.31.3 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/controller-runtime v0.19.2 + k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 + sigs.k8s.io/controller-runtime v0.19.3 sigs.k8s.io/knftables v0.0.18 sigs.k8s.io/mcs-api v0.1.0 - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 ) require ( @@ -44,12 +44,11 @@ require ( github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -57,7 +56,6 @@ require ( github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/imdario/mergo v0.3.12 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/josharian/native v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -68,7 +66,7 @@ require ( github.com/mdlayher/genetlink v1.3.2 // indirect github.com/mdlayher/netlink v1.7.2 // indirect github.com/mdlayher/socket v0.4.1 // indirect - github.com/moby/spdystream v0.4.0 // indirect + github.com/moby/spdystream v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect @@ -84,7 +82,7 @@ require ( github.com/vishvananda/netns v0.0.4 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/crypto v0.30.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/term v0.27.0 // indirect golang.org/x/text v0.21.0 // indirect @@ -94,10 +92,9 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/go.sum b/go.sum index 9b5fb2af7..d67e3c269 100644 --- a/go.sum +++ b/go.sum @@ -135,8 +135,9 @@ github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwds github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= @@ -167,8 +168,8 @@ github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= @@ -185,8 +186,6 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -246,8 +245,6 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= @@ -321,8 +318,8 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= -github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= -github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -444,10 +441,10 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/submariner-io/admiral v0.20.0-m1 h1:0yKkTJB8VVoE6SUo3N8mOW6JcdQecUVM/jTFhIbDN2s= -github.com/submariner-io/admiral v0.20.0-m1/go.mod h1:6856aYKC6ptXo9n2UVymtWKsKYMvRMvlyyzPWUxwpHM= -github.com/submariner-io/shipyard v0.20.0-m1 h1:A1QooNpKyD69GqcfTjl5/ToSAGKQSxVyCHEg87gQFcY= -github.com/submariner-io/shipyard v0.20.0-m1/go.mod h1:v+gjhwiIoKl2OjKPwfkFT9MwIGKc0LR3nSI7X6G14TY= +github.com/submariner-io/admiral v0.20.0-m1.0.20241212144240-4ea3a84b8259 h1:agHxsOB9yrWaE2S/zsmy//ZTBbAbC69f25XO7zKMOYE= +github.com/submariner-io/admiral v0.20.0-m1.0.20241212144240-4ea3a84b8259/go.mod h1:T2uM4IMU5K4I4zWKCw0y3tc4R7VdCSt5wHdyw3pv4qY= +github.com/submariner-io/shipyard v0.20.0-m1.0.20241212143626-36aca4c3d9b7 h1:YXIHmma/X3V7ev5neWV/l5BNC7B/ObRIQ1L3AQJHD1M= +github.com/submariner-io/shipyard v0.20.0-m1.0.20241212143626-36aca4c3d9b7/go.mod h1:IY/9KUh+HrPPbE9lY8rTci9/gXwdY3ekt9GdZnRrU5k= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -531,8 +528,8 @@ golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -666,8 +663,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -679,22 +674,22 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78= k8s.io/api v0.18.4/go.mod h1:lOIQAKYgai1+vz9J7YcDZwC26Z0zQewYOGWdyIPUUQ4= -k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= -k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= k8s.io/apiextensions-apiserver v0.18.2/go.mod h1:q3faSnRGmYimiocj6cHQ1I3WpLqmDgJFlKL37fC4ZvY= k8s.io/apiextensions-apiserver v0.18.4/go.mod h1:NYeyeYq4SIpFlPxSAB6jHPIdvu3hL0pc36wuRChybio= k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.18.4/go.mod h1:OaXp26zu/5J7p0f92ASynJa1pZo06YlV9fG7BoWbCko= -k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= -k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= k8s.io/apiserver v0.18.2/go.mod h1:Xbh066NqrZO8cbsoenCwyDJ1OSi8Ag8I2lezeHxzwzw= k8s.io/apiserver v0.18.4/go.mod h1:q+zoFct5ABNnYkGIaGQ3bcbUNdmPyOCoEBcg51LChY8= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= k8s.io/client-go v0.18.4/go.mod h1:f5sXwL4yAZRkAtzOxRWUhA/N8XzGCb+nPZI8PfobZ9g= -k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= -k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= k8s.io/code-generator v0.18.2/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.18.4/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c= k8s.io/component-base v0.18.2/go.mod h1:kqLlMuhJNHQ9lz8Z7V5bxUUtjFZnrypArGl58gmDfUM= @@ -711,19 +706,19 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= +k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.7/go.mod h1:PHgbrJT7lCHcxMU+mDHEm+nx46H4zuuHZkDP6icnhu0= sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A= -sigs.k8s.io/controller-runtime v0.19.2 h1:3sPrF58XQEPzbE8T81TN6selQIMGbtYwuaJ6eDssDF8= -sigs.k8s.io/controller-runtime v0.19.2/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw= +sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= sigs.k8s.io/controller-tools v0.3.0/go.mod h1:enhtKGfxZD1GFEoMgP8Fdbu+uKQ/cq1/WGJhdVChfvI= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= sigs.k8s.io/kind v0.8.1/go.mod h1:oNKTxUVPYkV9lWzY6CVMNluVq8cBsyq+UgPJdvA3uu4= sigs.k8s.io/knftables v0.0.18 h1:6Duvmu0s/HwGifKrtl6G3AyAPYlWiZqTgS8bkVMiyaE= sigs.k8s.io/knftables v0.0.18/go.mod h1:f/5ZLKYEUPUhVjUCg6l80ACdL7CIIyeL0DxfgojGRTk= @@ -731,8 +726,8 @@ sigs.k8s.io/mcs-api v0.1.0 h1:edDbg0oRGfXw8TmZjKYep06LcJLv/qcYLidejnUp0PM= sigs.k8s.io/mcs-api v0.1.0/go.mod h1:gGiAryeFNB4GBsq2LBmVqSgKoobLxt+p7ii/WG5QYYw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/pkg/client/applyconfiguration/internal/internal.go b/pkg/client/applyconfiguration/internal/internal.go index 3633327b6..2b6592824 100644 --- a/pkg/client/applyconfiguration/internal/internal.go +++ b/pkg/client/applyconfiguration/internal/internal.go @@ -21,8 +21,8 @@ limitations under the License. package internal import ( - "fmt" - "sync" + fmt "fmt" + sync "sync" typed "sigs.k8s.io/structured-merge-diff/v4/typed" ) diff --git a/pkg/client/applyconfiguration/submariner.io/v1/cluster.go b/pkg/client/applyconfiguration/submariner.io/v1/cluster.go index d481f353c..3663d2008 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/cluster.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/cluster.go @@ -21,17 +21,17 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // ClusterApplyConfiguration represents a declarative configuration of the Cluster type for use // with apply. type ClusterApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *ClusterSpecApplyConfiguration `json:"spec,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *ClusterSpecApplyConfiguration `json:"spec,omitempty"` } // Cluster constructs a declarative configuration of the Cluster type for use with @@ -49,7 +49,7 @@ func Cluster(name, namespace string) *ClusterApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithKind(value string) *ClusterApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *ClusterApplyConfiguration) WithKind(value string) *ClusterApplyConfigur // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithAPIVersion(value string) *ClusterApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *ClusterApplyConfiguration) WithAPIVersion(value string) *ClusterApplyCo // If called multiple times, the Name field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithName(value string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *ClusterApplyConfiguration) WithName(value string) *ClusterApplyConfigur // If called multiple times, the GenerateName field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithGenerateName(value string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *ClusterApplyConfiguration) WithGenerateName(value string) *ClusterApply // If called multiple times, the Namespace field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithNamespace(value string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *ClusterApplyConfiguration) WithNamespace(value string) *ClusterApplyCon // If called multiple times, the UID field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithUID(value types.UID) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *ClusterApplyConfiguration) WithUID(value types.UID) *ClusterApplyConfig // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithResourceVersion(value string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,25 +111,25 @@ func (b *ClusterApplyConfiguration) WithResourceVersion(value string) *ClusterAp // If called multiple times, the Generation field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithGeneration(value int64) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *ClusterApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ClusterApplyConfiguration { +func (b *ClusterApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *ClusterApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ClusterApplyConfiguration { +func (b *ClusterApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *ClusterApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Cl // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *ClusterApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *ClusterApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *ClusterApplyConfiguration) WithLabels(entries map[string]string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *ClusterApplyConfiguration) WithLabels(entries map[string]string) *Clust // overwriting an existing map entries in Annotations field with the same key. func (b *ClusterApplyConfiguration) WithAnnotations(entries map[string]string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -175,13 +175,13 @@ func (b *ClusterApplyConfiguration) WithAnnotations(entries map[string]string) * // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *ClusterApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *ClusterApplyConfiguration { +func (b *ClusterApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,14 +192,14 @@ func (b *ClusterApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer func (b *ClusterApplyConfiguration) WithFinalizers(values ...string) *ClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *ClusterApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -214,5 +214,5 @@ func (b *ClusterApplyConfiguration) WithSpec(value *ClusterSpecApplyConfiguratio // GetName retrieves the value of the Name field in the declarative configuration. func (b *ClusterApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/clusterglobalegressip.go b/pkg/client/applyconfiguration/submariner.io/v1/clusterglobalegressip.go index fcd3378d8..4ddd1d8e7 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/clusterglobalegressip.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/clusterglobalegressip.go @@ -21,18 +21,18 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // ClusterGlobalEgressIPApplyConfiguration represents a declarative configuration of the ClusterGlobalEgressIP type for use // with apply. type ClusterGlobalEgressIPApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *ClusterGlobalEgressIPSpecApplyConfiguration `json:"spec,omitempty"` - Status *GlobalEgressIPStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *ClusterGlobalEgressIPSpecApplyConfiguration `json:"spec,omitempty"` + Status *GlobalEgressIPStatusApplyConfiguration `json:"status,omitempty"` } // ClusterGlobalEgressIP constructs a declarative configuration of the ClusterGlobalEgressIP type for use with @@ -50,7 +50,7 @@ func ClusterGlobalEgressIP(name, namespace string) *ClusterGlobalEgressIPApplyCo // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithKind(value string) *ClusterGlobalEgressIPApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -58,7 +58,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithKind(value string) *Cluste // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithAPIVersion(value string) *ClusterGlobalEgressIPApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -67,7 +67,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithAPIVersion(value string) * // If called multiple times, the Name field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithName(value string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -76,7 +76,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithName(value string) *Cluste // If called multiple times, the GenerateName field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithGenerateName(value string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -85,7 +85,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithGenerateName(value string) // If called multiple times, the Namespace field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithNamespace(value string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -94,7 +94,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithNamespace(value string) *C // If called multiple times, the UID field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithUID(value types.UID) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -103,7 +103,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithUID(value types.UID) *Clus // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithResourceVersion(value string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -112,25 +112,25 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithResourceVersion(value stri // If called multiple times, the Generation field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithGeneration(value int64) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *ClusterGlobalEgressIPApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ClusterGlobalEgressIPApplyConfiguration { +func (b *ClusterGlobalEgressIPApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *ClusterGlobalEgressIPApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ClusterGlobalEgressIPApplyConfiguration { +func (b *ClusterGlobalEgressIPApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -139,7 +139,7 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithDeletionTimestamp(value me // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *ClusterGlobalEgressIPApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -149,11 +149,11 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithDeletionGracePeriodSeconds // overwriting an existing map entries in Labels field with the same key. func (b *ClusterGlobalEgressIPApplyConfiguration) WithLabels(entries map[string]string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -164,11 +164,11 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithLabels(entries map[string] // overwriting an existing map entries in Annotations field with the same key. func (b *ClusterGlobalEgressIPApplyConfiguration) WithAnnotations(entries map[string]string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -176,13 +176,13 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithAnnotations(entries map[st // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *ClusterGlobalEgressIPApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *ClusterGlobalEgressIPApplyConfiguration { +func (b *ClusterGlobalEgressIPApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -193,14 +193,14 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithOwnerReferences(values ... func (b *ClusterGlobalEgressIPApplyConfiguration) WithFinalizers(values ...string) *ClusterGlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *ClusterGlobalEgressIPApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -223,5 +223,5 @@ func (b *ClusterGlobalEgressIPApplyConfiguration) WithStatus(value *GlobalEgress // GetName retrieves the value of the Name field in the declarative configuration. func (b *ClusterGlobalEgressIPApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/connection.go b/pkg/client/applyconfiguration/submariner.io/v1/connection.go index 2ecdfc6a5..72591cace 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/connection.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/connection.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" ) // ConnectionApplyConfiguration represents a declarative configuration of the Connection type for use // with apply. type ConnectionApplyConfiguration struct { - Status *v1.ConnectionStatus `json:"status,omitempty"` + Status *submarineriov1.ConnectionStatus `json:"status,omitempty"` StatusMessage *string `json:"statusMessage,omitempty"` Endpoint *EndpointSpecApplyConfiguration `json:"endpoint,omitempty"` UsingIP *string `json:"usingIP,omitempty"` @@ -44,7 +44,7 @@ func Connection() *ConnectionApplyConfiguration { // WithStatus sets the Status field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Status field is set to the value of the last call. -func (b *ConnectionApplyConfiguration) WithStatus(value v1.ConnectionStatus) *ConnectionApplyConfiguration { +func (b *ConnectionApplyConfiguration) WithStatus(value submarineriov1.ConnectionStatus) *ConnectionApplyConfiguration { b.Status = &value return b } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/endpoint.go b/pkg/client/applyconfiguration/submariner.io/v1/endpoint.go index c57d97bd6..c65732f81 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/endpoint.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/endpoint.go @@ -21,17 +21,17 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // EndpointApplyConfiguration represents a declarative configuration of the Endpoint type for use // with apply. type EndpointApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *EndpointSpecApplyConfiguration `json:"spec,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *EndpointSpecApplyConfiguration `json:"spec,omitempty"` } // Endpoint constructs a declarative configuration of the Endpoint type for use with @@ -49,7 +49,7 @@ func Endpoint(name, namespace string) *EndpointApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithKind(value string) *EndpointApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *EndpointApplyConfiguration) WithKind(value string) *EndpointApplyConfig // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithAPIVersion(value string) *EndpointApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *EndpointApplyConfiguration) WithAPIVersion(value string) *EndpointApply // If called multiple times, the Name field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithName(value string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *EndpointApplyConfiguration) WithName(value string) *EndpointApplyConfig // If called multiple times, the GenerateName field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithGenerateName(value string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *EndpointApplyConfiguration) WithGenerateName(value string) *EndpointApp // If called multiple times, the Namespace field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithNamespace(value string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *EndpointApplyConfiguration) WithNamespace(value string) *EndpointApplyC // If called multiple times, the UID field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithUID(value types.UID) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *EndpointApplyConfiguration) WithUID(value types.UID) *EndpointApplyConf // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithResourceVersion(value string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,25 +111,25 @@ func (b *EndpointApplyConfiguration) WithResourceVersion(value string) *Endpoint // If called multiple times, the Generation field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithGeneration(value int64) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *EndpointApplyConfiguration) WithCreationTimestamp(value metav1.Time) *EndpointApplyConfiguration { +func (b *EndpointApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *EndpointApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *EndpointApplyConfiguration { +func (b *EndpointApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *EndpointApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *E // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *EndpointApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *EndpointApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *EndpointApplyConfiguration) WithLabels(entries map[string]string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *EndpointApplyConfiguration) WithLabels(entries map[string]string) *Endp // overwriting an existing map entries in Annotations field with the same key. func (b *EndpointApplyConfiguration) WithAnnotations(entries map[string]string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -175,13 +175,13 @@ func (b *EndpointApplyConfiguration) WithAnnotations(entries map[string]string) // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *EndpointApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *EndpointApplyConfiguration { +func (b *EndpointApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,14 +192,14 @@ func (b *EndpointApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefe func (b *EndpointApplyConfiguration) WithFinalizers(values ...string) *EndpointApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *EndpointApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -214,5 +214,5 @@ func (b *EndpointApplyConfiguration) WithSpec(value *EndpointSpecApplyConfigurat // GetName retrieves the value of the Name field in the declarative configuration. func (b *EndpointApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/gateway.go b/pkg/client/applyconfiguration/submariner.io/v1/gateway.go index 01032e863..a1af31a52 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/gateway.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/gateway.go @@ -21,17 +21,17 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GatewayApplyConfiguration represents a declarative configuration of the Gateway type for use // with apply. type GatewayApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Status *GatewayStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Status *GatewayStatusApplyConfiguration `json:"status,omitempty"` } // Gateway constructs a declarative configuration of the Gateway type for use with @@ -49,7 +49,7 @@ func Gateway(name, namespace string) *GatewayApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithKind(value string) *GatewayApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *GatewayApplyConfiguration) WithKind(value string) *GatewayApplyConfigur // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithAPIVersion(value string) *GatewayApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *GatewayApplyConfiguration) WithAPIVersion(value string) *GatewayApplyCo // If called multiple times, the Name field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithName(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *GatewayApplyConfiguration) WithName(value string) *GatewayApplyConfigur // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithGenerateName(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *GatewayApplyConfiguration) WithGenerateName(value string) *GatewayApply // If called multiple times, the Namespace field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithNamespace(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *GatewayApplyConfiguration) WithNamespace(value string) *GatewayApplyCon // If called multiple times, the UID field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithUID(value types.UID) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *GatewayApplyConfiguration) WithUID(value types.UID) *GatewayApplyConfig // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithResourceVersion(value string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,25 +111,25 @@ func (b *GatewayApplyConfiguration) WithResourceVersion(value string) *GatewayAp // If called multiple times, the Generation field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithGeneration(value int64) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GatewayApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GatewayApplyConfiguration { +func (b *GatewayApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GatewayApplyConfiguration { +func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *GatewayApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Ga // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GatewayApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *GatewayApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *GatewayApplyConfiguration) WithLabels(entries map[string]string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *GatewayApplyConfiguration) WithLabels(entries map[string]string) *Gatew // overwriting an existing map entries in Annotations field with the same key. func (b *GatewayApplyConfiguration) WithAnnotations(entries map[string]string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -175,13 +175,13 @@ func (b *GatewayApplyConfiguration) WithAnnotations(entries map[string]string) * // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GatewayApplyConfiguration { +func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,14 +192,14 @@ func (b *GatewayApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer func (b *GatewayApplyConfiguration) WithFinalizers(values ...string) *GatewayApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GatewayApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -214,5 +214,5 @@ func (b *GatewayApplyConfiguration) WithStatus(value *GatewayStatusApplyConfigur // GetName retrieves the value of the Name field in the declarative configuration. func (b *GatewayApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/gatewayroute.go b/pkg/client/applyconfiguration/submariner.io/v1/gatewayroute.go index 1f3d23dbb..67fe1a98b 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/gatewayroute.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/gatewayroute.go @@ -21,17 +21,17 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GatewayRouteApplyConfiguration represents a declarative configuration of the GatewayRoute type for use // with apply. type GatewayRouteApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - RoutePolicySpec *RoutePolicySpecApplyConfiguration `json:"spec,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + RoutePolicySpec *RoutePolicySpecApplyConfiguration `json:"spec,omitempty"` } // GatewayRoute constructs a declarative configuration of the GatewayRoute type for use with @@ -49,7 +49,7 @@ func GatewayRoute(name, namespace string) *GatewayRouteApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithKind(value string) *GatewayRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *GatewayRouteApplyConfiguration) WithKind(value string) *GatewayRouteApp // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithAPIVersion(value string) *GatewayRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *GatewayRouteApplyConfiguration) WithAPIVersion(value string) *GatewayRo // If called multiple times, the Name field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithName(value string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *GatewayRouteApplyConfiguration) WithName(value string) *GatewayRouteApp // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithGenerateName(value string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *GatewayRouteApplyConfiguration) WithGenerateName(value string) *Gateway // If called multiple times, the Namespace field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithNamespace(value string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *GatewayRouteApplyConfiguration) WithNamespace(value string) *GatewayRou // If called multiple times, the UID field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithUID(value types.UID) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *GatewayRouteApplyConfiguration) WithUID(value types.UID) *GatewayRouteA // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithResourceVersion(value string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,25 +111,25 @@ func (b *GatewayRouteApplyConfiguration) WithResourceVersion(value string) *Gate // If called multiple times, the Generation field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithGeneration(value int64) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GatewayRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GatewayRouteApplyConfiguration { +func (b *GatewayRouteApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GatewayRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GatewayRouteApplyConfiguration { +func (b *GatewayRouteApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *GatewayRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GatewayRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *GatewayRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value in // overwriting an existing map entries in Labels field with the same key. func (b *GatewayRouteApplyConfiguration) WithLabels(entries map[string]string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *GatewayRouteApplyConfiguration) WithLabels(entries map[string]string) * // overwriting an existing map entries in Annotations field with the same key. func (b *GatewayRouteApplyConfiguration) WithAnnotations(entries map[string]string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -175,13 +175,13 @@ func (b *GatewayRouteApplyConfiguration) WithAnnotations(entries map[string]stri // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GatewayRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GatewayRouteApplyConfiguration { +func (b *GatewayRouteApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,14 +192,14 @@ func (b *GatewayRouteApplyConfiguration) WithOwnerReferences(values ...*v1.Owner func (b *GatewayRouteApplyConfiguration) WithFinalizers(values ...string) *GatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GatewayRouteApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -214,5 +214,5 @@ func (b *GatewayRouteApplyConfiguration) WithRoutePolicySpec(value *RoutePolicyS // GetName retrieves the value of the Name field in the declarative configuration. func (b *GatewayRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/gatewaystatus.go b/pkg/client/applyconfiguration/submariner.io/v1/gatewaystatus.go index 049e300fc..0697b4671 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/gatewaystatus.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/gatewaystatus.go @@ -21,14 +21,14 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" ) // GatewayStatusApplyConfiguration represents a declarative configuration of the GatewayStatus type for use // with apply. type GatewayStatusApplyConfiguration struct { Version *string `json:"version,omitempty"` - HAStatus *v1.HAStatus `json:"haStatus,omitempty"` + HAStatus *submarineriov1.HAStatus `json:"haStatus,omitempty"` LocalEndpoint *EndpointSpecApplyConfiguration `json:"localEndpoint,omitempty"` StatusFailure *string `json:"statusFailure,omitempty"` Connections []ConnectionApplyConfiguration `json:"connections,omitempty"` @@ -51,7 +51,7 @@ func (b *GatewayStatusApplyConfiguration) WithVersion(value string) *GatewayStat // WithHAStatus sets the HAStatus field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the HAStatus field is set to the value of the last call. -func (b *GatewayStatusApplyConfiguration) WithHAStatus(value v1.HAStatus) *GatewayStatusApplyConfiguration { +func (b *GatewayStatusApplyConfiguration) WithHAStatus(value submarineriov1.HAStatus) *GatewayStatusApplyConfiguration { b.HAStatus = &value return b } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/globalegressip.go b/pkg/client/applyconfiguration/submariner.io/v1/globalegressip.go index 89654b7fa..cc0c83ddc 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/globalegressip.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/globalegressip.go @@ -21,18 +21,18 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GlobalEgressIPApplyConfiguration represents a declarative configuration of the GlobalEgressIP type for use // with apply. type GlobalEgressIPApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *GlobalEgressIPSpecApplyConfiguration `json:"spec,omitempty"` - Status *GlobalEgressIPStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *GlobalEgressIPSpecApplyConfiguration `json:"spec,omitempty"` + Status *GlobalEgressIPStatusApplyConfiguration `json:"status,omitempty"` } // GlobalEgressIP constructs a declarative configuration of the GlobalEgressIP type for use with @@ -50,7 +50,7 @@ func GlobalEgressIP(name, namespace string) *GlobalEgressIPApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithKind(value string) *GlobalEgressIPApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -58,7 +58,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithKind(value string) *GlobalEgressI // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithAPIVersion(value string) *GlobalEgressIPApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -67,7 +67,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithAPIVersion(value string) *GlobalE // If called multiple times, the Name field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithName(value string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -76,7 +76,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithName(value string) *GlobalEgressI // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithGenerateName(value string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -85,7 +85,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithGenerateName(value string) *Globa // If called multiple times, the Namespace field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithNamespace(value string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -94,7 +94,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithNamespace(value string) *GlobalEg // If called multiple times, the UID field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithUID(value types.UID) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -103,7 +103,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithUID(value types.UID) *GlobalEgres // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithResourceVersion(value string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -112,25 +112,25 @@ func (b *GlobalEgressIPApplyConfiguration) WithResourceVersion(value string) *Gl // If called multiple times, the Generation field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithGeneration(value int64) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GlobalEgressIPApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GlobalEgressIPApplyConfiguration { +func (b *GlobalEgressIPApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GlobalEgressIPApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GlobalEgressIPApplyConfiguration { +func (b *GlobalEgressIPApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -139,7 +139,7 @@ func (b *GlobalEgressIPApplyConfiguration) WithDeletionTimestamp(value metav1.Ti // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GlobalEgressIPApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -149,11 +149,11 @@ func (b *GlobalEgressIPApplyConfiguration) WithDeletionGracePeriodSeconds(value // overwriting an existing map entries in Labels field with the same key. func (b *GlobalEgressIPApplyConfiguration) WithLabels(entries map[string]string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -164,11 +164,11 @@ func (b *GlobalEgressIPApplyConfiguration) WithLabels(entries map[string]string) // overwriting an existing map entries in Annotations field with the same key. func (b *GlobalEgressIPApplyConfiguration) WithAnnotations(entries map[string]string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -176,13 +176,13 @@ func (b *GlobalEgressIPApplyConfiguration) WithAnnotations(entries map[string]st // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GlobalEgressIPApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GlobalEgressIPApplyConfiguration { +func (b *GlobalEgressIPApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -193,14 +193,14 @@ func (b *GlobalEgressIPApplyConfiguration) WithOwnerReferences(values ...*v1.Own func (b *GlobalEgressIPApplyConfiguration) WithFinalizers(values ...string) *GlobalEgressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GlobalEgressIPApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -223,5 +223,5 @@ func (b *GlobalEgressIPApplyConfiguration) WithStatus(value *GlobalEgressIPStatu // GetName retrieves the value of the Name field in the declarative configuration. func (b *GlobalEgressIPApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/globalegressipspec.go b/pkg/client/applyconfiguration/submariner.io/v1/globalegressipspec.go index 1106a9700..937003fcb 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/globalegressipspec.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/globalegressipspec.go @@ -21,14 +21,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GlobalEgressIPSpecApplyConfiguration represents a declarative configuration of the GlobalEgressIPSpec type for use // with apply. type GlobalEgressIPSpecApplyConfiguration struct { - NumberOfIPs *int `json:"numberOfIPs,omitempty"` - PodSelector *v1.LabelSelectorApplyConfiguration `json:"podSelector,omitempty"` + NumberOfIPs *int `json:"numberOfIPs,omitempty"` + PodSelector *metav1.LabelSelectorApplyConfiguration `json:"podSelector,omitempty"` } // GlobalEgressIPSpecApplyConfiguration constructs a declarative configuration of the GlobalEgressIPSpec type for use with @@ -48,7 +48,7 @@ func (b *GlobalEgressIPSpecApplyConfiguration) WithNumberOfIPs(value int) *Globa // WithPodSelector sets the PodSelector field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the PodSelector field is set to the value of the last call. -func (b *GlobalEgressIPSpecApplyConfiguration) WithPodSelector(value *v1.LabelSelectorApplyConfiguration) *GlobalEgressIPSpecApplyConfiguration { +func (b *GlobalEgressIPSpecApplyConfiguration) WithPodSelector(value *metav1.LabelSelectorApplyConfiguration) *GlobalEgressIPSpecApplyConfiguration { b.PodSelector = value return b } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/globalegressipstatus.go b/pkg/client/applyconfiguration/submariner.io/v1/globalegressipstatus.go index d29e18f02..024314171 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/globalegressipstatus.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/globalegressipstatus.go @@ -21,14 +21,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GlobalEgressIPStatusApplyConfiguration represents a declarative configuration of the GlobalEgressIPStatus type for use // with apply. type GlobalEgressIPStatusApplyConfiguration struct { - Conditions []v1.ConditionApplyConfiguration `json:"conditions,omitempty"` - AllocatedIPs []string `json:"allocatedIPs,omitempty"` + Conditions []metav1.ConditionApplyConfiguration `json:"conditions,omitempty"` + AllocatedIPs []string `json:"allocatedIPs,omitempty"` } // GlobalEgressIPStatusApplyConfiguration constructs a declarative configuration of the GlobalEgressIPStatus type for use with @@ -40,7 +40,7 @@ func GlobalEgressIPStatus() *GlobalEgressIPStatusApplyConfiguration { // WithConditions adds the given value to the Conditions field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Conditions field. -func (b *GlobalEgressIPStatusApplyConfiguration) WithConditions(values ...*v1.ConditionApplyConfiguration) *GlobalEgressIPStatusApplyConfiguration { +func (b *GlobalEgressIPStatusApplyConfiguration) WithConditions(values ...*metav1.ConditionApplyConfiguration) *GlobalEgressIPStatusApplyConfiguration { for i := range values { if values[i] == nil { panic("nil value passed to WithConditions") diff --git a/pkg/client/applyconfiguration/submariner.io/v1/globalingressip.go b/pkg/client/applyconfiguration/submariner.io/v1/globalingressip.go index b4660a986..07fb3ad55 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/globalingressip.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/globalingressip.go @@ -21,18 +21,18 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GlobalIngressIPApplyConfiguration represents a declarative configuration of the GlobalIngressIP type for use // with apply. type GlobalIngressIPApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Spec *GlobalIngressIPSpecApplyConfiguration `json:"spec,omitempty"` - Status *GlobalIngressIPStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Spec *GlobalIngressIPSpecApplyConfiguration `json:"spec,omitempty"` + Status *GlobalIngressIPStatusApplyConfiguration `json:"status,omitempty"` } // GlobalIngressIP constructs a declarative configuration of the GlobalIngressIP type for use with @@ -50,7 +50,7 @@ func GlobalIngressIP(name, namespace string) *GlobalIngressIPApplyConfiguration // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithKind(value string) *GlobalIngressIPApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -58,7 +58,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithKind(value string) *GlobalIngres // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithAPIVersion(value string) *GlobalIngressIPApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -67,7 +67,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithAPIVersion(value string) *Global // If called multiple times, the Name field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithName(value string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -76,7 +76,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithName(value string) *GlobalIngres // If called multiple times, the GenerateName field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithGenerateName(value string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -85,7 +85,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithGenerateName(value string) *Glob // If called multiple times, the Namespace field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithNamespace(value string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -94,7 +94,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithNamespace(value string) *GlobalI // If called multiple times, the UID field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithUID(value types.UID) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -103,7 +103,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithUID(value types.UID) *GlobalIngr // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithResourceVersion(value string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -112,25 +112,25 @@ func (b *GlobalIngressIPApplyConfiguration) WithResourceVersion(value string) *G // If called multiple times, the Generation field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithGeneration(value int64) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *GlobalIngressIPApplyConfiguration) WithCreationTimestamp(value metav1.Time) *GlobalIngressIPApplyConfiguration { +func (b *GlobalIngressIPApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *GlobalIngressIPApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *GlobalIngressIPApplyConfiguration { +func (b *GlobalIngressIPApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -139,7 +139,7 @@ func (b *GlobalIngressIPApplyConfiguration) WithDeletionTimestamp(value metav1.T // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *GlobalIngressIPApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -149,11 +149,11 @@ func (b *GlobalIngressIPApplyConfiguration) WithDeletionGracePeriodSeconds(value // overwriting an existing map entries in Labels field with the same key. func (b *GlobalIngressIPApplyConfiguration) WithLabels(entries map[string]string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -164,11 +164,11 @@ func (b *GlobalIngressIPApplyConfiguration) WithLabels(entries map[string]string // overwriting an existing map entries in Annotations field with the same key. func (b *GlobalIngressIPApplyConfiguration) WithAnnotations(entries map[string]string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -176,13 +176,13 @@ func (b *GlobalIngressIPApplyConfiguration) WithAnnotations(entries map[string]s // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *GlobalIngressIPApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *GlobalIngressIPApplyConfiguration { +func (b *GlobalIngressIPApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -193,14 +193,14 @@ func (b *GlobalIngressIPApplyConfiguration) WithOwnerReferences(values ...*v1.Ow func (b *GlobalIngressIPApplyConfiguration) WithFinalizers(values ...string) *GlobalIngressIPApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *GlobalIngressIPApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -223,5 +223,5 @@ func (b *GlobalIngressIPApplyConfiguration) WithStatus(value *GlobalIngressIPSta // GetName retrieves the value of the Name field in the declarative configuration. func (b *GlobalIngressIPApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/globalingressipspec.go b/pkg/client/applyconfiguration/submariner.io/v1/globalingressipspec.go index 5f6754a0f..d49a4d6ac 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/globalingressipspec.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/globalingressipspec.go @@ -21,14 +21,14 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" corev1 "k8s.io/api/core/v1" ) // GlobalIngressIPSpecApplyConfiguration represents a declarative configuration of the GlobalIngressIPSpec type for use // with apply. type GlobalIngressIPSpecApplyConfiguration struct { - Target *v1.TargetType `json:"target,omitempty"` + Target *submarineriov1.TargetType `json:"target,omitempty"` ServiceRef *corev1.LocalObjectReference `json:"serviceRef,omitempty"` PodRef *corev1.LocalObjectReference `json:"podRef,omitempty"` } @@ -42,7 +42,7 @@ func GlobalIngressIPSpec() *GlobalIngressIPSpecApplyConfiguration { // WithTarget sets the Target field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Target field is set to the value of the last call. -func (b *GlobalIngressIPSpecApplyConfiguration) WithTarget(value v1.TargetType) *GlobalIngressIPSpecApplyConfiguration { +func (b *GlobalIngressIPSpecApplyConfiguration) WithTarget(value submarineriov1.TargetType) *GlobalIngressIPSpecApplyConfiguration { b.Target = &value return b } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/globalingressipstatus.go b/pkg/client/applyconfiguration/submariner.io/v1/globalingressipstatus.go index dea52cbc3..77f84ab57 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/globalingressipstatus.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/globalingressipstatus.go @@ -21,14 +21,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // GlobalIngressIPStatusApplyConfiguration represents a declarative configuration of the GlobalIngressIPStatus type for use // with apply. type GlobalIngressIPStatusApplyConfiguration struct { - Conditions []v1.ConditionApplyConfiguration `json:"conditions,omitempty"` - AllocatedIP *string `json:"allocatedIP,omitempty"` + Conditions []metav1.ConditionApplyConfiguration `json:"conditions,omitempty"` + AllocatedIP *string `json:"allocatedIP,omitempty"` } // GlobalIngressIPStatusApplyConfiguration constructs a declarative configuration of the GlobalIngressIPStatus type for use with @@ -40,7 +40,7 @@ func GlobalIngressIPStatus() *GlobalIngressIPStatusApplyConfiguration { // WithConditions adds the given value to the Conditions field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Conditions field. -func (b *GlobalIngressIPStatusApplyConfiguration) WithConditions(values ...*v1.ConditionApplyConfiguration) *GlobalIngressIPStatusApplyConfiguration { +func (b *GlobalIngressIPStatusApplyConfiguration) WithConditions(values ...*metav1.ConditionApplyConfiguration) *GlobalIngressIPStatusApplyConfiguration { for i := range values { if values[i] == nil { panic("nil value passed to WithConditions") diff --git a/pkg/client/applyconfiguration/submariner.io/v1/nongatewayroute.go b/pkg/client/applyconfiguration/submariner.io/v1/nongatewayroute.go index 7c2b5f598..d416e07a0 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/nongatewayroute.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/nongatewayroute.go @@ -21,17 +21,17 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // NonGatewayRouteApplyConfiguration represents a declarative configuration of the NonGatewayRoute type for use // with apply. type NonGatewayRouteApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - RoutePolicySpec *RoutePolicySpecApplyConfiguration `json:"spec,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + RoutePolicySpec *RoutePolicySpecApplyConfiguration `json:"spec,omitempty"` } // NonGatewayRoute constructs a declarative configuration of the NonGatewayRoute type for use with @@ -49,7 +49,7 @@ func NonGatewayRoute(name, namespace string) *NonGatewayRouteApplyConfiguration // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithKind(value string) *NonGatewayRouteApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithKind(value string) *NonGatewayRo // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithAPIVersion(value string) *NonGatewayRouteApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithAPIVersion(value string) *NonGat // If called multiple times, the Name field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithName(value string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithName(value string) *NonGatewayRo // If called multiple times, the GenerateName field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithGenerateName(value string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithGenerateName(value string) *NonG // If called multiple times, the Namespace field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithNamespace(value string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithNamespace(value string) *NonGate // If called multiple times, the UID field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithUID(value types.UID) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithUID(value types.UID) *NonGateway // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithResourceVersion(value string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,25 +111,25 @@ func (b *NonGatewayRouteApplyConfiguration) WithResourceVersion(value string) *N // If called multiple times, the Generation field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithGeneration(value int64) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *NonGatewayRouteApplyConfiguration) WithCreationTimestamp(value metav1.Time) *NonGatewayRouteApplyConfiguration { +func (b *NonGatewayRouteApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *NonGatewayRouteApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *NonGatewayRouteApplyConfiguration { +func (b *NonGatewayRouteApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *NonGatewayRouteApplyConfiguration) WithDeletionTimestamp(value metav1.T // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *NonGatewayRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *NonGatewayRouteApplyConfiguration) WithDeletionGracePeriodSeconds(value // overwriting an existing map entries in Labels field with the same key. func (b *NonGatewayRouteApplyConfiguration) WithLabels(entries map[string]string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *NonGatewayRouteApplyConfiguration) WithLabels(entries map[string]string // overwriting an existing map entries in Annotations field with the same key. func (b *NonGatewayRouteApplyConfiguration) WithAnnotations(entries map[string]string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -175,13 +175,13 @@ func (b *NonGatewayRouteApplyConfiguration) WithAnnotations(entries map[string]s // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *NonGatewayRouteApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *NonGatewayRouteApplyConfiguration { +func (b *NonGatewayRouteApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,14 +192,14 @@ func (b *NonGatewayRouteApplyConfiguration) WithOwnerReferences(values ...*v1.Ow func (b *NonGatewayRouteApplyConfiguration) WithFinalizers(values ...string) *NonGatewayRouteApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *NonGatewayRouteApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -214,5 +214,5 @@ func (b *NonGatewayRouteApplyConfiguration) WithRoutePolicySpec(value *RoutePoli // GetName retrieves the value of the Name field in the declarative configuration. func (b *NonGatewayRouteApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/remoteendpoint.go b/pkg/client/applyconfiguration/submariner.io/v1/remoteendpoint.go index 3db62aa79..ef0adeebf 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/remoteendpoint.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/remoteendpoint.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" ) // RemoteEndpointApplyConfiguration represents a declarative configuration of the RemoteEndpoint type for use // with apply. type RemoteEndpointApplyConfiguration struct { - Status *v1.ConnectionStatus `json:"status,omitempty"` + Status *submarineriov1.ConnectionStatus `json:"status,omitempty"` StatusMessage *string `json:"statusMessage,omitempty"` Spec *EndpointSpecApplyConfiguration `json:"spec,omitempty"` LatencyRTT *LatencyRTTSpecApplyConfiguration `json:"latencyRTT,omitempty"` @@ -42,7 +42,7 @@ func RemoteEndpoint() *RemoteEndpointApplyConfiguration { // WithStatus sets the Status field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Status field is set to the value of the last call. -func (b *RemoteEndpointApplyConfiguration) WithStatus(value v1.ConnectionStatus) *RemoteEndpointApplyConfiguration { +func (b *RemoteEndpointApplyConfiguration) WithStatus(value submarineriov1.ConnectionStatus) *RemoteEndpointApplyConfiguration { b.Status = &value return b } diff --git a/pkg/client/applyconfiguration/submariner.io/v1/routeagent.go b/pkg/client/applyconfiguration/submariner.io/v1/routeagent.go index e199c2028..aab6059f4 100644 --- a/pkg/client/applyconfiguration/submariner.io/v1/routeagent.go +++ b/pkg/client/applyconfiguration/submariner.io/v1/routeagent.go @@ -21,17 +21,17 @@ limitations under the License. package v1 import ( - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // RouteAgentApplyConfiguration represents a declarative configuration of the RouteAgent type for use // with apply. type RouteAgentApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - Status *RouteAgentStatusApplyConfiguration `json:"status,omitempty"` + metav1.TypeMetaApplyConfiguration `json:",inline"` + *metav1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + Status *RouteAgentStatusApplyConfiguration `json:"status,omitempty"` } // RouteAgent constructs a declarative configuration of the RouteAgent type for use with @@ -49,7 +49,7 @@ func RouteAgent(name, namespace string) *RouteAgentApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithKind(value string) *RouteAgentApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *RouteAgentApplyConfiguration) WithKind(value string) *RouteAgentApplyCo // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithAPIVersion(value string) *RouteAgentApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *RouteAgentApplyConfiguration) WithAPIVersion(value string) *RouteAgentA // If called multiple times, the Name field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithName(value string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *RouteAgentApplyConfiguration) WithName(value string) *RouteAgentApplyCo // If called multiple times, the GenerateName field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithGenerateName(value string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *RouteAgentApplyConfiguration) WithGenerateName(value string) *RouteAgen // If called multiple times, the Namespace field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithNamespace(value string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *RouteAgentApplyConfiguration) WithNamespace(value string) *RouteAgentAp // If called multiple times, the UID field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithUID(value types.UID) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *RouteAgentApplyConfiguration) WithUID(value types.UID) *RouteAgentApply // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithResourceVersion(value string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,25 +111,25 @@ func (b *RouteAgentApplyConfiguration) WithResourceVersion(value string) *RouteA // If called multiple times, the Generation field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithGeneration(value int64) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *RouteAgentApplyConfiguration) WithCreationTimestamp(value metav1.Time) *RouteAgentApplyConfiguration { +func (b *RouteAgentApplyConfiguration) WithCreationTimestamp(value apismetav1.Time) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *RouteAgentApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *RouteAgentApplyConfiguration { +func (b *RouteAgentApplyConfiguration) WithDeletionTimestamp(value apismetav1.Time) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *RouteAgentApplyConfiguration) WithDeletionTimestamp(value metav1.Time) // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *RouteAgentApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *RouteAgentApplyConfiguration) WithDeletionGracePeriodSeconds(value int6 // overwriting an existing map entries in Labels field with the same key. func (b *RouteAgentApplyConfiguration) WithLabels(entries map[string]string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *RouteAgentApplyConfiguration) WithLabels(entries map[string]string) *Ro // overwriting an existing map entries in Annotations field with the same key. func (b *RouteAgentApplyConfiguration) WithAnnotations(entries map[string]string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -175,13 +175,13 @@ func (b *RouteAgentApplyConfiguration) WithAnnotations(entries map[string]string // WithOwnerReferences adds the given value to the OwnerReferences field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the OwnerReferences field. -func (b *RouteAgentApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferenceApplyConfiguration) *RouteAgentApplyConfiguration { +func (b *RouteAgentApplyConfiguration) WithOwnerReferences(values ...*metav1.OwnerReferenceApplyConfiguration) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,14 +192,14 @@ func (b *RouteAgentApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRe func (b *RouteAgentApplyConfiguration) WithFinalizers(values ...string) *RouteAgentApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } func (b *RouteAgentApplyConfiguration) ensureObjectMetaApplyConfigurationExists() { if b.ObjectMetaApplyConfiguration == nil { - b.ObjectMetaApplyConfiguration = &v1.ObjectMetaApplyConfiguration{} + b.ObjectMetaApplyConfiguration = &metav1.ObjectMetaApplyConfiguration{} } } @@ -214,5 +214,5 @@ func (b *RouteAgentApplyConfiguration) WithStatus(value *RouteAgentStatusApplyCo // GetName retrieves the value of the Name field in the declarative configuration. func (b *RouteAgentApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go index 995fc47f7..8839908ba 100644 --- a/pkg/client/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -21,8 +21,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" submarinerv1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" discovery "k8s.io/client-go/discovery" diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/cluster.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/cluster.go index 547dfbc1a..7b85638a5 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/cluster.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/cluster.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,32 +40,33 @@ type ClustersGetter interface { // ClusterInterface has methods to work with Cluster resources. type ClusterInterface interface { - Create(ctx context.Context, cluster *v1.Cluster, opts metav1.CreateOptions) (*v1.Cluster, error) - Update(ctx context.Context, cluster *v1.Cluster, opts metav1.UpdateOptions) (*v1.Cluster, error) + Create(ctx context.Context, cluster *submarineriov1.Cluster, opts metav1.CreateOptions) (*submarineriov1.Cluster, error) + Update(ctx context.Context, cluster *submarineriov1.Cluster, opts metav1.UpdateOptions) (*submarineriov1.Cluster, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Cluster, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.ClusterList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.Cluster, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.ClusterList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Cluster, err error) - Apply(ctx context.Context, cluster *submarineriov1.ClusterApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Cluster, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.Cluster, err error) + Apply(ctx context.Context, cluster *applyconfigurationsubmarineriov1.ClusterApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.Cluster, err error) ClusterExpansion } // clusters implements ClusterInterface type clusters struct { - *gentype.ClientWithListAndApply[*v1.Cluster, *v1.ClusterList, *submarineriov1.ClusterApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.Cluster, *submarineriov1.ClusterList, *applyconfigurationsubmarineriov1.ClusterApplyConfiguration] } // newClusters returns a Clusters func newClusters(c *SubmarinerV1Client, namespace string) *clusters { return &clusters{ - gentype.NewClientWithListAndApply[*v1.Cluster, *v1.ClusterList, *submarineriov1.ClusterApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.Cluster, *submarineriov1.ClusterList, *applyconfigurationsubmarineriov1.ClusterApplyConfiguration]( "clusters", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.Cluster { return &v1.Cluster{} }, - func() *v1.ClusterList { return &v1.ClusterList{} }), + func() *submarineriov1.Cluster { return &submarineriov1.Cluster{} }, + func() *submarineriov1.ClusterList { return &submarineriov1.ClusterList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/clusterglobalegressip.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/clusterglobalegressip.go index 16797cbb2..206f35ade 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/clusterglobalegressip.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/clusterglobalegressip.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,36 +40,37 @@ type ClusterGlobalEgressIPsGetter interface { // ClusterGlobalEgressIPInterface has methods to work with ClusterGlobalEgressIP resources. type ClusterGlobalEgressIPInterface interface { - Create(ctx context.Context, clusterGlobalEgressIP *v1.ClusterGlobalEgressIP, opts metav1.CreateOptions) (*v1.ClusterGlobalEgressIP, error) - Update(ctx context.Context, clusterGlobalEgressIP *v1.ClusterGlobalEgressIP, opts metav1.UpdateOptions) (*v1.ClusterGlobalEgressIP, error) + Create(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIP, opts metav1.CreateOptions) (*submarineriov1.ClusterGlobalEgressIP, error) + Update(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIP, opts metav1.UpdateOptions) (*submarineriov1.ClusterGlobalEgressIP, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, clusterGlobalEgressIP *v1.ClusterGlobalEgressIP, opts metav1.UpdateOptions) (*v1.ClusterGlobalEgressIP, error) + UpdateStatus(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIP, opts metav1.UpdateOptions) (*submarineriov1.ClusterGlobalEgressIP, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.ClusterGlobalEgressIP, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.ClusterGlobalEgressIPList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.ClusterGlobalEgressIP, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.ClusterGlobalEgressIPList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.ClusterGlobalEgressIP, err error) - Apply(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.ClusterGlobalEgressIP, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.ClusterGlobalEgressIP, err error) + Apply(ctx context.Context, clusterGlobalEgressIP *applyconfigurationsubmarineriov1.ClusterGlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.ClusterGlobalEgressIP, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.ClusterGlobalEgressIP, err error) + ApplyStatus(ctx context.Context, clusterGlobalEgressIP *applyconfigurationsubmarineriov1.ClusterGlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.ClusterGlobalEgressIP, err error) ClusterGlobalEgressIPExpansion } // clusterGlobalEgressIPs implements ClusterGlobalEgressIPInterface type clusterGlobalEgressIPs struct { - *gentype.ClientWithListAndApply[*v1.ClusterGlobalEgressIP, *v1.ClusterGlobalEgressIPList, *submarineriov1.ClusterGlobalEgressIPApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.ClusterGlobalEgressIP, *submarineriov1.ClusterGlobalEgressIPList, *applyconfigurationsubmarineriov1.ClusterGlobalEgressIPApplyConfiguration] } // newClusterGlobalEgressIPs returns a ClusterGlobalEgressIPs func newClusterGlobalEgressIPs(c *SubmarinerV1Client, namespace string) *clusterGlobalEgressIPs { return &clusterGlobalEgressIPs{ - gentype.NewClientWithListAndApply[*v1.ClusterGlobalEgressIP, *v1.ClusterGlobalEgressIPList, *submarineriov1.ClusterGlobalEgressIPApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.ClusterGlobalEgressIP, *submarineriov1.ClusterGlobalEgressIPList, *applyconfigurationsubmarineriov1.ClusterGlobalEgressIPApplyConfiguration]( "clusterglobalegressips", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.ClusterGlobalEgressIP { return &v1.ClusterGlobalEgressIP{} }, - func() *v1.ClusterGlobalEgressIPList { return &v1.ClusterGlobalEgressIPList{} }), + func() *submarineriov1.ClusterGlobalEgressIP { return &submarineriov1.ClusterGlobalEgressIP{} }, + func() *submarineriov1.ClusterGlobalEgressIPList { return &submarineriov1.ClusterGlobalEgressIPList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/endpoint.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/endpoint.go index 8971eb0d9..27410d037 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/endpoint.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/endpoint.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,32 +40,33 @@ type EndpointsGetter interface { // EndpointInterface has methods to work with Endpoint resources. type EndpointInterface interface { - Create(ctx context.Context, endpoint *v1.Endpoint, opts metav1.CreateOptions) (*v1.Endpoint, error) - Update(ctx context.Context, endpoint *v1.Endpoint, opts metav1.UpdateOptions) (*v1.Endpoint, error) + Create(ctx context.Context, endpoint *submarineriov1.Endpoint, opts metav1.CreateOptions) (*submarineriov1.Endpoint, error) + Update(ctx context.Context, endpoint *submarineriov1.Endpoint, opts metav1.UpdateOptions) (*submarineriov1.Endpoint, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Endpoint, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.EndpointList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.Endpoint, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.EndpointList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Endpoint, err error) - Apply(ctx context.Context, endpoint *submarineriov1.EndpointApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Endpoint, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.Endpoint, err error) + Apply(ctx context.Context, endpoint *applyconfigurationsubmarineriov1.EndpointApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.Endpoint, err error) EndpointExpansion } // endpoints implements EndpointInterface type endpoints struct { - *gentype.ClientWithListAndApply[*v1.Endpoint, *v1.EndpointList, *submarineriov1.EndpointApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.Endpoint, *submarineriov1.EndpointList, *applyconfigurationsubmarineriov1.EndpointApplyConfiguration] } // newEndpoints returns a Endpoints func newEndpoints(c *SubmarinerV1Client, namespace string) *endpoints { return &endpoints{ - gentype.NewClientWithListAndApply[*v1.Endpoint, *v1.EndpointList, *submarineriov1.EndpointApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.Endpoint, *submarineriov1.EndpointList, *applyconfigurationsubmarineriov1.EndpointApplyConfiguration]( "endpoints", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.Endpoint { return &v1.Endpoint{} }, - func() *v1.EndpointList { return &v1.EndpointList{} }), + func() *submarineriov1.Endpoint { return &submarineriov1.Endpoint{} }, + func() *submarineriov1.EndpointList { return &submarineriov1.EndpointList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_cluster.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_cluster.go index f7c1ff63b..07283f5e9 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_cluster.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_cluster.go @@ -21,142 +21,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeClusters implements ClusterInterface -type FakeClusters struct { +// fakeClusters implements ClusterInterface +type fakeClusters struct { + *gentype.FakeClientWithListAndApply[*v1.Cluster, *v1.ClusterList, *submarineriov1.ClusterApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var clustersResource = v1.SchemeGroupVersion.WithResource("clusters") - -var clustersKind = v1.SchemeGroupVersion.WithKind("Cluster") - -// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any. -func (c *FakeClusters) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.Cluster, err error) { - emptyResult := &v1.Cluster{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(clustersResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Cluster), err -} - -// List takes label and field selectors, and returns the list of Clusters that match those selectors. -func (c *FakeClusters) List(ctx context.Context, opts metav1.ListOptions) (result *v1.ClusterList, err error) { - emptyResult := &v1.ClusterList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(clustersResource, clustersKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.ClusterList{ListMeta: obj.(*v1.ClusterList).ListMeta} - for _, item := range obj.(*v1.ClusterList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested clusters. -func (c *FakeClusters) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(clustersResource, c.ns, opts)) - } -// Create takes the representation of a cluster and creates it. Returns the server's representation of the cluster, and an error, if there is any. -func (c *FakeClusters) Create(ctx context.Context, cluster *v1.Cluster, opts metav1.CreateOptions) (result *v1.Cluster, err error) { - emptyResult := &v1.Cluster{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(clustersResource, c.ns, cluster, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Cluster), err -} - -// Update takes the representation of a cluster and updates it. Returns the server's representation of the cluster, and an error, if there is any. -func (c *FakeClusters) Update(ctx context.Context, cluster *v1.Cluster, opts metav1.UpdateOptions) (result *v1.Cluster, err error) { - emptyResult := &v1.Cluster{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(clustersResource, c.ns, cluster, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Cluster), err -} - -// Delete takes name of the cluster and deletes it. Returns an error if one occurs. -func (c *FakeClusters) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(clustersResource, c.ns, name, opts), &v1.Cluster{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeClusters) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(clustersResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.ClusterList{}) - return err -} - -// Patch applies the patch and returns the patched cluster. -func (c *FakeClusters) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Cluster, err error) { - emptyResult := &v1.Cluster{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(clustersResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Cluster), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied cluster. -func (c *FakeClusters) Apply(ctx context.Context, cluster *submarineriov1.ClusterApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Cluster, err error) { - if cluster == nil { - return nil, fmt.Errorf("cluster provided to Apply must not be nil") - } - data, err := json.Marshal(cluster) - if err != nil { - return nil, err - } - name := cluster.Name - if name == nil { - return nil, fmt.Errorf("cluster.Name must be provided to Apply") - } - emptyResult := &v1.Cluster{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(clustersResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeClusters(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.ClusterInterface { + return &fakeClusters{ + gentype.NewFakeClientWithListAndApply[*v1.Cluster, *v1.ClusterList, *submarineriov1.ClusterApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("clusters"), + v1.SchemeGroupVersion.WithKind("Cluster"), + func() *v1.Cluster { return &v1.Cluster{} }, + func() *v1.ClusterList { return &v1.ClusterList{} }, + func(dst, src *v1.ClusterList) { dst.ListMeta = src.ListMeta }, + func(list *v1.ClusterList) []*v1.Cluster { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.ClusterList, items []*v1.Cluster) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.Cluster), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_clusterglobalegressip.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_clusterglobalegressip.go index 7e0212192..007099ae3 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_clusterglobalegressip.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_clusterglobalegressip.go @@ -21,179 +21,35 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeClusterGlobalEgressIPs implements ClusterGlobalEgressIPInterface -type FakeClusterGlobalEgressIPs struct { +// fakeClusterGlobalEgressIPs implements ClusterGlobalEgressIPInterface +type fakeClusterGlobalEgressIPs struct { + *gentype.FakeClientWithListAndApply[*v1.ClusterGlobalEgressIP, *v1.ClusterGlobalEgressIPList, *submarineriov1.ClusterGlobalEgressIPApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var clusterglobalegressipsResource = v1.SchemeGroupVersion.WithResource("clusterglobalegressips") - -var clusterglobalegressipsKind = v1.SchemeGroupVersion.WithKind("ClusterGlobalEgressIP") - -// Get takes name of the clusterGlobalEgressIP, and returns the corresponding clusterGlobalEgressIP object, and an error if there is any. -func (c *FakeClusterGlobalEgressIPs) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.ClusterGlobalEgressIP, err error) { - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(clusterglobalegressipsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.ClusterGlobalEgressIP), err -} - -// List takes label and field selectors, and returns the list of ClusterGlobalEgressIPs that match those selectors. -func (c *FakeClusterGlobalEgressIPs) List(ctx context.Context, opts metav1.ListOptions) (result *v1.ClusterGlobalEgressIPList, err error) { - emptyResult := &v1.ClusterGlobalEgressIPList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(clusterglobalegressipsResource, clusterglobalegressipsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.ClusterGlobalEgressIPList{ListMeta: obj.(*v1.ClusterGlobalEgressIPList).ListMeta} - for _, item := range obj.(*v1.ClusterGlobalEgressIPList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested clusterGlobalEgressIPs. -func (c *FakeClusterGlobalEgressIPs) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(clusterglobalegressipsResource, c.ns, opts)) - -} - -// Create takes the representation of a clusterGlobalEgressIP and creates it. Returns the server's representation of the clusterGlobalEgressIP, and an error, if there is any. -func (c *FakeClusterGlobalEgressIPs) Create(ctx context.Context, clusterGlobalEgressIP *v1.ClusterGlobalEgressIP, opts metav1.CreateOptions) (result *v1.ClusterGlobalEgressIP, err error) { - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(clusterglobalegressipsResource, c.ns, clusterGlobalEgressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.ClusterGlobalEgressIP), err -} - -// Update takes the representation of a clusterGlobalEgressIP and updates it. Returns the server's representation of the clusterGlobalEgressIP, and an error, if there is any. -func (c *FakeClusterGlobalEgressIPs) Update(ctx context.Context, clusterGlobalEgressIP *v1.ClusterGlobalEgressIP, opts metav1.UpdateOptions) (result *v1.ClusterGlobalEgressIP, err error) { - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(clusterglobalegressipsResource, c.ns, clusterGlobalEgressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.ClusterGlobalEgressIP), err } -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeClusterGlobalEgressIPs) UpdateStatus(ctx context.Context, clusterGlobalEgressIP *v1.ClusterGlobalEgressIP, opts metav1.UpdateOptions) (result *v1.ClusterGlobalEgressIP, err error) { - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(clusterglobalegressipsResource, "status", c.ns, clusterGlobalEgressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.ClusterGlobalEgressIP), err -} - -// Delete takes name of the clusterGlobalEgressIP and deletes it. Returns an error if one occurs. -func (c *FakeClusterGlobalEgressIPs) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(clusterglobalegressipsResource, c.ns, name, opts), &v1.ClusterGlobalEgressIP{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeClusterGlobalEgressIPs) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(clusterglobalegressipsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.ClusterGlobalEgressIPList{}) - return err -} - -// Patch applies the patch and returns the patched clusterGlobalEgressIP. -func (c *FakeClusterGlobalEgressIPs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.ClusterGlobalEgressIP, err error) { - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(clusterglobalegressipsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.ClusterGlobalEgressIP), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied clusterGlobalEgressIP. -func (c *FakeClusterGlobalEgressIPs) Apply(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.ClusterGlobalEgressIP, err error) { - if clusterGlobalEgressIP == nil { - return nil, fmt.Errorf("clusterGlobalEgressIP provided to Apply must not be nil") - } - data, err := json.Marshal(clusterGlobalEgressIP) - if err != nil { - return nil, err - } - name := clusterGlobalEgressIP.Name - if name == nil { - return nil, fmt.Errorf("clusterGlobalEgressIP.Name must be provided to Apply") - } - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(clusterglobalegressipsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.ClusterGlobalEgressIP), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeClusterGlobalEgressIPs) ApplyStatus(ctx context.Context, clusterGlobalEgressIP *submarineriov1.ClusterGlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.ClusterGlobalEgressIP, err error) { - if clusterGlobalEgressIP == nil { - return nil, fmt.Errorf("clusterGlobalEgressIP provided to Apply must not be nil") - } - data, err := json.Marshal(clusterGlobalEgressIP) - if err != nil { - return nil, err - } - name := clusterGlobalEgressIP.Name - if name == nil { - return nil, fmt.Errorf("clusterGlobalEgressIP.Name must be provided to Apply") - } - emptyResult := &v1.ClusterGlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(clusterglobalegressipsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeClusterGlobalEgressIPs(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.ClusterGlobalEgressIPInterface { + return &fakeClusterGlobalEgressIPs{ + gentype.NewFakeClientWithListAndApply[*v1.ClusterGlobalEgressIP, *v1.ClusterGlobalEgressIPList, *submarineriov1.ClusterGlobalEgressIPApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("clusterglobalegressips"), + v1.SchemeGroupVersion.WithKind("ClusterGlobalEgressIP"), + func() *v1.ClusterGlobalEgressIP { return &v1.ClusterGlobalEgressIP{} }, + func() *v1.ClusterGlobalEgressIPList { return &v1.ClusterGlobalEgressIPList{} }, + func(dst, src *v1.ClusterGlobalEgressIPList) { dst.ListMeta = src.ListMeta }, + func(list *v1.ClusterGlobalEgressIPList) []*v1.ClusterGlobalEgressIP { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1.ClusterGlobalEgressIPList, items []*v1.ClusterGlobalEgressIP) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.ClusterGlobalEgressIP), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_endpoint.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_endpoint.go index 39e4d5f99..e8a7a573f 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_endpoint.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_endpoint.go @@ -21,142 +21,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeEndpoints implements EndpointInterface -type FakeEndpoints struct { +// fakeEndpoints implements EndpointInterface +type fakeEndpoints struct { + *gentype.FakeClientWithListAndApply[*v1.Endpoint, *v1.EndpointList, *submarineriov1.EndpointApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var endpointsResource = v1.SchemeGroupVersion.WithResource("endpoints") - -var endpointsKind = v1.SchemeGroupVersion.WithKind("Endpoint") - -// Get takes name of the endpoint, and returns the corresponding endpoint object, and an error if there is any. -func (c *FakeEndpoints) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.Endpoint, err error) { - emptyResult := &v1.Endpoint{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(endpointsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Endpoint), err -} - -// List takes label and field selectors, and returns the list of Endpoints that match those selectors. -func (c *FakeEndpoints) List(ctx context.Context, opts metav1.ListOptions) (result *v1.EndpointList, err error) { - emptyResult := &v1.EndpointList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(endpointsResource, endpointsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.EndpointList{ListMeta: obj.(*v1.EndpointList).ListMeta} - for _, item := range obj.(*v1.EndpointList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested endpoints. -func (c *FakeEndpoints) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(endpointsResource, c.ns, opts)) - } -// Create takes the representation of a endpoint and creates it. Returns the server's representation of the endpoint, and an error, if there is any. -func (c *FakeEndpoints) Create(ctx context.Context, endpoint *v1.Endpoint, opts metav1.CreateOptions) (result *v1.Endpoint, err error) { - emptyResult := &v1.Endpoint{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(endpointsResource, c.ns, endpoint, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Endpoint), err -} - -// Update takes the representation of a endpoint and updates it. Returns the server's representation of the endpoint, and an error, if there is any. -func (c *FakeEndpoints) Update(ctx context.Context, endpoint *v1.Endpoint, opts metav1.UpdateOptions) (result *v1.Endpoint, err error) { - emptyResult := &v1.Endpoint{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(endpointsResource, c.ns, endpoint, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Endpoint), err -} - -// Delete takes name of the endpoint and deletes it. Returns an error if one occurs. -func (c *FakeEndpoints) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(endpointsResource, c.ns, name, opts), &v1.Endpoint{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeEndpoints) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(endpointsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.EndpointList{}) - return err -} - -// Patch applies the patch and returns the patched endpoint. -func (c *FakeEndpoints) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Endpoint, err error) { - emptyResult := &v1.Endpoint{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(endpointsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Endpoint), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied endpoint. -func (c *FakeEndpoints) Apply(ctx context.Context, endpoint *submarineriov1.EndpointApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Endpoint, err error) { - if endpoint == nil { - return nil, fmt.Errorf("endpoint provided to Apply must not be nil") - } - data, err := json.Marshal(endpoint) - if err != nil { - return nil, err - } - name := endpoint.Name - if name == nil { - return nil, fmt.Errorf("endpoint.Name must be provided to Apply") - } - emptyResult := &v1.Endpoint{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(endpointsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeEndpoints(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.EndpointInterface { + return &fakeEndpoints{ + gentype.NewFakeClientWithListAndApply[*v1.Endpoint, *v1.EndpointList, *submarineriov1.EndpointApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("endpoints"), + v1.SchemeGroupVersion.WithKind("Endpoint"), + func() *v1.Endpoint { return &v1.Endpoint{} }, + func() *v1.EndpointList { return &v1.EndpointList{} }, + func(dst, src *v1.EndpointList) { dst.ListMeta = src.ListMeta }, + func(list *v1.EndpointList) []*v1.Endpoint { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.EndpointList, items []*v1.Endpoint) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.Endpoint), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gateway.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gateway.go index 2870ae66a..ba54fe53f 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gateway.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gateway.go @@ -21,142 +21,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeGateways implements GatewayInterface -type FakeGateways struct { +// fakeGateways implements GatewayInterface +type fakeGateways struct { + *gentype.FakeClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *submarineriov1.GatewayApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var gatewaysResource = v1.SchemeGroupVersion.WithResource("gateways") - -var gatewaysKind = v1.SchemeGroupVersion.WithKind("Gateway") - -// Get takes name of the gateway, and returns the corresponding gateway object, and an error if there is any. -func (c *FakeGateways) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(gatewaysResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// List takes label and field selectors, and returns the list of Gateways that match those selectors. -func (c *FakeGateways) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GatewayList, err error) { - emptyResult := &v1.GatewayList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(gatewaysResource, gatewaysKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GatewayList{ListMeta: obj.(*v1.GatewayList).ListMeta} - for _, item := range obj.(*v1.GatewayList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested gateways. -func (c *FakeGateways) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(gatewaysResource, c.ns, opts)) - } -// Create takes the representation of a gateway and creates it. Returns the server's representation of the gateway, and an error, if there is any. -func (c *FakeGateways) Create(ctx context.Context, gateway *v1.Gateway, opts metav1.CreateOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(gatewaysResource, c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// Update takes the representation of a gateway and updates it. Returns the server's representation of the gateway, and an error, if there is any. -func (c *FakeGateways) Update(ctx context.Context, gateway *v1.Gateway, opts metav1.UpdateOptions) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(gatewaysResource, c.ns, gateway, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// Delete takes name of the gateway and deletes it. Returns an error if one occurs. -func (c *FakeGateways) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(gatewaysResource, c.ns, name, opts), &v1.Gateway{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGateways) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(gatewaysResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GatewayList{}) - return err -} - -// Patch applies the patch and returns the patched gateway. -func (c *FakeGateways) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Gateway, err error) { - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.Gateway), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gateway. -func (c *FakeGateways) Apply(ctx context.Context, gateway *submarineriov1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Gateway, err error) { - if gateway == nil { - return nil, fmt.Errorf("gateway provided to Apply must not be nil") - } - data, err := json.Marshal(gateway) - if err != nil { - return nil, err - } - name := gateway.Name - if name == nil { - return nil, fmt.Errorf("gateway.Name must be provided to Apply") - } - emptyResult := &v1.Gateway{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewaysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGateways(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.GatewayInterface { + return &fakeGateways{ + gentype.NewFakeClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *submarineriov1.GatewayApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("gateways"), + v1.SchemeGroupVersion.WithKind("Gateway"), + func() *v1.Gateway { return &v1.Gateway{} }, + func() *v1.GatewayList { return &v1.GatewayList{} }, + func(dst, src *v1.GatewayList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GatewayList) []*v1.Gateway { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GatewayList, items []*v1.Gateway) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.Gateway), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gatewayroute.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gatewayroute.go index ca6d8ed9d..0142f3298 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gatewayroute.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_gatewayroute.go @@ -21,142 +21,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeGatewayRoutes implements GatewayRouteInterface -type FakeGatewayRoutes struct { +// fakeGatewayRoutes implements GatewayRouteInterface +type fakeGatewayRoutes struct { + *gentype.FakeClientWithListAndApply[*v1.GatewayRoute, *v1.GatewayRouteList, *submarineriov1.GatewayRouteApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var gatewayroutesResource = v1.SchemeGroupVersion.WithResource("gatewayroutes") - -var gatewayroutesKind = v1.SchemeGroupVersion.WithKind("GatewayRoute") - -// Get takes name of the gatewayRoute, and returns the corresponding gatewayRoute object, and an error if there is any. -func (c *FakeGatewayRoutes) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GatewayRoute, err error) { - emptyResult := &v1.GatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(gatewayroutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayRoute), err -} - -// List takes label and field selectors, and returns the list of GatewayRoutes that match those selectors. -func (c *FakeGatewayRoutes) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GatewayRouteList, err error) { - emptyResult := &v1.GatewayRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(gatewayroutesResource, gatewayroutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GatewayRouteList{ListMeta: obj.(*v1.GatewayRouteList).ListMeta} - for _, item := range obj.(*v1.GatewayRouteList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested gatewayRoutes. -func (c *FakeGatewayRoutes) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(gatewayroutesResource, c.ns, opts)) - } -// Create takes the representation of a gatewayRoute and creates it. Returns the server's representation of the gatewayRoute, and an error, if there is any. -func (c *FakeGatewayRoutes) Create(ctx context.Context, gatewayRoute *v1.GatewayRoute, opts metav1.CreateOptions) (result *v1.GatewayRoute, err error) { - emptyResult := &v1.GatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(gatewayroutesResource, c.ns, gatewayRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayRoute), err -} - -// Update takes the representation of a gatewayRoute and updates it. Returns the server's representation of the gatewayRoute, and an error, if there is any. -func (c *FakeGatewayRoutes) Update(ctx context.Context, gatewayRoute *v1.GatewayRoute, opts metav1.UpdateOptions) (result *v1.GatewayRoute, err error) { - emptyResult := &v1.GatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(gatewayroutesResource, c.ns, gatewayRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayRoute), err -} - -// Delete takes name of the gatewayRoute and deletes it. Returns an error if one occurs. -func (c *FakeGatewayRoutes) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(gatewayroutesResource, c.ns, name, opts), &v1.GatewayRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGatewayRoutes) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(gatewayroutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GatewayRouteList{}) - return err -} - -// Patch applies the patch and returns the patched gatewayRoute. -func (c *FakeGatewayRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GatewayRoute, err error) { - emptyResult := &v1.GatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewayroutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GatewayRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied gatewayRoute. -func (c *FakeGatewayRoutes) Apply(ctx context.Context, gatewayRoute *submarineriov1.GatewayRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GatewayRoute, err error) { - if gatewayRoute == nil { - return nil, fmt.Errorf("gatewayRoute provided to Apply must not be nil") - } - data, err := json.Marshal(gatewayRoute) - if err != nil { - return nil, err - } - name := gatewayRoute.Name - if name == nil { - return nil, fmt.Errorf("gatewayRoute.Name must be provided to Apply") - } - emptyResult := &v1.GatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(gatewayroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGatewayRoutes(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.GatewayRouteInterface { + return &fakeGatewayRoutes{ + gentype.NewFakeClientWithListAndApply[*v1.GatewayRoute, *v1.GatewayRouteList, *submarineriov1.GatewayRouteApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("gatewayroutes"), + v1.SchemeGroupVersion.WithKind("GatewayRoute"), + func() *v1.GatewayRoute { return &v1.GatewayRoute{} }, + func() *v1.GatewayRouteList { return &v1.GatewayRouteList{} }, + func(dst, src *v1.GatewayRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GatewayRouteList) []*v1.GatewayRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GatewayRouteList, items []*v1.GatewayRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.GatewayRoute), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalegressip.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalegressip.go index ba6e0ea7c..406ee6c81 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalegressip.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalegressip.go @@ -21,179 +21,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeGlobalEgressIPs implements GlobalEgressIPInterface -type FakeGlobalEgressIPs struct { +// fakeGlobalEgressIPs implements GlobalEgressIPInterface +type fakeGlobalEgressIPs struct { + *gentype.FakeClientWithListAndApply[*v1.GlobalEgressIP, *v1.GlobalEgressIPList, *submarineriov1.GlobalEgressIPApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var globalegressipsResource = v1.SchemeGroupVersion.WithResource("globalegressips") - -var globalegressipsKind = v1.SchemeGroupVersion.WithKind("GlobalEgressIP") - -// Get takes name of the globalEgressIP, and returns the corresponding globalEgressIP object, and an error if there is any. -func (c *FakeGlobalEgressIPs) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GlobalEgressIP, err error) { - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(globalegressipsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalEgressIP), err -} - -// List takes label and field selectors, and returns the list of GlobalEgressIPs that match those selectors. -func (c *FakeGlobalEgressIPs) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GlobalEgressIPList, err error) { - emptyResult := &v1.GlobalEgressIPList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(globalegressipsResource, globalegressipsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GlobalEgressIPList{ListMeta: obj.(*v1.GlobalEgressIPList).ListMeta} - for _, item := range obj.(*v1.GlobalEgressIPList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested globalEgressIPs. -func (c *FakeGlobalEgressIPs) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(globalegressipsResource, c.ns, opts)) - -} - -// Create takes the representation of a globalEgressIP and creates it. Returns the server's representation of the globalEgressIP, and an error, if there is any. -func (c *FakeGlobalEgressIPs) Create(ctx context.Context, globalEgressIP *v1.GlobalEgressIP, opts metav1.CreateOptions) (result *v1.GlobalEgressIP, err error) { - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(globalegressipsResource, c.ns, globalEgressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalEgressIP), err -} - -// Update takes the representation of a globalEgressIP and updates it. Returns the server's representation of the globalEgressIP, and an error, if there is any. -func (c *FakeGlobalEgressIPs) Update(ctx context.Context, globalEgressIP *v1.GlobalEgressIP, opts metav1.UpdateOptions) (result *v1.GlobalEgressIP, err error) { - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(globalegressipsResource, c.ns, globalEgressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalEgressIP), err } -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeGlobalEgressIPs) UpdateStatus(ctx context.Context, globalEgressIP *v1.GlobalEgressIP, opts metav1.UpdateOptions) (result *v1.GlobalEgressIP, err error) { - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(globalegressipsResource, "status", c.ns, globalEgressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalEgressIP), err -} - -// Delete takes name of the globalEgressIP and deletes it. Returns an error if one occurs. -func (c *FakeGlobalEgressIPs) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(globalegressipsResource, c.ns, name, opts), &v1.GlobalEgressIP{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGlobalEgressIPs) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(globalegressipsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GlobalEgressIPList{}) - return err -} - -// Patch applies the patch and returns the patched globalEgressIP. -func (c *FakeGlobalEgressIPs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GlobalEgressIP, err error) { - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalegressipsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalEgressIP), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied globalEgressIP. -func (c *FakeGlobalEgressIPs) Apply(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalEgressIP, err error) { - if globalEgressIP == nil { - return nil, fmt.Errorf("globalEgressIP provided to Apply must not be nil") - } - data, err := json.Marshal(globalEgressIP) - if err != nil { - return nil, err - } - name := globalEgressIP.Name - if name == nil { - return nil, fmt.Errorf("globalEgressIP.Name must be provided to Apply") - } - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalegressipsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalEgressIP), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGlobalEgressIPs) ApplyStatus(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalEgressIP, err error) { - if globalEgressIP == nil { - return nil, fmt.Errorf("globalEgressIP provided to Apply must not be nil") - } - data, err := json.Marshal(globalEgressIP) - if err != nil { - return nil, err - } - name := globalEgressIP.Name - if name == nil { - return nil, fmt.Errorf("globalEgressIP.Name must be provided to Apply") - } - emptyResult := &v1.GlobalEgressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalegressipsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGlobalEgressIPs(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.GlobalEgressIPInterface { + return &fakeGlobalEgressIPs{ + gentype.NewFakeClientWithListAndApply[*v1.GlobalEgressIP, *v1.GlobalEgressIPList, *submarineriov1.GlobalEgressIPApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("globalegressips"), + v1.SchemeGroupVersion.WithKind("GlobalEgressIP"), + func() *v1.GlobalEgressIP { return &v1.GlobalEgressIP{} }, + func() *v1.GlobalEgressIPList { return &v1.GlobalEgressIPList{} }, + func(dst, src *v1.GlobalEgressIPList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GlobalEgressIPList) []*v1.GlobalEgressIP { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GlobalEgressIPList, items []*v1.GlobalEgressIP) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.GlobalEgressIP), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalingressip.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalingressip.go index b27de0a86..10c837ad8 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalingressip.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_globalingressip.go @@ -21,179 +21,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeGlobalIngressIPs implements GlobalIngressIPInterface -type FakeGlobalIngressIPs struct { +// fakeGlobalIngressIPs implements GlobalIngressIPInterface +type fakeGlobalIngressIPs struct { + *gentype.FakeClientWithListAndApply[*v1.GlobalIngressIP, *v1.GlobalIngressIPList, *submarineriov1.GlobalIngressIPApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var globalingressipsResource = v1.SchemeGroupVersion.WithResource("globalingressips") - -var globalingressipsKind = v1.SchemeGroupVersion.WithKind("GlobalIngressIP") - -// Get takes name of the globalIngressIP, and returns the corresponding globalIngressIP object, and an error if there is any. -func (c *FakeGlobalIngressIPs) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.GlobalIngressIP, err error) { - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(globalingressipsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalIngressIP), err -} - -// List takes label and field selectors, and returns the list of GlobalIngressIPs that match those selectors. -func (c *FakeGlobalIngressIPs) List(ctx context.Context, opts metav1.ListOptions) (result *v1.GlobalIngressIPList, err error) { - emptyResult := &v1.GlobalIngressIPList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(globalingressipsResource, globalingressipsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.GlobalIngressIPList{ListMeta: obj.(*v1.GlobalIngressIPList).ListMeta} - for _, item := range obj.(*v1.GlobalIngressIPList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested globalIngressIPs. -func (c *FakeGlobalIngressIPs) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(globalingressipsResource, c.ns, opts)) - -} - -// Create takes the representation of a globalIngressIP and creates it. Returns the server's representation of the globalIngressIP, and an error, if there is any. -func (c *FakeGlobalIngressIPs) Create(ctx context.Context, globalIngressIP *v1.GlobalIngressIP, opts metav1.CreateOptions) (result *v1.GlobalIngressIP, err error) { - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(globalingressipsResource, c.ns, globalIngressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalIngressIP), err -} - -// Update takes the representation of a globalIngressIP and updates it. Returns the server's representation of the globalIngressIP, and an error, if there is any. -func (c *FakeGlobalIngressIPs) Update(ctx context.Context, globalIngressIP *v1.GlobalIngressIP, opts metav1.UpdateOptions) (result *v1.GlobalIngressIP, err error) { - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(globalingressipsResource, c.ns, globalIngressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalIngressIP), err } -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeGlobalIngressIPs) UpdateStatus(ctx context.Context, globalIngressIP *v1.GlobalIngressIP, opts metav1.UpdateOptions) (result *v1.GlobalIngressIP, err error) { - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(globalingressipsResource, "status", c.ns, globalIngressIP, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalIngressIP), err -} - -// Delete takes name of the globalIngressIP and deletes it. Returns an error if one occurs. -func (c *FakeGlobalIngressIPs) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(globalingressipsResource, c.ns, name, opts), &v1.GlobalIngressIP{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeGlobalIngressIPs) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(globalingressipsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.GlobalIngressIPList{}) - return err -} - -// Patch applies the patch and returns the patched globalIngressIP. -func (c *FakeGlobalIngressIPs) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GlobalIngressIP, err error) { - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalingressipsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalIngressIP), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied globalIngressIP. -func (c *FakeGlobalIngressIPs) Apply(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalIngressIP, err error) { - if globalIngressIP == nil { - return nil, fmt.Errorf("globalIngressIP provided to Apply must not be nil") - } - data, err := json.Marshal(globalIngressIP) - if err != nil { - return nil, err - } - name := globalIngressIP.Name - if name == nil { - return nil, fmt.Errorf("globalIngressIP.Name must be provided to Apply") - } - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalingressipsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.GlobalIngressIP), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeGlobalIngressIPs) ApplyStatus(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalIngressIP, err error) { - if globalIngressIP == nil { - return nil, fmt.Errorf("globalIngressIP provided to Apply must not be nil") - } - data, err := json.Marshal(globalIngressIP) - if err != nil { - return nil, err - } - name := globalIngressIP.Name - if name == nil { - return nil, fmt.Errorf("globalIngressIP.Name must be provided to Apply") - } - emptyResult := &v1.GlobalIngressIP{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(globalingressipsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeGlobalIngressIPs(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.GlobalIngressIPInterface { + return &fakeGlobalIngressIPs{ + gentype.NewFakeClientWithListAndApply[*v1.GlobalIngressIP, *v1.GlobalIngressIPList, *submarineriov1.GlobalIngressIPApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("globalingressips"), + v1.SchemeGroupVersion.WithKind("GlobalIngressIP"), + func() *v1.GlobalIngressIP { return &v1.GlobalIngressIP{} }, + func() *v1.GlobalIngressIPList { return &v1.GlobalIngressIPList{} }, + func(dst, src *v1.GlobalIngressIPList) { dst.ListMeta = src.ListMeta }, + func(list *v1.GlobalIngressIPList) []*v1.GlobalIngressIP { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.GlobalIngressIPList, items []*v1.GlobalIngressIP) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.GlobalIngressIP), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_nongatewayroute.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_nongatewayroute.go index 1cb000ffa..89713b5b7 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_nongatewayroute.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_nongatewayroute.go @@ -21,142 +21,33 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeNonGatewayRoutes implements NonGatewayRouteInterface -type FakeNonGatewayRoutes struct { +// fakeNonGatewayRoutes implements NonGatewayRouteInterface +type fakeNonGatewayRoutes struct { + *gentype.FakeClientWithListAndApply[*v1.NonGatewayRoute, *v1.NonGatewayRouteList, *submarineriov1.NonGatewayRouteApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var nongatewayroutesResource = v1.SchemeGroupVersion.WithResource("nongatewayroutes") - -var nongatewayroutesKind = v1.SchemeGroupVersion.WithKind("NonGatewayRoute") - -// Get takes name of the nonGatewayRoute, and returns the corresponding nonGatewayRoute object, and an error if there is any. -func (c *FakeNonGatewayRoutes) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.NonGatewayRoute, err error) { - emptyResult := &v1.NonGatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(nongatewayroutesResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NonGatewayRoute), err -} - -// List takes label and field selectors, and returns the list of NonGatewayRoutes that match those selectors. -func (c *FakeNonGatewayRoutes) List(ctx context.Context, opts metav1.ListOptions) (result *v1.NonGatewayRouteList, err error) { - emptyResult := &v1.NonGatewayRouteList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(nongatewayroutesResource, nongatewayroutesKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.NonGatewayRouteList{ListMeta: obj.(*v1.NonGatewayRouteList).ListMeta} - for _, item := range obj.(*v1.NonGatewayRouteList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested nonGatewayRoutes. -func (c *FakeNonGatewayRoutes) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(nongatewayroutesResource, c.ns, opts)) - } -// Create takes the representation of a nonGatewayRoute and creates it. Returns the server's representation of the nonGatewayRoute, and an error, if there is any. -func (c *FakeNonGatewayRoutes) Create(ctx context.Context, nonGatewayRoute *v1.NonGatewayRoute, opts metav1.CreateOptions) (result *v1.NonGatewayRoute, err error) { - emptyResult := &v1.NonGatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(nongatewayroutesResource, c.ns, nonGatewayRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NonGatewayRoute), err -} - -// Update takes the representation of a nonGatewayRoute and updates it. Returns the server's representation of the nonGatewayRoute, and an error, if there is any. -func (c *FakeNonGatewayRoutes) Update(ctx context.Context, nonGatewayRoute *v1.NonGatewayRoute, opts metav1.UpdateOptions) (result *v1.NonGatewayRoute, err error) { - emptyResult := &v1.NonGatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(nongatewayroutesResource, c.ns, nonGatewayRoute, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NonGatewayRoute), err -} - -// Delete takes name of the nonGatewayRoute and deletes it. Returns an error if one occurs. -func (c *FakeNonGatewayRoutes) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(nongatewayroutesResource, c.ns, name, opts), &v1.NonGatewayRoute{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeNonGatewayRoutes) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(nongatewayroutesResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.NonGatewayRouteList{}) - return err -} - -// Patch applies the patch and returns the patched nonGatewayRoute. -func (c *FakeNonGatewayRoutes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.NonGatewayRoute, err error) { - emptyResult := &v1.NonGatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(nongatewayroutesResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.NonGatewayRoute), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied nonGatewayRoute. -func (c *FakeNonGatewayRoutes) Apply(ctx context.Context, nonGatewayRoute *submarineriov1.NonGatewayRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.NonGatewayRoute, err error) { - if nonGatewayRoute == nil { - return nil, fmt.Errorf("nonGatewayRoute provided to Apply must not be nil") - } - data, err := json.Marshal(nonGatewayRoute) - if err != nil { - return nil, err - } - name := nonGatewayRoute.Name - if name == nil { - return nil, fmt.Errorf("nonGatewayRoute.Name must be provided to Apply") - } - emptyResult := &v1.NonGatewayRoute{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(nongatewayroutesResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeNonGatewayRoutes(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.NonGatewayRouteInterface { + return &fakeNonGatewayRoutes{ + gentype.NewFakeClientWithListAndApply[*v1.NonGatewayRoute, *v1.NonGatewayRouteList, *submarineriov1.NonGatewayRouteApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("nongatewayroutes"), + v1.SchemeGroupVersion.WithKind("NonGatewayRoute"), + func() *v1.NonGatewayRoute { return &v1.NonGatewayRoute{} }, + func() *v1.NonGatewayRouteList { return &v1.NonGatewayRouteList{} }, + func(dst, src *v1.NonGatewayRouteList) { dst.ListMeta = src.ListMeta }, + func(list *v1.NonGatewayRouteList) []*v1.NonGatewayRoute { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.NonGatewayRouteList, items []*v1.NonGatewayRoute) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1.NonGatewayRoute), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_routeagent.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_routeagent.go index cf12282a9..a6773f449 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_routeagent.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_routeagent.go @@ -21,142 +21,31 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + typedsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/clientset/versioned/typed/submariner.io/v1" + gentype "k8s.io/client-go/gentype" ) -// FakeRouteAgents implements RouteAgentInterface -type FakeRouteAgents struct { +// fakeRouteAgents implements RouteAgentInterface +type fakeRouteAgents struct { + *gentype.FakeClientWithListAndApply[*v1.RouteAgent, *v1.RouteAgentList, *submarineriov1.RouteAgentApplyConfiguration] Fake *FakeSubmarinerV1 - ns string -} - -var routeagentsResource = v1.SchemeGroupVersion.WithResource("routeagents") - -var routeagentsKind = v1.SchemeGroupVersion.WithKind("RouteAgent") - -// Get takes name of the routeAgent, and returns the corresponding routeAgent object, and an error if there is any. -func (c *FakeRouteAgents) Get(ctx context.Context, name string, options metav1.GetOptions) (result *v1.RouteAgent, err error) { - emptyResult := &v1.RouteAgent{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(routeagentsResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.RouteAgent), err -} - -// List takes label and field selectors, and returns the list of RouteAgents that match those selectors. -func (c *FakeRouteAgents) List(ctx context.Context, opts metav1.ListOptions) (result *v1.RouteAgentList, err error) { - emptyResult := &v1.RouteAgentList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(routeagentsResource, routeagentsKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1.RouteAgentList{ListMeta: obj.(*v1.RouteAgentList).ListMeta} - for _, item := range obj.(*v1.RouteAgentList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested routeAgents. -func (c *FakeRouteAgents) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(routeagentsResource, c.ns, opts)) - } -// Create takes the representation of a routeAgent and creates it. Returns the server's representation of the routeAgent, and an error, if there is any. -func (c *FakeRouteAgents) Create(ctx context.Context, routeAgent *v1.RouteAgent, opts metav1.CreateOptions) (result *v1.RouteAgent, err error) { - emptyResult := &v1.RouteAgent{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(routeagentsResource, c.ns, routeAgent, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.RouteAgent), err -} - -// Update takes the representation of a routeAgent and updates it. Returns the server's representation of the routeAgent, and an error, if there is any. -func (c *FakeRouteAgents) Update(ctx context.Context, routeAgent *v1.RouteAgent, opts metav1.UpdateOptions) (result *v1.RouteAgent, err error) { - emptyResult := &v1.RouteAgent{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(routeagentsResource, c.ns, routeAgent, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.RouteAgent), err -} - -// Delete takes name of the routeAgent and deletes it. Returns an error if one occurs. -func (c *FakeRouteAgents) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(routeagentsResource, c.ns, name, opts), &v1.RouteAgent{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeRouteAgents) DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(routeagentsResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1.RouteAgentList{}) - return err -} - -// Patch applies the patch and returns the patched routeAgent. -func (c *FakeRouteAgents) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.RouteAgent, err error) { - emptyResult := &v1.RouteAgent{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(routeagentsResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1.RouteAgent), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied routeAgent. -func (c *FakeRouteAgents) Apply(ctx context.Context, routeAgent *submarineriov1.RouteAgentApplyConfiguration, opts metav1.ApplyOptions) (result *v1.RouteAgent, err error) { - if routeAgent == nil { - return nil, fmt.Errorf("routeAgent provided to Apply must not be nil") - } - data, err := json.Marshal(routeAgent) - if err != nil { - return nil, err - } - name := routeAgent.Name - if name == nil { - return nil, fmt.Errorf("routeAgent.Name must be provided to Apply") - } - emptyResult := &v1.RouteAgent{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(routeagentsResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeRouteAgents(fake *FakeSubmarinerV1, namespace string) typedsubmarineriov1.RouteAgentInterface { + return &fakeRouteAgents{ + gentype.NewFakeClientWithListAndApply[*v1.RouteAgent, *v1.RouteAgentList, *submarineriov1.RouteAgentApplyConfiguration]( + fake.Fake, + namespace, + v1.SchemeGroupVersion.WithResource("routeagents"), + v1.SchemeGroupVersion.WithKind("RouteAgent"), + func() *v1.RouteAgent { return &v1.RouteAgent{} }, + func() *v1.RouteAgentList { return &v1.RouteAgentList{} }, + func(dst, src *v1.RouteAgentList) { dst.ListMeta = src.ListMeta }, + func(list *v1.RouteAgentList) []*v1.RouteAgent { return gentype.ToPointerSlice(list.Items) }, + func(list *v1.RouteAgentList, items []*v1.RouteAgent) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1.RouteAgent), err } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_submariner.io_client.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_submariner.io_client.go index 05c2e3d88..87ccd31e6 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_submariner.io_client.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/fake/fake_submariner.io_client.go @@ -31,39 +31,39 @@ type FakeSubmarinerV1 struct { } func (c *FakeSubmarinerV1) Clusters(namespace string) v1.ClusterInterface { - return &FakeClusters{c, namespace} + return newFakeClusters(c, namespace) } func (c *FakeSubmarinerV1) ClusterGlobalEgressIPs(namespace string) v1.ClusterGlobalEgressIPInterface { - return &FakeClusterGlobalEgressIPs{c, namespace} + return newFakeClusterGlobalEgressIPs(c, namespace) } func (c *FakeSubmarinerV1) Endpoints(namespace string) v1.EndpointInterface { - return &FakeEndpoints{c, namespace} + return newFakeEndpoints(c, namespace) } func (c *FakeSubmarinerV1) Gateways(namespace string) v1.GatewayInterface { - return &FakeGateways{c, namespace} + return newFakeGateways(c, namespace) } func (c *FakeSubmarinerV1) GatewayRoutes(namespace string) v1.GatewayRouteInterface { - return &FakeGatewayRoutes{c, namespace} + return newFakeGatewayRoutes(c, namespace) } func (c *FakeSubmarinerV1) GlobalEgressIPs(namespace string) v1.GlobalEgressIPInterface { - return &FakeGlobalEgressIPs{c, namespace} + return newFakeGlobalEgressIPs(c, namespace) } func (c *FakeSubmarinerV1) GlobalIngressIPs(namespace string) v1.GlobalIngressIPInterface { - return &FakeGlobalIngressIPs{c, namespace} + return newFakeGlobalIngressIPs(c, namespace) } func (c *FakeSubmarinerV1) NonGatewayRoutes(namespace string) v1.NonGatewayRouteInterface { - return &FakeNonGatewayRoutes{c, namespace} + return newFakeNonGatewayRoutes(c, namespace) } func (c *FakeSubmarinerV1) RouteAgents(namespace string) v1.RouteAgentInterface { - return &FakeRouteAgents{c, namespace} + return newFakeRouteAgents(c, namespace) } // RESTClient returns a RESTClient that is used to communicate diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/gateway.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/gateway.go index 02d299d4b..8ee7bd7b0 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/gateway.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/gateway.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,32 +40,33 @@ type GatewaysGetter interface { // GatewayInterface has methods to work with Gateway resources. type GatewayInterface interface { - Create(ctx context.Context, gateway *v1.Gateway, opts metav1.CreateOptions) (*v1.Gateway, error) - Update(ctx context.Context, gateway *v1.Gateway, opts metav1.UpdateOptions) (*v1.Gateway, error) + Create(ctx context.Context, gateway *submarineriov1.Gateway, opts metav1.CreateOptions) (*submarineriov1.Gateway, error) + Update(ctx context.Context, gateway *submarineriov1.Gateway, opts metav1.UpdateOptions) (*submarineriov1.Gateway, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.Gateway, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GatewayList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.Gateway, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.GatewayList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.Gateway, err error) - Apply(ctx context.Context, gateway *submarineriov1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *v1.Gateway, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.Gateway, err error) + Apply(ctx context.Context, gateway *applyconfigurationsubmarineriov1.GatewayApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.Gateway, err error) GatewayExpansion } // gateways implements GatewayInterface type gateways struct { - *gentype.ClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *submarineriov1.GatewayApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.Gateway, *submarineriov1.GatewayList, *applyconfigurationsubmarineriov1.GatewayApplyConfiguration] } // newGateways returns a Gateways func newGateways(c *SubmarinerV1Client, namespace string) *gateways { return &gateways{ - gentype.NewClientWithListAndApply[*v1.Gateway, *v1.GatewayList, *submarineriov1.GatewayApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.Gateway, *submarineriov1.GatewayList, *applyconfigurationsubmarineriov1.GatewayApplyConfiguration]( "gateways", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.Gateway { return &v1.Gateway{} }, - func() *v1.GatewayList { return &v1.GatewayList{} }), + func() *submarineriov1.Gateway { return &submarineriov1.Gateway{} }, + func() *submarineriov1.GatewayList { return &submarineriov1.GatewayList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/gatewayroute.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/gatewayroute.go index d405d78ce..db8308c37 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/gatewayroute.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/gatewayroute.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,32 +40,33 @@ type GatewayRoutesGetter interface { // GatewayRouteInterface has methods to work with GatewayRoute resources. type GatewayRouteInterface interface { - Create(ctx context.Context, gatewayRoute *v1.GatewayRoute, opts metav1.CreateOptions) (*v1.GatewayRoute, error) - Update(ctx context.Context, gatewayRoute *v1.GatewayRoute, opts metav1.UpdateOptions) (*v1.GatewayRoute, error) + Create(ctx context.Context, gatewayRoute *submarineriov1.GatewayRoute, opts metav1.CreateOptions) (*submarineriov1.GatewayRoute, error) + Update(ctx context.Context, gatewayRoute *submarineriov1.GatewayRoute, opts metav1.UpdateOptions) (*submarineriov1.GatewayRoute, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GatewayRoute, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GatewayRouteList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.GatewayRoute, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.GatewayRouteList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GatewayRoute, err error) - Apply(ctx context.Context, gatewayRoute *submarineriov1.GatewayRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GatewayRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.GatewayRoute, err error) + Apply(ctx context.Context, gatewayRoute *applyconfigurationsubmarineriov1.GatewayRouteApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.GatewayRoute, err error) GatewayRouteExpansion } // gatewayRoutes implements GatewayRouteInterface type gatewayRoutes struct { - *gentype.ClientWithListAndApply[*v1.GatewayRoute, *v1.GatewayRouteList, *submarineriov1.GatewayRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.GatewayRoute, *submarineriov1.GatewayRouteList, *applyconfigurationsubmarineriov1.GatewayRouteApplyConfiguration] } // newGatewayRoutes returns a GatewayRoutes func newGatewayRoutes(c *SubmarinerV1Client, namespace string) *gatewayRoutes { return &gatewayRoutes{ - gentype.NewClientWithListAndApply[*v1.GatewayRoute, *v1.GatewayRouteList, *submarineriov1.GatewayRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.GatewayRoute, *submarineriov1.GatewayRouteList, *applyconfigurationsubmarineriov1.GatewayRouteApplyConfiguration]( "gatewayroutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.GatewayRoute { return &v1.GatewayRoute{} }, - func() *v1.GatewayRouteList { return &v1.GatewayRouteList{} }), + func() *submarineriov1.GatewayRoute { return &submarineriov1.GatewayRoute{} }, + func() *submarineriov1.GatewayRouteList { return &submarineriov1.GatewayRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/globalegressip.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/globalegressip.go index f35183896..588cab79a 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/globalegressip.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/globalegressip.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,36 +40,37 @@ type GlobalEgressIPsGetter interface { // GlobalEgressIPInterface has methods to work with GlobalEgressIP resources. type GlobalEgressIPInterface interface { - Create(ctx context.Context, globalEgressIP *v1.GlobalEgressIP, opts metav1.CreateOptions) (*v1.GlobalEgressIP, error) - Update(ctx context.Context, globalEgressIP *v1.GlobalEgressIP, opts metav1.UpdateOptions) (*v1.GlobalEgressIP, error) + Create(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIP, opts metav1.CreateOptions) (*submarineriov1.GlobalEgressIP, error) + Update(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIP, opts metav1.UpdateOptions) (*submarineriov1.GlobalEgressIP, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, globalEgressIP *v1.GlobalEgressIP, opts metav1.UpdateOptions) (*v1.GlobalEgressIP, error) + UpdateStatus(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIP, opts metav1.UpdateOptions) (*submarineriov1.GlobalEgressIP, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GlobalEgressIP, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GlobalEgressIPList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.GlobalEgressIP, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.GlobalEgressIPList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GlobalEgressIP, err error) - Apply(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalEgressIP, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.GlobalEgressIP, err error) + Apply(ctx context.Context, globalEgressIP *applyconfigurationsubmarineriov1.GlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.GlobalEgressIP, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, globalEgressIP *submarineriov1.GlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalEgressIP, err error) + ApplyStatus(ctx context.Context, globalEgressIP *applyconfigurationsubmarineriov1.GlobalEgressIPApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.GlobalEgressIP, err error) GlobalEgressIPExpansion } // globalEgressIPs implements GlobalEgressIPInterface type globalEgressIPs struct { - *gentype.ClientWithListAndApply[*v1.GlobalEgressIP, *v1.GlobalEgressIPList, *submarineriov1.GlobalEgressIPApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.GlobalEgressIP, *submarineriov1.GlobalEgressIPList, *applyconfigurationsubmarineriov1.GlobalEgressIPApplyConfiguration] } // newGlobalEgressIPs returns a GlobalEgressIPs func newGlobalEgressIPs(c *SubmarinerV1Client, namespace string) *globalEgressIPs { return &globalEgressIPs{ - gentype.NewClientWithListAndApply[*v1.GlobalEgressIP, *v1.GlobalEgressIPList, *submarineriov1.GlobalEgressIPApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.GlobalEgressIP, *submarineriov1.GlobalEgressIPList, *applyconfigurationsubmarineriov1.GlobalEgressIPApplyConfiguration]( "globalegressips", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.GlobalEgressIP { return &v1.GlobalEgressIP{} }, - func() *v1.GlobalEgressIPList { return &v1.GlobalEgressIPList{} }), + func() *submarineriov1.GlobalEgressIP { return &submarineriov1.GlobalEgressIP{} }, + func() *submarineriov1.GlobalEgressIPList { return &submarineriov1.GlobalEgressIPList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/globalingressip.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/globalingressip.go index ad2d0c671..7b3bbf762 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/globalingressip.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/globalingressip.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,36 +40,37 @@ type GlobalIngressIPsGetter interface { // GlobalIngressIPInterface has methods to work with GlobalIngressIP resources. type GlobalIngressIPInterface interface { - Create(ctx context.Context, globalIngressIP *v1.GlobalIngressIP, opts metav1.CreateOptions) (*v1.GlobalIngressIP, error) - Update(ctx context.Context, globalIngressIP *v1.GlobalIngressIP, opts metav1.UpdateOptions) (*v1.GlobalIngressIP, error) + Create(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIP, opts metav1.CreateOptions) (*submarineriov1.GlobalIngressIP, error) + Update(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIP, opts metav1.UpdateOptions) (*submarineriov1.GlobalIngressIP, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, globalIngressIP *v1.GlobalIngressIP, opts metav1.UpdateOptions) (*v1.GlobalIngressIP, error) + UpdateStatus(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIP, opts metav1.UpdateOptions) (*submarineriov1.GlobalIngressIP, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.GlobalIngressIP, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.GlobalIngressIPList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.GlobalIngressIP, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.GlobalIngressIPList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.GlobalIngressIP, err error) - Apply(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalIngressIP, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.GlobalIngressIP, err error) + Apply(ctx context.Context, globalIngressIP *applyconfigurationsubmarineriov1.GlobalIngressIPApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.GlobalIngressIP, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, globalIngressIP *submarineriov1.GlobalIngressIPApplyConfiguration, opts metav1.ApplyOptions) (result *v1.GlobalIngressIP, err error) + ApplyStatus(ctx context.Context, globalIngressIP *applyconfigurationsubmarineriov1.GlobalIngressIPApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.GlobalIngressIP, err error) GlobalIngressIPExpansion } // globalIngressIPs implements GlobalIngressIPInterface type globalIngressIPs struct { - *gentype.ClientWithListAndApply[*v1.GlobalIngressIP, *v1.GlobalIngressIPList, *submarineriov1.GlobalIngressIPApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.GlobalIngressIP, *submarineriov1.GlobalIngressIPList, *applyconfigurationsubmarineriov1.GlobalIngressIPApplyConfiguration] } // newGlobalIngressIPs returns a GlobalIngressIPs func newGlobalIngressIPs(c *SubmarinerV1Client, namespace string) *globalIngressIPs { return &globalIngressIPs{ - gentype.NewClientWithListAndApply[*v1.GlobalIngressIP, *v1.GlobalIngressIPList, *submarineriov1.GlobalIngressIPApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.GlobalIngressIP, *submarineriov1.GlobalIngressIPList, *applyconfigurationsubmarineriov1.GlobalIngressIPApplyConfiguration]( "globalingressips", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.GlobalIngressIP { return &v1.GlobalIngressIP{} }, - func() *v1.GlobalIngressIPList { return &v1.GlobalIngressIPList{} }), + func() *submarineriov1.GlobalIngressIP { return &submarineriov1.GlobalIngressIP{} }, + func() *submarineriov1.GlobalIngressIPList { return &submarineriov1.GlobalIngressIPList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/nongatewayroute.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/nongatewayroute.go index 5b3dcfc10..0f9c01e76 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/nongatewayroute.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/nongatewayroute.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,32 +40,33 @@ type NonGatewayRoutesGetter interface { // NonGatewayRouteInterface has methods to work with NonGatewayRoute resources. type NonGatewayRouteInterface interface { - Create(ctx context.Context, nonGatewayRoute *v1.NonGatewayRoute, opts metav1.CreateOptions) (*v1.NonGatewayRoute, error) - Update(ctx context.Context, nonGatewayRoute *v1.NonGatewayRoute, opts metav1.UpdateOptions) (*v1.NonGatewayRoute, error) + Create(ctx context.Context, nonGatewayRoute *submarineriov1.NonGatewayRoute, opts metav1.CreateOptions) (*submarineriov1.NonGatewayRoute, error) + Update(ctx context.Context, nonGatewayRoute *submarineriov1.NonGatewayRoute, opts metav1.UpdateOptions) (*submarineriov1.NonGatewayRoute, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.NonGatewayRoute, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.NonGatewayRouteList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.NonGatewayRoute, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.NonGatewayRouteList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.NonGatewayRoute, err error) - Apply(ctx context.Context, nonGatewayRoute *submarineriov1.NonGatewayRouteApplyConfiguration, opts metav1.ApplyOptions) (result *v1.NonGatewayRoute, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.NonGatewayRoute, err error) + Apply(ctx context.Context, nonGatewayRoute *applyconfigurationsubmarineriov1.NonGatewayRouteApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.NonGatewayRoute, err error) NonGatewayRouteExpansion } // nonGatewayRoutes implements NonGatewayRouteInterface type nonGatewayRoutes struct { - *gentype.ClientWithListAndApply[*v1.NonGatewayRoute, *v1.NonGatewayRouteList, *submarineriov1.NonGatewayRouteApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.NonGatewayRoute, *submarineriov1.NonGatewayRouteList, *applyconfigurationsubmarineriov1.NonGatewayRouteApplyConfiguration] } // newNonGatewayRoutes returns a NonGatewayRoutes func newNonGatewayRoutes(c *SubmarinerV1Client, namespace string) *nonGatewayRoutes { return &nonGatewayRoutes{ - gentype.NewClientWithListAndApply[*v1.NonGatewayRoute, *v1.NonGatewayRouteList, *submarineriov1.NonGatewayRouteApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.NonGatewayRoute, *submarineriov1.NonGatewayRouteList, *applyconfigurationsubmarineriov1.NonGatewayRouteApplyConfiguration]( "nongatewayroutes", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.NonGatewayRoute { return &v1.NonGatewayRoute{} }, - func() *v1.NonGatewayRouteList { return &v1.NonGatewayRouteList{} }), + func() *submarineriov1.NonGatewayRoute { return &submarineriov1.NonGatewayRoute{} }, + func() *submarineriov1.NonGatewayRouteList { return &submarineriov1.NonGatewayRouteList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/routeagent.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/routeagent.go index cdc042bf5..3eebf47e5 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/routeagent.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/routeagent.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "context" + context "context" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - submarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + applyconfigurationsubmarineriov1 "github.com/submariner-io/submariner/pkg/client/applyconfiguration/submariner.io/v1" scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" @@ -40,32 +40,33 @@ type RouteAgentsGetter interface { // RouteAgentInterface has methods to work with RouteAgent resources. type RouteAgentInterface interface { - Create(ctx context.Context, routeAgent *v1.RouteAgent, opts metav1.CreateOptions) (*v1.RouteAgent, error) - Update(ctx context.Context, routeAgent *v1.RouteAgent, opts metav1.UpdateOptions) (*v1.RouteAgent, error) + Create(ctx context.Context, routeAgent *submarineriov1.RouteAgent, opts metav1.CreateOptions) (*submarineriov1.RouteAgent, error) + Update(ctx context.Context, routeAgent *submarineriov1.RouteAgent, opts metav1.UpdateOptions) (*submarineriov1.RouteAgent, error) Delete(ctx context.Context, name string, opts metav1.DeleteOptions) error DeleteCollection(ctx context.Context, opts metav1.DeleteOptions, listOpts metav1.ListOptions) error - Get(ctx context.Context, name string, opts metav1.GetOptions) (*v1.RouteAgent, error) - List(ctx context.Context, opts metav1.ListOptions) (*v1.RouteAgentList, error) + Get(ctx context.Context, name string, opts metav1.GetOptions) (*submarineriov1.RouteAgent, error) + List(ctx context.Context, opts metav1.ListOptions) (*submarineriov1.RouteAgentList, error) Watch(ctx context.Context, opts metav1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *v1.RouteAgent, err error) - Apply(ctx context.Context, routeAgent *submarineriov1.RouteAgentApplyConfiguration, opts metav1.ApplyOptions) (result *v1.RouteAgent, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts metav1.PatchOptions, subresources ...string) (result *submarineriov1.RouteAgent, err error) + Apply(ctx context.Context, routeAgent *applyconfigurationsubmarineriov1.RouteAgentApplyConfiguration, opts metav1.ApplyOptions) (result *submarineriov1.RouteAgent, err error) RouteAgentExpansion } // routeAgents implements RouteAgentInterface type routeAgents struct { - *gentype.ClientWithListAndApply[*v1.RouteAgent, *v1.RouteAgentList, *submarineriov1.RouteAgentApplyConfiguration] + *gentype.ClientWithListAndApply[*submarineriov1.RouteAgent, *submarineriov1.RouteAgentList, *applyconfigurationsubmarineriov1.RouteAgentApplyConfiguration] } // newRouteAgents returns a RouteAgents func newRouteAgents(c *SubmarinerV1Client, namespace string) *routeAgents { return &routeAgents{ - gentype.NewClientWithListAndApply[*v1.RouteAgent, *v1.RouteAgentList, *submarineriov1.RouteAgentApplyConfiguration]( + gentype.NewClientWithListAndApply[*submarineriov1.RouteAgent, *submarineriov1.RouteAgentList, *applyconfigurationsubmarineriov1.RouteAgentApplyConfiguration]( "routeagents", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1.RouteAgent { return &v1.RouteAgent{} }, - func() *v1.RouteAgentList { return &v1.RouteAgentList{} }), + func() *submarineriov1.RouteAgent { return &submarineriov1.RouteAgent{} }, + func() *submarineriov1.RouteAgentList { return &submarineriov1.RouteAgentList{} }, + ), } } diff --git a/pkg/client/clientset/versioned/typed/submariner.io/v1/submariner.io_client.go b/pkg/client/clientset/versioned/typed/submariner.io/v1/submariner.io_client.go index 65426ddfe..94e3db6b7 100644 --- a/pkg/client/clientset/versioned/typed/submariner.io/v1/submariner.io_client.go +++ b/pkg/client/clientset/versioned/typed/submariner.io/v1/submariner.io_client.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - "net/http" + http "net/http" - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + scheme "github.com/submariner-io/submariner/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) @@ -127,10 +127,10 @@ func New(c rest.Interface) *SubmarinerV1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1.SchemeGroupVersion + gv := submarineriov1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/pkg/client/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go index 1760aaf63..0b764d4f5 100644 --- a/pkg/client/informers/externalversions/generic.go +++ b/pkg/client/informers/externalversions/generic.go @@ -21,7 +21,7 @@ limitations under the License. package externalversions import ( - "fmt" + fmt "fmt" v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/client/informers/externalversions/submariner.io/v1/cluster.go b/pkg/client/informers/externalversions/submariner.io/v1/cluster.go index 4712de296..50ae027b9 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/cluster.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/cluster.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // Clusters. type ClusterInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.ClusterLister + Lister() submarineriov1.ClusterLister } type clusterInformer struct { @@ -73,7 +73,7 @@ func NewFilteredClusterInformer(client versioned.Interface, namespace string, re return client.SubmarinerV1().Clusters(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.Cluster{}, + &apissubmarineriov1.Cluster{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *clusterInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *clusterInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.Cluster{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.Cluster{}, f.defaultInformer) } -func (f *clusterInformer) Lister() v1.ClusterLister { - return v1.NewClusterLister(f.Informer().GetIndexer()) +func (f *clusterInformer) Lister() submarineriov1.ClusterLister { + return submarineriov1.NewClusterLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/clusterglobalegressip.go b/pkg/client/informers/externalversions/submariner.io/v1/clusterglobalegressip.go index 809bd782d..b996db9df 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/clusterglobalegressip.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/clusterglobalegressip.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // ClusterGlobalEgressIPs. type ClusterGlobalEgressIPInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.ClusterGlobalEgressIPLister + Lister() submarineriov1.ClusterGlobalEgressIPLister } type clusterGlobalEgressIPInformer struct { @@ -73,7 +73,7 @@ func NewFilteredClusterGlobalEgressIPInformer(client versioned.Interface, namesp return client.SubmarinerV1().ClusterGlobalEgressIPs(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.ClusterGlobalEgressIP{}, + &apissubmarineriov1.ClusterGlobalEgressIP{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *clusterGlobalEgressIPInformer) defaultInformer(client versioned.Interfa } func (f *clusterGlobalEgressIPInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.ClusterGlobalEgressIP{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.ClusterGlobalEgressIP{}, f.defaultInformer) } -func (f *clusterGlobalEgressIPInformer) Lister() v1.ClusterGlobalEgressIPLister { - return v1.NewClusterGlobalEgressIPLister(f.Informer().GetIndexer()) +func (f *clusterGlobalEgressIPInformer) Lister() submarineriov1.ClusterGlobalEgressIPLister { + return submarineriov1.NewClusterGlobalEgressIPLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/endpoint.go b/pkg/client/informers/externalversions/submariner.io/v1/endpoint.go index 5dd77c1ce..01870bcc7 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/endpoint.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/endpoint.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // Endpoints. type EndpointInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.EndpointLister + Lister() submarineriov1.EndpointLister } type endpointInformer struct { @@ -73,7 +73,7 @@ func NewFilteredEndpointInformer(client versioned.Interface, namespace string, r return client.SubmarinerV1().Endpoints(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.Endpoint{}, + &apissubmarineriov1.Endpoint{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *endpointInformer) defaultInformer(client versioned.Interface, resyncPer } func (f *endpointInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.Endpoint{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.Endpoint{}, f.defaultInformer) } -func (f *endpointInformer) Lister() v1.EndpointLister { - return v1.NewEndpointLister(f.Informer().GetIndexer()) +func (f *endpointInformer) Lister() submarineriov1.EndpointLister { + return submarineriov1.NewEndpointLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/gateway.go b/pkg/client/informers/externalversions/submariner.io/v1/gateway.go index 9d7e3f340..0db4cad7e 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/gateway.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/gateway.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // Gateways. type GatewayInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GatewayLister + Lister() submarineriov1.GatewayLister } type gatewayInformer struct { @@ -73,7 +73,7 @@ func NewFilteredGatewayInformer(client versioned.Interface, namespace string, re return client.SubmarinerV1().Gateways(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.Gateway{}, + &apissubmarineriov1.Gateway{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *gatewayInformer) defaultInformer(client versioned.Interface, resyncPeri } func (f *gatewayInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.Gateway{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.Gateway{}, f.defaultInformer) } -func (f *gatewayInformer) Lister() v1.GatewayLister { - return v1.NewGatewayLister(f.Informer().GetIndexer()) +func (f *gatewayInformer) Lister() submarineriov1.GatewayLister { + return submarineriov1.NewGatewayLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/gatewayroute.go b/pkg/client/informers/externalversions/submariner.io/v1/gatewayroute.go index b875939ef..749327ed9 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/gatewayroute.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/gatewayroute.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // GatewayRoutes. type GatewayRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GatewayRouteLister + Lister() submarineriov1.GatewayRouteLister } type gatewayRouteInformer struct { @@ -73,7 +73,7 @@ func NewFilteredGatewayRouteInformer(client versioned.Interface, namespace strin return client.SubmarinerV1().GatewayRoutes(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.GatewayRoute{}, + &apissubmarineriov1.GatewayRoute{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *gatewayRouteInformer) defaultInformer(client versioned.Interface, resyn } func (f *gatewayRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.GatewayRoute{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.GatewayRoute{}, f.defaultInformer) } -func (f *gatewayRouteInformer) Lister() v1.GatewayRouteLister { - return v1.NewGatewayRouteLister(f.Informer().GetIndexer()) +func (f *gatewayRouteInformer) Lister() submarineriov1.GatewayRouteLister { + return submarineriov1.NewGatewayRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/globalegressip.go b/pkg/client/informers/externalversions/submariner.io/v1/globalegressip.go index 9e401b6dc..ab041ce27 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/globalegressip.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/globalegressip.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // GlobalEgressIPs. type GlobalEgressIPInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GlobalEgressIPLister + Lister() submarineriov1.GlobalEgressIPLister } type globalEgressIPInformer struct { @@ -73,7 +73,7 @@ func NewFilteredGlobalEgressIPInformer(client versioned.Interface, namespace str return client.SubmarinerV1().GlobalEgressIPs(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.GlobalEgressIP{}, + &apissubmarineriov1.GlobalEgressIP{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *globalEgressIPInformer) defaultInformer(client versioned.Interface, res } func (f *globalEgressIPInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.GlobalEgressIP{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.GlobalEgressIP{}, f.defaultInformer) } -func (f *globalEgressIPInformer) Lister() v1.GlobalEgressIPLister { - return v1.NewGlobalEgressIPLister(f.Informer().GetIndexer()) +func (f *globalEgressIPInformer) Lister() submarineriov1.GlobalEgressIPLister { + return submarineriov1.NewGlobalEgressIPLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/globalingressip.go b/pkg/client/informers/externalversions/submariner.io/v1/globalingressip.go index d261c8068..510390832 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/globalingressip.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/globalingressip.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // GlobalIngressIPs. type GlobalIngressIPInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.GlobalIngressIPLister + Lister() submarineriov1.GlobalIngressIPLister } type globalIngressIPInformer struct { @@ -73,7 +73,7 @@ func NewFilteredGlobalIngressIPInformer(client versioned.Interface, namespace st return client.SubmarinerV1().GlobalIngressIPs(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.GlobalIngressIP{}, + &apissubmarineriov1.GlobalIngressIP{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *globalIngressIPInformer) defaultInformer(client versioned.Interface, re } func (f *globalIngressIPInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.GlobalIngressIP{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.GlobalIngressIP{}, f.defaultInformer) } -func (f *globalIngressIPInformer) Lister() v1.GlobalIngressIPLister { - return v1.NewGlobalIngressIPLister(f.Informer().GetIndexer()) +func (f *globalIngressIPInformer) Lister() submarineriov1.GlobalIngressIPLister { + return submarineriov1.NewGlobalIngressIPLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/nongatewayroute.go b/pkg/client/informers/externalversions/submariner.io/v1/nongatewayroute.go index d0a7dabff..fcbde7e10 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/nongatewayroute.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/nongatewayroute.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // NonGatewayRoutes. type NonGatewayRouteInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.NonGatewayRouteLister + Lister() submarineriov1.NonGatewayRouteLister } type nonGatewayRouteInformer struct { @@ -73,7 +73,7 @@ func NewFilteredNonGatewayRouteInformer(client versioned.Interface, namespace st return client.SubmarinerV1().NonGatewayRoutes(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.NonGatewayRoute{}, + &apissubmarineriov1.NonGatewayRoute{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *nonGatewayRouteInformer) defaultInformer(client versioned.Interface, re } func (f *nonGatewayRouteInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.NonGatewayRoute{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.NonGatewayRoute{}, f.defaultInformer) } -func (f *nonGatewayRouteInformer) Lister() v1.NonGatewayRouteLister { - return v1.NewNonGatewayRouteLister(f.Informer().GetIndexer()) +func (f *nonGatewayRouteInformer) Lister() submarineriov1.NonGatewayRouteLister { + return submarineriov1.NewNonGatewayRouteLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/informers/externalversions/submariner.io/v1/routeagent.go b/pkg/client/informers/externalversions/submariner.io/v1/routeagent.go index 5831b0bab..f3a8fc63a 100644 --- a/pkg/client/informers/externalversions/submariner.io/v1/routeagent.go +++ b/pkg/client/informers/externalversions/submariner.io/v1/routeagent.go @@ -21,13 +21,13 @@ limitations under the License. package v1 import ( - "context" + context "context" time "time" - submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + apissubmarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" versioned "github.com/submariner-io/submariner/pkg/client/clientset/versioned" internalinterfaces "github.com/submariner-io/submariner/pkg/client/informers/externalversions/internalinterfaces" - v1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" + submarineriov1 "github.com/submariner-io/submariner/pkg/client/listers/submariner.io/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" @@ -38,7 +38,7 @@ import ( // RouteAgents. type RouteAgentInformer interface { Informer() cache.SharedIndexInformer - Lister() v1.RouteAgentLister + Lister() submarineriov1.RouteAgentLister } type routeAgentInformer struct { @@ -73,7 +73,7 @@ func NewFilteredRouteAgentInformer(client versioned.Interface, namespace string, return client.SubmarinerV1().RouteAgents(namespace).Watch(context.TODO(), options) }, }, - &submarineriov1.RouteAgent{}, + &apissubmarineriov1.RouteAgent{}, resyncPeriod, indexers, ) @@ -84,9 +84,9 @@ func (f *routeAgentInformer) defaultInformer(client versioned.Interface, resyncP } func (f *routeAgentInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&submarineriov1.RouteAgent{}, f.defaultInformer) + return f.factory.InformerFor(&apissubmarineriov1.RouteAgent{}, f.defaultInformer) } -func (f *routeAgentInformer) Lister() v1.RouteAgentLister { - return v1.NewRouteAgentLister(f.Informer().GetIndexer()) +func (f *routeAgentInformer) Lister() submarineriov1.RouteAgentLister { + return submarineriov1.NewRouteAgentLister(f.Informer().GetIndexer()) } diff --git a/pkg/client/listers/submariner.io/v1/cluster.go b/pkg/client/listers/submariner.io/v1/cluster.go index 391a283c3..1e54aa41d 100644 --- a/pkg/client/listers/submariner.io/v1/cluster.go +++ b/pkg/client/listers/submariner.io/v1/cluster.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // ClusterLister helps list Clusters. @@ -32,7 +32,7 @@ import ( type ClusterLister interface { // List lists all Clusters in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Cluster, err error) + List(selector labels.Selector) (ret []*submarineriov1.Cluster, err error) // Clusters returns an object that can list and get Clusters. Clusters(namespace string) ClusterNamespaceLister ClusterListerExpansion @@ -40,17 +40,17 @@ type ClusterLister interface { // clusterLister implements the ClusterLister interface. type clusterLister struct { - listers.ResourceIndexer[*v1.Cluster] + listers.ResourceIndexer[*submarineriov1.Cluster] } // NewClusterLister returns a new ClusterLister. func NewClusterLister(indexer cache.Indexer) ClusterLister { - return &clusterLister{listers.New[*v1.Cluster](indexer, v1.Resource("cluster"))} + return &clusterLister{listers.New[*submarineriov1.Cluster](indexer, submarineriov1.Resource("cluster"))} } // Clusters returns an object that can list and get Clusters. func (s *clusterLister) Clusters(namespace string) ClusterNamespaceLister { - return clusterNamespaceLister{listers.NewNamespaced[*v1.Cluster](s.ResourceIndexer, namespace)} + return clusterNamespaceLister{listers.NewNamespaced[*submarineriov1.Cluster](s.ResourceIndexer, namespace)} } // ClusterNamespaceLister helps list and get Clusters. @@ -58,15 +58,15 @@ func (s *clusterLister) Clusters(namespace string) ClusterNamespaceLister { type ClusterNamespaceLister interface { // List lists all Clusters in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Cluster, err error) + List(selector labels.Selector) (ret []*submarineriov1.Cluster, err error) // Get retrieves the Cluster from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.Cluster, error) + Get(name string) (*submarineriov1.Cluster, error) ClusterNamespaceListerExpansion } // clusterNamespaceLister implements the ClusterNamespaceLister // interface. type clusterNamespaceLister struct { - listers.ResourceIndexer[*v1.Cluster] + listers.ResourceIndexer[*submarineriov1.Cluster] } diff --git a/pkg/client/listers/submariner.io/v1/clusterglobalegressip.go b/pkg/client/listers/submariner.io/v1/clusterglobalegressip.go index 1f92782c8..ab2d5116b 100644 --- a/pkg/client/listers/submariner.io/v1/clusterglobalegressip.go +++ b/pkg/client/listers/submariner.io/v1/clusterglobalegressip.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // ClusterGlobalEgressIPLister helps list ClusterGlobalEgressIPs. @@ -32,7 +32,7 @@ import ( type ClusterGlobalEgressIPLister interface { // List lists all ClusterGlobalEgressIPs in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.ClusterGlobalEgressIP, err error) + List(selector labels.Selector) (ret []*submarineriov1.ClusterGlobalEgressIP, err error) // ClusterGlobalEgressIPs returns an object that can list and get ClusterGlobalEgressIPs. ClusterGlobalEgressIPs(namespace string) ClusterGlobalEgressIPNamespaceLister ClusterGlobalEgressIPListerExpansion @@ -40,17 +40,17 @@ type ClusterGlobalEgressIPLister interface { // clusterGlobalEgressIPLister implements the ClusterGlobalEgressIPLister interface. type clusterGlobalEgressIPLister struct { - listers.ResourceIndexer[*v1.ClusterGlobalEgressIP] + listers.ResourceIndexer[*submarineriov1.ClusterGlobalEgressIP] } // NewClusterGlobalEgressIPLister returns a new ClusterGlobalEgressIPLister. func NewClusterGlobalEgressIPLister(indexer cache.Indexer) ClusterGlobalEgressIPLister { - return &clusterGlobalEgressIPLister{listers.New[*v1.ClusterGlobalEgressIP](indexer, v1.Resource("clusterglobalegressip"))} + return &clusterGlobalEgressIPLister{listers.New[*submarineriov1.ClusterGlobalEgressIP](indexer, submarineriov1.Resource("clusterglobalegressip"))} } // ClusterGlobalEgressIPs returns an object that can list and get ClusterGlobalEgressIPs. func (s *clusterGlobalEgressIPLister) ClusterGlobalEgressIPs(namespace string) ClusterGlobalEgressIPNamespaceLister { - return clusterGlobalEgressIPNamespaceLister{listers.NewNamespaced[*v1.ClusterGlobalEgressIP](s.ResourceIndexer, namespace)} + return clusterGlobalEgressIPNamespaceLister{listers.NewNamespaced[*submarineriov1.ClusterGlobalEgressIP](s.ResourceIndexer, namespace)} } // ClusterGlobalEgressIPNamespaceLister helps list and get ClusterGlobalEgressIPs. @@ -58,15 +58,15 @@ func (s *clusterGlobalEgressIPLister) ClusterGlobalEgressIPs(namespace string) C type ClusterGlobalEgressIPNamespaceLister interface { // List lists all ClusterGlobalEgressIPs in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.ClusterGlobalEgressIP, err error) + List(selector labels.Selector) (ret []*submarineriov1.ClusterGlobalEgressIP, err error) // Get retrieves the ClusterGlobalEgressIP from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.ClusterGlobalEgressIP, error) + Get(name string) (*submarineriov1.ClusterGlobalEgressIP, error) ClusterGlobalEgressIPNamespaceListerExpansion } // clusterGlobalEgressIPNamespaceLister implements the ClusterGlobalEgressIPNamespaceLister // interface. type clusterGlobalEgressIPNamespaceLister struct { - listers.ResourceIndexer[*v1.ClusterGlobalEgressIP] + listers.ResourceIndexer[*submarineriov1.ClusterGlobalEgressIP] } diff --git a/pkg/client/listers/submariner.io/v1/endpoint.go b/pkg/client/listers/submariner.io/v1/endpoint.go index bb799ddbf..159fbd0ad 100644 --- a/pkg/client/listers/submariner.io/v1/endpoint.go +++ b/pkg/client/listers/submariner.io/v1/endpoint.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // EndpointLister helps list Endpoints. @@ -32,7 +32,7 @@ import ( type EndpointLister interface { // List lists all Endpoints in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Endpoint, err error) + List(selector labels.Selector) (ret []*submarineriov1.Endpoint, err error) // Endpoints returns an object that can list and get Endpoints. Endpoints(namespace string) EndpointNamespaceLister EndpointListerExpansion @@ -40,17 +40,17 @@ type EndpointLister interface { // endpointLister implements the EndpointLister interface. type endpointLister struct { - listers.ResourceIndexer[*v1.Endpoint] + listers.ResourceIndexer[*submarineriov1.Endpoint] } // NewEndpointLister returns a new EndpointLister. func NewEndpointLister(indexer cache.Indexer) EndpointLister { - return &endpointLister{listers.New[*v1.Endpoint](indexer, v1.Resource("endpoint"))} + return &endpointLister{listers.New[*submarineriov1.Endpoint](indexer, submarineriov1.Resource("endpoint"))} } // Endpoints returns an object that can list and get Endpoints. func (s *endpointLister) Endpoints(namespace string) EndpointNamespaceLister { - return endpointNamespaceLister{listers.NewNamespaced[*v1.Endpoint](s.ResourceIndexer, namespace)} + return endpointNamespaceLister{listers.NewNamespaced[*submarineriov1.Endpoint](s.ResourceIndexer, namespace)} } // EndpointNamespaceLister helps list and get Endpoints. @@ -58,15 +58,15 @@ func (s *endpointLister) Endpoints(namespace string) EndpointNamespaceLister { type EndpointNamespaceLister interface { // List lists all Endpoints in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Endpoint, err error) + List(selector labels.Selector) (ret []*submarineriov1.Endpoint, err error) // Get retrieves the Endpoint from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.Endpoint, error) + Get(name string) (*submarineriov1.Endpoint, error) EndpointNamespaceListerExpansion } // endpointNamespaceLister implements the EndpointNamespaceLister // interface. type endpointNamespaceLister struct { - listers.ResourceIndexer[*v1.Endpoint] + listers.ResourceIndexer[*submarineriov1.Endpoint] } diff --git a/pkg/client/listers/submariner.io/v1/gateway.go b/pkg/client/listers/submariner.io/v1/gateway.go index 462f25f0d..497e3dd4c 100644 --- a/pkg/client/listers/submariner.io/v1/gateway.go +++ b/pkg/client/listers/submariner.io/v1/gateway.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // GatewayLister helps list Gateways. @@ -32,7 +32,7 @@ import ( type GatewayLister interface { // List lists all Gateways in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Gateway, err error) + List(selector labels.Selector) (ret []*submarineriov1.Gateway, err error) // Gateways returns an object that can list and get Gateways. Gateways(namespace string) GatewayNamespaceLister GatewayListerExpansion @@ -40,17 +40,17 @@ type GatewayLister interface { // gatewayLister implements the GatewayLister interface. type gatewayLister struct { - listers.ResourceIndexer[*v1.Gateway] + listers.ResourceIndexer[*submarineriov1.Gateway] } // NewGatewayLister returns a new GatewayLister. func NewGatewayLister(indexer cache.Indexer) GatewayLister { - return &gatewayLister{listers.New[*v1.Gateway](indexer, v1.Resource("gateway"))} + return &gatewayLister{listers.New[*submarineriov1.Gateway](indexer, submarineriov1.Resource("gateway"))} } // Gateways returns an object that can list and get Gateways. func (s *gatewayLister) Gateways(namespace string) GatewayNamespaceLister { - return gatewayNamespaceLister{listers.NewNamespaced[*v1.Gateway](s.ResourceIndexer, namespace)} + return gatewayNamespaceLister{listers.NewNamespaced[*submarineriov1.Gateway](s.ResourceIndexer, namespace)} } // GatewayNamespaceLister helps list and get Gateways. @@ -58,15 +58,15 @@ func (s *gatewayLister) Gateways(namespace string) GatewayNamespaceLister { type GatewayNamespaceLister interface { // List lists all Gateways in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.Gateway, err error) + List(selector labels.Selector) (ret []*submarineriov1.Gateway, err error) // Get retrieves the Gateway from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.Gateway, error) + Get(name string) (*submarineriov1.Gateway, error) GatewayNamespaceListerExpansion } // gatewayNamespaceLister implements the GatewayNamespaceLister // interface. type gatewayNamespaceLister struct { - listers.ResourceIndexer[*v1.Gateway] + listers.ResourceIndexer[*submarineriov1.Gateway] } diff --git a/pkg/client/listers/submariner.io/v1/gatewayroute.go b/pkg/client/listers/submariner.io/v1/gatewayroute.go index d7d83346e..ae2735bf1 100644 --- a/pkg/client/listers/submariner.io/v1/gatewayroute.go +++ b/pkg/client/listers/submariner.io/v1/gatewayroute.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // GatewayRouteLister helps list GatewayRoutes. @@ -32,7 +32,7 @@ import ( type GatewayRouteLister interface { // List lists all GatewayRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GatewayRoute, err error) + List(selector labels.Selector) (ret []*submarineriov1.GatewayRoute, err error) // GatewayRoutes returns an object that can list and get GatewayRoutes. GatewayRoutes(namespace string) GatewayRouteNamespaceLister GatewayRouteListerExpansion @@ -40,17 +40,17 @@ type GatewayRouteLister interface { // gatewayRouteLister implements the GatewayRouteLister interface. type gatewayRouteLister struct { - listers.ResourceIndexer[*v1.GatewayRoute] + listers.ResourceIndexer[*submarineriov1.GatewayRoute] } // NewGatewayRouteLister returns a new GatewayRouteLister. func NewGatewayRouteLister(indexer cache.Indexer) GatewayRouteLister { - return &gatewayRouteLister{listers.New[*v1.GatewayRoute](indexer, v1.Resource("gatewayroute"))} + return &gatewayRouteLister{listers.New[*submarineriov1.GatewayRoute](indexer, submarineriov1.Resource("gatewayroute"))} } // GatewayRoutes returns an object that can list and get GatewayRoutes. func (s *gatewayRouteLister) GatewayRoutes(namespace string) GatewayRouteNamespaceLister { - return gatewayRouteNamespaceLister{listers.NewNamespaced[*v1.GatewayRoute](s.ResourceIndexer, namespace)} + return gatewayRouteNamespaceLister{listers.NewNamespaced[*submarineriov1.GatewayRoute](s.ResourceIndexer, namespace)} } // GatewayRouteNamespaceLister helps list and get GatewayRoutes. @@ -58,15 +58,15 @@ func (s *gatewayRouteLister) GatewayRoutes(namespace string) GatewayRouteNamespa type GatewayRouteNamespaceLister interface { // List lists all GatewayRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GatewayRoute, err error) + List(selector labels.Selector) (ret []*submarineriov1.GatewayRoute, err error) // Get retrieves the GatewayRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GatewayRoute, error) + Get(name string) (*submarineriov1.GatewayRoute, error) GatewayRouteNamespaceListerExpansion } // gatewayRouteNamespaceLister implements the GatewayRouteNamespaceLister // interface. type gatewayRouteNamespaceLister struct { - listers.ResourceIndexer[*v1.GatewayRoute] + listers.ResourceIndexer[*submarineriov1.GatewayRoute] } diff --git a/pkg/client/listers/submariner.io/v1/globalegressip.go b/pkg/client/listers/submariner.io/v1/globalegressip.go index 4157d9e1b..5fbb8818c 100644 --- a/pkg/client/listers/submariner.io/v1/globalegressip.go +++ b/pkg/client/listers/submariner.io/v1/globalegressip.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // GlobalEgressIPLister helps list GlobalEgressIPs. @@ -32,7 +32,7 @@ import ( type GlobalEgressIPLister interface { // List lists all GlobalEgressIPs in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GlobalEgressIP, err error) + List(selector labels.Selector) (ret []*submarineriov1.GlobalEgressIP, err error) // GlobalEgressIPs returns an object that can list and get GlobalEgressIPs. GlobalEgressIPs(namespace string) GlobalEgressIPNamespaceLister GlobalEgressIPListerExpansion @@ -40,17 +40,17 @@ type GlobalEgressIPLister interface { // globalEgressIPLister implements the GlobalEgressIPLister interface. type globalEgressIPLister struct { - listers.ResourceIndexer[*v1.GlobalEgressIP] + listers.ResourceIndexer[*submarineriov1.GlobalEgressIP] } // NewGlobalEgressIPLister returns a new GlobalEgressIPLister. func NewGlobalEgressIPLister(indexer cache.Indexer) GlobalEgressIPLister { - return &globalEgressIPLister{listers.New[*v1.GlobalEgressIP](indexer, v1.Resource("globalegressip"))} + return &globalEgressIPLister{listers.New[*submarineriov1.GlobalEgressIP](indexer, submarineriov1.Resource("globalegressip"))} } // GlobalEgressIPs returns an object that can list and get GlobalEgressIPs. func (s *globalEgressIPLister) GlobalEgressIPs(namespace string) GlobalEgressIPNamespaceLister { - return globalEgressIPNamespaceLister{listers.NewNamespaced[*v1.GlobalEgressIP](s.ResourceIndexer, namespace)} + return globalEgressIPNamespaceLister{listers.NewNamespaced[*submarineriov1.GlobalEgressIP](s.ResourceIndexer, namespace)} } // GlobalEgressIPNamespaceLister helps list and get GlobalEgressIPs. @@ -58,15 +58,15 @@ func (s *globalEgressIPLister) GlobalEgressIPs(namespace string) GlobalEgressIPN type GlobalEgressIPNamespaceLister interface { // List lists all GlobalEgressIPs in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GlobalEgressIP, err error) + List(selector labels.Selector) (ret []*submarineriov1.GlobalEgressIP, err error) // Get retrieves the GlobalEgressIP from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GlobalEgressIP, error) + Get(name string) (*submarineriov1.GlobalEgressIP, error) GlobalEgressIPNamespaceListerExpansion } // globalEgressIPNamespaceLister implements the GlobalEgressIPNamespaceLister // interface. type globalEgressIPNamespaceLister struct { - listers.ResourceIndexer[*v1.GlobalEgressIP] + listers.ResourceIndexer[*submarineriov1.GlobalEgressIP] } diff --git a/pkg/client/listers/submariner.io/v1/globalingressip.go b/pkg/client/listers/submariner.io/v1/globalingressip.go index 0a169043f..1a80c5c57 100644 --- a/pkg/client/listers/submariner.io/v1/globalingressip.go +++ b/pkg/client/listers/submariner.io/v1/globalingressip.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // GlobalIngressIPLister helps list GlobalIngressIPs. @@ -32,7 +32,7 @@ import ( type GlobalIngressIPLister interface { // List lists all GlobalIngressIPs in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GlobalIngressIP, err error) + List(selector labels.Selector) (ret []*submarineriov1.GlobalIngressIP, err error) // GlobalIngressIPs returns an object that can list and get GlobalIngressIPs. GlobalIngressIPs(namespace string) GlobalIngressIPNamespaceLister GlobalIngressIPListerExpansion @@ -40,17 +40,17 @@ type GlobalIngressIPLister interface { // globalIngressIPLister implements the GlobalIngressIPLister interface. type globalIngressIPLister struct { - listers.ResourceIndexer[*v1.GlobalIngressIP] + listers.ResourceIndexer[*submarineriov1.GlobalIngressIP] } // NewGlobalIngressIPLister returns a new GlobalIngressIPLister. func NewGlobalIngressIPLister(indexer cache.Indexer) GlobalIngressIPLister { - return &globalIngressIPLister{listers.New[*v1.GlobalIngressIP](indexer, v1.Resource("globalingressip"))} + return &globalIngressIPLister{listers.New[*submarineriov1.GlobalIngressIP](indexer, submarineriov1.Resource("globalingressip"))} } // GlobalIngressIPs returns an object that can list and get GlobalIngressIPs. func (s *globalIngressIPLister) GlobalIngressIPs(namespace string) GlobalIngressIPNamespaceLister { - return globalIngressIPNamespaceLister{listers.NewNamespaced[*v1.GlobalIngressIP](s.ResourceIndexer, namespace)} + return globalIngressIPNamespaceLister{listers.NewNamespaced[*submarineriov1.GlobalIngressIP](s.ResourceIndexer, namespace)} } // GlobalIngressIPNamespaceLister helps list and get GlobalIngressIPs. @@ -58,15 +58,15 @@ func (s *globalIngressIPLister) GlobalIngressIPs(namespace string) GlobalIngress type GlobalIngressIPNamespaceLister interface { // List lists all GlobalIngressIPs in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.GlobalIngressIP, err error) + List(selector labels.Selector) (ret []*submarineriov1.GlobalIngressIP, err error) // Get retrieves the GlobalIngressIP from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.GlobalIngressIP, error) + Get(name string) (*submarineriov1.GlobalIngressIP, error) GlobalIngressIPNamespaceListerExpansion } // globalIngressIPNamespaceLister implements the GlobalIngressIPNamespaceLister // interface. type globalIngressIPNamespaceLister struct { - listers.ResourceIndexer[*v1.GlobalIngressIP] + listers.ResourceIndexer[*submarineriov1.GlobalIngressIP] } diff --git a/pkg/client/listers/submariner.io/v1/nongatewayroute.go b/pkg/client/listers/submariner.io/v1/nongatewayroute.go index 473d4b1e0..8386ad9d7 100644 --- a/pkg/client/listers/submariner.io/v1/nongatewayroute.go +++ b/pkg/client/listers/submariner.io/v1/nongatewayroute.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // NonGatewayRouteLister helps list NonGatewayRoutes. @@ -32,7 +32,7 @@ import ( type NonGatewayRouteLister interface { // List lists all NonGatewayRoutes in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.NonGatewayRoute, err error) + List(selector labels.Selector) (ret []*submarineriov1.NonGatewayRoute, err error) // NonGatewayRoutes returns an object that can list and get NonGatewayRoutes. NonGatewayRoutes(namespace string) NonGatewayRouteNamespaceLister NonGatewayRouteListerExpansion @@ -40,17 +40,17 @@ type NonGatewayRouteLister interface { // nonGatewayRouteLister implements the NonGatewayRouteLister interface. type nonGatewayRouteLister struct { - listers.ResourceIndexer[*v1.NonGatewayRoute] + listers.ResourceIndexer[*submarineriov1.NonGatewayRoute] } // NewNonGatewayRouteLister returns a new NonGatewayRouteLister. func NewNonGatewayRouteLister(indexer cache.Indexer) NonGatewayRouteLister { - return &nonGatewayRouteLister{listers.New[*v1.NonGatewayRoute](indexer, v1.Resource("nongatewayroute"))} + return &nonGatewayRouteLister{listers.New[*submarineriov1.NonGatewayRoute](indexer, submarineriov1.Resource("nongatewayroute"))} } // NonGatewayRoutes returns an object that can list and get NonGatewayRoutes. func (s *nonGatewayRouteLister) NonGatewayRoutes(namespace string) NonGatewayRouteNamespaceLister { - return nonGatewayRouteNamespaceLister{listers.NewNamespaced[*v1.NonGatewayRoute](s.ResourceIndexer, namespace)} + return nonGatewayRouteNamespaceLister{listers.NewNamespaced[*submarineriov1.NonGatewayRoute](s.ResourceIndexer, namespace)} } // NonGatewayRouteNamespaceLister helps list and get NonGatewayRoutes. @@ -58,15 +58,15 @@ func (s *nonGatewayRouteLister) NonGatewayRoutes(namespace string) NonGatewayRou type NonGatewayRouteNamespaceLister interface { // List lists all NonGatewayRoutes in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.NonGatewayRoute, err error) + List(selector labels.Selector) (ret []*submarineriov1.NonGatewayRoute, err error) // Get retrieves the NonGatewayRoute from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.NonGatewayRoute, error) + Get(name string) (*submarineriov1.NonGatewayRoute, error) NonGatewayRouteNamespaceListerExpansion } // nonGatewayRouteNamespaceLister implements the NonGatewayRouteNamespaceLister // interface. type nonGatewayRouteNamespaceLister struct { - listers.ResourceIndexer[*v1.NonGatewayRoute] + listers.ResourceIndexer[*submarineriov1.NonGatewayRoute] } diff --git a/pkg/client/listers/submariner.io/v1/routeagent.go b/pkg/client/listers/submariner.io/v1/routeagent.go index cd71e63fd..f750d7417 100644 --- a/pkg/client/listers/submariner.io/v1/routeagent.go +++ b/pkg/client/listers/submariner.io/v1/routeagent.go @@ -21,10 +21,10 @@ limitations under the License. package v1 import ( - v1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" - "k8s.io/apimachinery/pkg/labels" - "k8s.io/client-go/listers" - "k8s.io/client-go/tools/cache" + submarineriov1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1" + labels "k8s.io/apimachinery/pkg/labels" + listers "k8s.io/client-go/listers" + cache "k8s.io/client-go/tools/cache" ) // RouteAgentLister helps list RouteAgents. @@ -32,7 +32,7 @@ import ( type RouteAgentLister interface { // List lists all RouteAgents in the indexer. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.RouteAgent, err error) + List(selector labels.Selector) (ret []*submarineriov1.RouteAgent, err error) // RouteAgents returns an object that can list and get RouteAgents. RouteAgents(namespace string) RouteAgentNamespaceLister RouteAgentListerExpansion @@ -40,17 +40,17 @@ type RouteAgentLister interface { // routeAgentLister implements the RouteAgentLister interface. type routeAgentLister struct { - listers.ResourceIndexer[*v1.RouteAgent] + listers.ResourceIndexer[*submarineriov1.RouteAgent] } // NewRouteAgentLister returns a new RouteAgentLister. func NewRouteAgentLister(indexer cache.Indexer) RouteAgentLister { - return &routeAgentLister{listers.New[*v1.RouteAgent](indexer, v1.Resource("routeagent"))} + return &routeAgentLister{listers.New[*submarineriov1.RouteAgent](indexer, submarineriov1.Resource("routeagent"))} } // RouteAgents returns an object that can list and get RouteAgents. func (s *routeAgentLister) RouteAgents(namespace string) RouteAgentNamespaceLister { - return routeAgentNamespaceLister{listers.NewNamespaced[*v1.RouteAgent](s.ResourceIndexer, namespace)} + return routeAgentNamespaceLister{listers.NewNamespaced[*submarineriov1.RouteAgent](s.ResourceIndexer, namespace)} } // RouteAgentNamespaceLister helps list and get RouteAgents. @@ -58,15 +58,15 @@ func (s *routeAgentLister) RouteAgents(namespace string) RouteAgentNamespaceList type RouteAgentNamespaceLister interface { // List lists all RouteAgents in the indexer for a given namespace. // Objects returned here must be treated as read-only. - List(selector labels.Selector) (ret []*v1.RouteAgent, err error) + List(selector labels.Selector) (ret []*submarineriov1.RouteAgent, err error) // Get retrieves the RouteAgent from the indexer for a given namespace and name. // Objects returned here must be treated as read-only. - Get(name string) (*v1.RouteAgent, error) + Get(name string) (*submarineriov1.RouteAgent, error) RouteAgentNamespaceListerExpansion } // routeAgentNamespaceLister implements the RouteAgentNamespaceLister // interface. type routeAgentNamespaceLister struct { - listers.ResourceIndexer[*v1.RouteAgent] + listers.ResourceIndexer[*submarineriov1.RouteAgent] } diff --git a/tools/go.mod b/tools/go.mod index 9e7acdbf8..c0ddad004 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,19 +1,19 @@ module github.com/submariner-io/submariner/tools -go 1.22.0 +go 1.23.0 require ( github.com/uw-labs/lichen v0.1.7 - k8s.io/code-generator v0.31.3 + k8s.io/code-generator v0.32.0 ) require ( github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect github.com/go-logr/logr v1.4.2 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect @@ -34,16 +34,17 @@ require ( github.com/sergi/go-diff v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/urfave/cli/v2 v2.4.0 // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.16.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/protobuf v1.34.2 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect + golang.org/x/tools v0.26.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect + k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/tools/go.sum b/tools/go.sum index cd34d02c2..0f7e90054 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -10,13 +10,16 @@ github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxER github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= @@ -30,6 +33,8 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/licenseclassifier v0.0.0-20201113175434-78a70215ca36 h1:YGB3wNLUTvq+lbIwdNRsaMJvoX4mCKkwzHlmlT1V+ow= github.com/google/licenseclassifier v0.0.0-20201113175434-78a70215ca36/go.mod h1:qsqn2hxC+vURpyBRygGUuinTO42MFRLcsmQ/P8v94+M= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= @@ -38,8 +43,9 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -59,14 +65,16 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/muesli/termenv v0.11.0 h1:fwNUbu2mfWlgicwG7qYzs06aOI8Z/zKPAv8J4uKbT+o= github.com/muesli/termenv v0.11.0/go.mod h1:Bd5NYQ7pd+SrtBSrSNoBBmXlcY8+Xj4BMJgh8qcZrvs= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= @@ -79,27 +87,28 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/urfave/cli/v2 v2.4.0 h1:m2pxjjDFgDxSPtO8WSdbndj17Wu2y8vOT86wE/tjr+I= github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg= github.com/uw-labs/lichen v0.1.7 h1:SDNE3kThhhtP70XfLN/C2bqaT9Epefg1i10lhWYIG4g= github.com/uw-labs/lichen v0.1.7/go.mod h1:bvEgoBeVZGhzstRxPEpEwM4TGT6AJZ6GA29a4FuLxYw= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -109,17 +118,19 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/code-generator v0.31.3 h1:Pj0fYOBms+ZrsulLi4DMsCEx1jG8fWKRLy44onHsLBI= -k8s.io/code-generator v0.31.3/go.mod h1:/umCIlT84g1+Yu5ZXtP1KGSRTnGiIzzX5AzUAxsNlts= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= +k8s.io/code-generator v0.32.0 h1:s0lNN8VSWny8LBz5t5iy7MCdgwdOhdg7vAGVxvS+VWU= +k8s.io/code-generator v0.32.0/go.mod h1:b7Q7KMZkvsYFy72A79QYjiv4aTz3GvW0f1T3UfhFq4s= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 h1:si3PfKm8dDYxgfbeA6orqrtLkvvIeH8UqffFJDl0bz4= +k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= -k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= +k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= +sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=