diff --git a/Dockerfile b/Dockerfile index af315855bb0..48f809d5667 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,10 +28,8 @@ ENV GOPROXY=$goproxy # Copy the Go Modules manifests COPY go.mod go.mod COPY go.sum go.sum -COPY pkg/apis/go.mod pkg/apis/go.mod -COPY pkg/apis/go.sum pkg/apis/go.sum -COPY pkg/client/go.mod pkg/client/go.mod -COPY pkg/client/go.sum pkg/client/go.sum +COPY sdk/go.mod sdk/go.mod +COPY sdk/go.sum sdk/go.sum USER 0 # Install kubectl. diff --git a/cmd/apigen/go.mod b/cmd/apigen/go.mod index 112f236b31f..ee2a34b0c93 100644 --- a/cmd/apigen/go.mod +++ b/cmd/apigen/go.mod @@ -6,7 +6,6 @@ require ( github.com/bombsimon/logrusr/v3 v3.1.0 github.com/go-logr/logr v1.2.3 github.com/google/go-cmp v0.5.5 - github.com/kcp-dev/kcp/pkg/apis v0.10.1-0.20230123155139-7b3126cbf96c github.com/sirupsen/logrus v1.8.1 github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace k8s.io/api v0.24.3 @@ -16,6 +15,7 @@ require ( ) require ( + cloud.google.com/go v0.81.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -48,13 +48,17 @@ require ( github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect github.com/kcp-dev/logicalcluster/v3 v3.0.2 // indirect github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.8 // indirect + github.com/mattn/go-isatty v0.0.12 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/mitchellh/mapstructure v1.4.1 // 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 + github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/ginkgo v1.16.4 // indirect github.com/onsi/gomega v1.19.0 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -82,18 +86,22 @@ require ( go.uber.org/multierr v1.7.0 // indirect go.uber.org/zap v1.19.0 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect - golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.4.0 // indirect + golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/tools v0.1.12 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect google.golang.org/grpc v1.46.0-dev // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/square/go-jose.v2 v2.2.2 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiserver v0.24.3 // indirect diff --git a/cmd/apigen/go.sum b/cmd/apigen/go.sum index 1ee55668b56..ec56e322026 100644 --- a/cmd/apigen/go.sum +++ b/cmd/apigen/go.sum @@ -104,6 +104,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= @@ -141,6 +142,7 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= @@ -247,6 +249,8 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -324,12 +328,13 @@ github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ 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/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/kcp-dev/kcp/pkg/apis v0.10.1-0.20230123155139-7b3126cbf96c h1:jHRTggPTdp63+W5dfMUGX33WPfpW53Zfaz2NS4Z3lL8= -github.com/kcp-dev/kcp/pkg/apis v0.10.1-0.20230123155139-7b3126cbf96c/go.mod h1:8cUAmfMJcksauz53UtsLYG8Phhx62rvuCnd/5t/Zihk= +github.com/kcp-dev/kcp/sdk/apis v0.10.1-0.20230123155139-7b3126cbf96c h1:jHRTggPTdp63+W5dfMUGX33WPfpW53Zfaz2NS4Z3lL8= +github.com/kcp-dev/kcp/sdk/apis v0.10.1-0.20230123155139-7b3126cbf96c/go.mod h1:8cUAmfMJcksauz53UtsLYG8Phhx62rvuCnd/5t/Zihk= github.com/kcp-dev/logicalcluster/v3 v3.0.2 h1:U7wnYPgZLJt/X2G1/SYnynW6WnRmohxIvKaMwNL9BHM= github.com/kcp-dev/logicalcluster/v3 v3.0.2/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= @@ -353,7 +358,11 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= @@ -618,6 +627,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -684,6 +695,8 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8= +golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= 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= @@ -722,6 +735,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -775,6 +789,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= @@ -844,6 +859,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -951,6 +967,8 @@ google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9K google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.46.0-dev h1:Lxftsnhovr5jHAxuFFCb3PMCJr8wSZ4CsJfvy+b2Lb8= google.golang.org/grpc v1.46.0-dev/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= +google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -980,7 +998,10 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/square/go-jose.v2 v2.2.2 h1:orlkJ3myw8CN1nVQHBFfloD+L3egixIa4FvUP6RosSA= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w= +gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= diff --git a/cmd/apigen/main.go b/cmd/apigen/main.go index bf2d5070012..208ac4e7124 100644 --- a/cmd/apigen/main.go +++ b/cmd/apigen/main.go @@ -44,9 +44,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/yaml" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" ) const ( diff --git a/cmd/cluster-controller/main.go b/cmd/cluster-controller/main.go index 4f8082958e4..9904e8c744f 100644 --- a/cmd/cluster-controller/main.go +++ b/cmd/cluster-controller/main.go @@ -29,10 +29,10 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/client-go/tools/clientcmd" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apiresource" apiresourceoptions "github.com/kcp-dev/kcp/pkg/reconciler/apis/apiresource/options" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const resyncPeriod = 10 * time.Hour diff --git a/cmd/sharded-test-server/cache.go b/cmd/sharded-test-server/cache.go index a12ee496a33..1c291ac5398 100644 --- a/cmd/sharded-test-server/cache.go +++ b/cmd/sharded-test-server/cache.go @@ -35,7 +35,7 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/cmd/test-server/helpers" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/cmd/sharded-test-server/frontproxy.go b/cmd/sharded-test-server/frontproxy.go index 4c3f6f6334a..03689db5334 100644 --- a/cmd/sharded-test-server/frontproxy.go +++ b/cmd/sharded-test-server/frontproxy.go @@ -40,7 +40,7 @@ import ( "github.com/kcp-dev/kcp/cmd/sharded-test-server/third_party/library-go/crypto" "github.com/kcp-dev/kcp/cmd/test-server/helpers" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/cmd/sharded-test-server/main.go b/cmd/sharded-test-server/main.go index 295ae3c12c0..d2b42cea7d2 100644 --- a/cmd/sharded-test-server/main.go +++ b/cmd/sharded-test-server/main.go @@ -38,9 +38,9 @@ import ( "github.com/kcp-dev/kcp/cmd/sharded-test-server/third_party/library-go/crypto" shard "github.com/kcp-dev/kcp/cmd/test-server/kcp" - "github.com/kcp-dev/kcp/pkg/apis/core" "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) func main() { diff --git a/cmd/sharded-test-server/virtual.go b/cmd/sharded-test-server/virtual.go index 9b0284627c4..9e13b593922 100644 --- a/cmd/sharded-test-server/virtual.go +++ b/cmd/sharded-test-server/virtual.go @@ -41,7 +41,7 @@ import ( "github.com/kcp-dev/kcp/cmd/sharded-test-server/third_party/library-go/crypto" "github.com/kcp-dev/kcp/cmd/test-server/helpers" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/cmd/syncer/options/options.go b/cmd/syncer/options/options.go index e15b041bc00..97e45824b73 100644 --- a/cmd/syncer/options/options.go +++ b/cmd/syncer/options/options.go @@ -27,8 +27,8 @@ import ( "k8s.io/component-base/config" "k8s.io/component-base/logs" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type Options struct { diff --git a/cmd/test-server/kcp/shard.go b/cmd/test-server/kcp/shard.go index 4772473a2cf..866b17c1ede 100644 --- a/cmd/test-server/kcp/shard.go +++ b/cmd/test-server/kcp/shard.go @@ -37,7 +37,7 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/cmd/test-server/helpers" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/cmd/virtual-workspaces/command/cmd.go b/cmd/virtual-workspaces/command/cmd.go index 12372e84218..278d66524cc 100644 --- a/cmd/virtual-workspaces/command/cmd.go +++ b/cmd/virtual-workspaces/command/cmd.go @@ -40,12 +40,12 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" "github.com/kcp-dev/kcp/pkg/server/bootstrap" virtualrootapiserver "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" corevwoptions "github.com/kcp-dev/kcp/pkg/virtual/options" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) func NewCommand(ctx context.Context, errout io.Writer) *cobra.Command { diff --git a/config/crds/bootstrap_test.go b/config/crds/bootstrap_test.go index 787a033b6a6..8346ceec28a 100644 --- a/config/crds/bootstrap_test.go +++ b/config/crds/bootstrap_test.go @@ -24,7 +24,7 @@ import ( apiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy" + "github.com/kcp-dev/kcp/sdk/apis/tenancy" ) func TestCreateFromFS(t *testing.T) { diff --git a/config/helpers/bootstrap.go b/config/helpers/bootstrap.go index 61992a48ae2..07763922f62 100644 --- a/config/helpers/bootstrap.go +++ b/config/helpers/bootstrap.go @@ -43,11 +43,11 @@ import ( "k8s.io/client-go/restmapper" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - tenancyhelper "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1/helper" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + tenancyhelper "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1/helper" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) // TransformFileFunc transforms a resource file before being applied to the cluster. diff --git a/config/root-phase0/bootstrap.go b/config/root-phase0/bootstrap.go index 0a5add55bc9..b737735db39 100644 --- a/config/root-phase0/bootstrap.go +++ b/config/root-phase0/bootstrap.go @@ -30,8 +30,8 @@ import ( "sigs.k8s.io/yaml" confighelpers "github.com/kcp-dev/kcp/config/helpers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) //go:embed *.yaml diff --git a/config/rootcompute/bootstrap.go b/config/rootcompute/bootstrap.go index 1bd20ddce23..0da42a35920 100644 --- a/config/rootcompute/bootstrap.go +++ b/config/rootcompute/bootstrap.go @@ -28,7 +28,7 @@ import ( confighelpers "github.com/kcp-dev/kcp/config/helpers" kube124 "github.com/kcp-dev/kcp/config/rootcompute/kube-1.24" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/core" ) //go:embed *.yaml diff --git a/config/shard/bootstrap.go b/config/shard/bootstrap.go index b8bca789946..4edd1d5d80a 100644 --- a/config/shard/bootstrap.go +++ b/config/shard/bootstrap.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/dynamic" confighelpers "github.com/kcp-dev/kcp/config/helpers" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) //go:embed *.yaml diff --git a/config/system-crds/bootstrap.go b/config/system-crds/bootstrap.go index cc03a9272e8..892df91e17d 100644 --- a/config/system-crds/bootstrap.go +++ b/config/system-crds/bootstrap.go @@ -32,8 +32,8 @@ import ( configcrds "github.com/kcp-dev/kcp/config/crds" confighelpers "github.com/kcp-dev/kcp/config/helpers" - "github.com/kcp-dev/kcp/pkg/apis/apis" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/apis" + "github.com/kcp-dev/kcp/sdk/apis/core" ) //go:embed *.yaml diff --git a/config/universal/bootstrap.go b/config/universal/bootstrap.go index 783c9ffc830..94b1900cbdd 100644 --- a/config/universal/bootstrap.go +++ b/config/universal/bootstrap.go @@ -25,7 +25,7 @@ import ( "k8s.io/client-go/dynamic" confighelpers "github.com/kcp-dev/kcp/config/helpers" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) //go:embed *.yaml diff --git a/go.mod b/go.mod index 0d8694f2916..47a3634367f 100644 --- a/go.mod +++ b/go.mod @@ -19,8 +19,7 @@ require ( github.com/google/uuid v1.3.0 github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 github.com/kcp-dev/client-go v0.0.0-20230126185145-aeff170a288b - github.com/kcp-dev/kcp/pkg/apis v0.11.0 - github.com/kcp-dev/kcp/pkg/client v0.0.0-00010101000000-000000000000 + github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000 github.com/kcp-dev/logicalcluster/v3 v3.0.2 github.com/martinlindhe/base36 v1.1.1 github.com/miekg/dns v1.1.50 @@ -35,7 +34,7 @@ require ( go.etcd.io/etcd/server/v3 v3.5.0 go.uber.org/multierr v1.7.0 golang.org/x/net v0.0.0-20220722155237-a158d28d115b - google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd + google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.24.3 @@ -55,7 +54,7 @@ require ( ) require ( - cloud.google.com/go v0.81.0 // indirect + cloud.google.com/go/compute/metadata v0.2.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.28 // indirect @@ -119,7 +118,7 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/nxadm/tail v1.4.8 // indirect + github.com/onsi/ginkgo v1.16.5 // indirect github.com/onsi/gomega v1.19.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/runc v1.1.1 // indirect @@ -170,6 +169,7 @@ require ( google.golang.org/appengine v1.6.7 // indirect google.golang.org/grpc v1.46.2 // indirect google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -190,8 +190,7 @@ require ( replace ( github.com/google/cel-go => github.com/google/cel-go v0.12.6 - github.com/kcp-dev/kcp/pkg/apis => ./pkg/apis - github.com/kcp-dev/kcp/pkg/client => ./pkg/client + github.com/kcp-dev/kcp/sdk => ./sdk k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20230210192259-aaa28aa88b2d k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230210192259-aaa28aa88b2d k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230210192259-aaa28aa88b2d diff --git a/go.sum b/go.sum index ae1ae78f914..fc9f6d9c831 100644 --- a/go.sum +++ b/go.sum @@ -17,7 +17,6 @@ cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKP cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0 h1:at8Tk2zUz63cLPR0JPWm5vp77pEZmzxEQBEfRKn1VV8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= @@ -25,6 +24,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute/metadata v0.2.0 h1:nBbNSZyDpkNlo3DepaaLKVuO7ClyifSAmNloSCZrHnQ= +cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= @@ -229,6 +230,7 @@ github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -359,6 +361,7 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= @@ -433,6 +436,7 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +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/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -495,15 +499,20 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.1.3 h1:e/3Cwtogj0HA+25nMP1jCMDIf8RtRYbGwGGuBIFztkc= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -759,6 +768,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVD golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -786,6 +796,7 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -839,6 +850,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -852,12 +864,14 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191002063906-3421d5a6bb1c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -883,6 +897,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -978,6 +993,7 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= @@ -1069,8 +1085,8 @@ google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= -google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 h1:a221mAAEAzq4Lz6ZWRkcS8ptb2mxoxYSt4N68aRyQHM= +google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1092,7 +1108,6 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1115,9 +1130,11 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/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= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= diff --git a/hack/update-codegen-clients.sh b/hack/update-codegen-clients.sh index aca4e374b30..d494d2d45a7 100755 --- a/hack/update-codegen-clients.sh +++ b/hack/update-codegen-clients.sh @@ -28,17 +28,17 @@ popd CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m k8s.io/code-generator)} bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client" \ - github.com/kcp-dev/kcp/pkg/client github.com/kcp-dev/kcp/pkg/apis \ + github.com/kcp-dev/kcp/sdk/client github.com/kcp-dev/kcp/sdk/apis \ "core:v1alpha1 workload:v1alpha1 apiresource:v1alpha1 tenancy:v1alpha1 apis:v1alpha1 scheduling:v1alpha1 topology:v1alpha1" \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt \ --output-base "${SCRIPT_ROOT}" \ --trim-path-prefix github.com/kcp-dev/kcp -pushd ./pkg/apis +pushd ./sdk/apis ${CODE_GENERATOR} \ - "client:outputPackagePath=github.com/kcp-dev/kcp/pkg/client,apiPackagePath=github.com/kcp-dev/kcp/pkg/apis,singleClusterClientPackagePath=github.com/kcp-dev/kcp/pkg/client/clientset/versioned,headerFile=${BOILERPLATE_HEADER}" \ - "lister:apiPackagePath=github.com/kcp-dev/kcp/pkg/apis,headerFile=${BOILERPLATE_HEADER}" \ - "informer:outputPackagePath=github.com/kcp-dev/kcp/pkg/client,singleClusterClientPackagePath=github.com/kcp-dev/kcp/pkg/client/clientset/versioned,apiPackagePath=github.com/kcp-dev/kcp/pkg/apis,headerFile=${BOILERPLATE_HEADER}" \ + "client:outputPackagePath=github.com/kcp-dev/kcp/sdk/client,apiPackagePath=github.com/kcp-dev/kcp/sdk/apis,singleClusterClientPackagePath=github.com/kcp-dev/kcp/sdk/client/clientset/versioned,headerFile=${BOILERPLATE_HEADER}" \ + "lister:apiPackagePath=github.com/kcp-dev/kcp/sdk/apis,headerFile=${BOILERPLATE_HEADER}" \ + "informer:outputPackagePath=github.com/kcp-dev/kcp/sdk/client,singleClusterClientPackagePath=github.com/kcp-dev/kcp/sdk/client/clientset/versioned,apiPackagePath=github.com/kcp-dev/kcp/sdk/apis,headerFile=${BOILERPLATE_HEADER}" \ "paths=./..." \ "output:dir=./../client" popd @@ -68,14 +68,14 @@ popd go install "${CODEGEN_PKG}"/cmd/openapi-gen -"$GOPATH"/bin/openapi-gen --input-dirs github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1 \ ---input-dirs github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1 \ +"$GOPATH"/bin/openapi-gen --input-dirs github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1 \ +--input-dirs github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1 \ --input-dirs k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/version \ --output-package github.com/kcp-dev/kcp/pkg/openapi -O zz_generated.openapi \ --go-header-file ./hack/../hack/boilerplate/boilerplate.generatego.txt \ diff --git a/hack/update-codegen-crds.sh b/hack/update-codegen-crds.sh index a0a36ce6a66..c0c51ea7d2b 100755 --- a/hack/update-codegen-crds.sh +++ b/hack/update-codegen-crds.sh @@ -28,7 +28,7 @@ REPO_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd) # Update generated CRD YAML ( - cd "${REPO_ROOT}/pkg/apis" + cd "${REPO_ROOT}/sdk/apis" "../../${CONTROLLER_GEN}" \ crd \ rbac:roleName=manager-role \ diff --git a/pkg/admission/apibinding/apibinding_admission.go b/pkg/admission/apibinding/apibinding_admission.go index bb738833e2f..c1d3609df11 100644 --- a/pkg/admission/apibinding/apibinding_admission.go +++ b/pkg/admission/apibinding/apibinding_admission.go @@ -37,12 +37,12 @@ import ( "k8s.io/klog/v2" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1/permissionclaims" - "github.com/kcp-dev/kcp/pkg/apis/core" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1/permissionclaims" + "github.com/kcp-dev/kcp/sdk/apis/core" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/admission/apibinding/apibinding_admission_test.go b/pkg/admission/apibinding/apibinding_admission_test.go index 4e3286b48dd..abdbec6c373 100644 --- a/pkg/admission/apibinding/apibinding_admission_test.go +++ b/pkg/admission/apibinding/apibinding_admission_test.go @@ -37,9 +37,9 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" "github.com/kcp-dev/kcp/pkg/authorization/delegated" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" ) func createAttr(apiBinding *apisv1alpha1.APIBinding) admission.Attributes { diff --git a/pkg/admission/apibinding/binding_permissions.go b/pkg/admission/apibinding/binding_permissions.go index eb72d92e846..b62fd3dd5f8 100644 --- a/pkg/admission/apibinding/binding_permissions.go +++ b/pkg/admission/apibinding/binding_permissions.go @@ -23,7 +23,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func CheckAPIExportAccess(ctx context.Context, user user.Info, apiExportName string, authz authorizer.Authorizer) error { diff --git a/pkg/admission/apibinding/validation.go b/pkg/admission/apibinding/validation.go index 91ca8af7d26..66bb9c00f6a 100644 --- a/pkg/admission/apibinding/validation.go +++ b/pkg/admission/apibinding/validation.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // ValidateAPIBinding validates an APIBinding. diff --git a/pkg/admission/apibindingfinalizer/apibindingfinalizer_admission.go b/pkg/admission/apibindingfinalizer/apibindingfinalizer_admission.go index 59ff662e003..042cf6d0963 100644 --- a/pkg/admission/apibindingfinalizer/apibindingfinalizer_admission.go +++ b/pkg/admission/apibindingfinalizer/apibindingfinalizer_admission.go @@ -22,8 +22,8 @@ import ( "k8s.io/apiserver/pkg/admission" "github.com/kcp-dev/kcp/pkg/admission/finalizer" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibindingdeletion" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const ( diff --git a/pkg/admission/apiconversion/apiconversion_admission.go b/pkg/admission/apiconversion/apiconversion_admission.go index bffd0529f17..8dce2c4e76b 100644 --- a/pkg/admission/apiconversion/apiconversion_admission.go +++ b/pkg/admission/apiconversion/apiconversion_admission.go @@ -33,10 +33,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/initializers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/conversion" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibinding" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/admission/apiexport/admission.go b/pkg/admission/apiexport/admission.go index 265f46493ce..8fce045d95e 100644 --- a/pkg/admission/apiexport/admission.go +++ b/pkg/admission/apiexport/admission.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apiserver/pkg/admission" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" builtinapiexport "github.com/kcp-dev/kcp/pkg/virtual/apiexport/schemas/builtin" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // PluginName is the name used to identify this admission webhook. diff --git a/pkg/admission/apiexport/admission_test.go b/pkg/admission/apiexport/admission_test.go index a4cd4e5a234..b87025e7b1c 100644 --- a/pkg/admission/apiexport/admission_test.go +++ b/pkg/admission/apiexport/admission_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func createAttr(name string, obj runtime.Object, kind, resource string) admission.Attributes { diff --git a/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission.go b/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission.go index ea3aac22fe6..2cc381fb159 100644 --- a/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission.go +++ b/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission.go @@ -38,10 +38,10 @@ import ( apibindingadmission "github.com/kcp-dev/kcp/pkg/admission/apibinding" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission_test.go b/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission_test.go index b36ae53c3c2..5f403031622 100644 --- a/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission_test.go +++ b/pkg/admission/apiexportendpointslice/apiexportendpointslice_admission_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" "github.com/kcp-dev/kcp/pkg/authorization/delegated" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" ) func createAttr(slice *apisv1alpha1.APIExportEndpointSlice) admission.Attributes { diff --git a/pkg/admission/apiexportendpointslice/validation.go b/pkg/admission/apiexportendpointslice/validation.go index 6808b8813a3..8dbf699af6a 100644 --- a/pkg/admission/apiexportendpointslice/validation.go +++ b/pkg/admission/apiexportendpointslice/validation.go @@ -19,7 +19,7 @@ package apiexportendpointslice import ( "k8s.io/apimachinery/pkg/util/validation/field" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // ValidateAPIExportEndpointSlice validates an APIExport. diff --git a/pkg/admission/apiresourceschema/admission.go b/pkg/admission/apiresourceschema/admission.go index 5242494c660..0f8c3a0bbdd 100644 --- a/pkg/admission/apiresourceschema/admission.go +++ b/pkg/admission/apiresourceschema/admission.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/admission" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const ( diff --git a/pkg/admission/apiresourceschema/admission_test.go b/pkg/admission/apiresourceschema/admission_test.go index 83bbb735c35..bf78c8f19a8 100644 --- a/pkg/admission/apiresourceschema/admission_test.go +++ b/pkg/admission/apiresourceschema/admission_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/yaml" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func createAttr(s *apisv1alpha1.APIResourceSchema) admission.Attributes { diff --git a/pkg/admission/apiresourceschema/validation.go b/pkg/admission/apiresourceschema/validation.go index 4b5d6b0815a..a46dd208d67 100644 --- a/pkg/admission/apiresourceschema/validation.go +++ b/pkg/admission/apiresourceschema/validation.go @@ -33,7 +33,7 @@ import ( utilvalidation "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/validation/field" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) var ( diff --git a/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission.go b/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission.go index 3e244c0ab8b..51727dfd845 100644 --- a/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission.go +++ b/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission.go @@ -28,10 +28,10 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/endpoints/request" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibinding" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) const ( diff --git a/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission_test.go b/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission_test.go index 6960843e496..8a4567340a9 100644 --- a/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission_test.go +++ b/pkg/admission/crdnooverlappinggvr/crdnooverlappinggvr_admission_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) func TestValidate(t *testing.T) { diff --git a/pkg/admission/finalizer/finalizer_admission_test.go b/pkg/admission/finalizer/finalizer_admission_test.go index b561b578d55..0da430a3602 100644 --- a/pkg/admission/finalizer/finalizer_admission_test.go +++ b/pkg/admission/finalizer/finalizer_admission_test.go @@ -31,8 +31,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibindingdeletion" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func createAttr(apiBinding *apisv1alpha1.APIBinding) admission.Attributes { diff --git a/pkg/admission/helpers/unstructured.go b/pkg/admission/helpers/unstructured.go index eecb3e0286c..7138dcf0d9a 100644 --- a/pkg/admission/helpers/unstructured.go +++ b/pkg/admission/helpers/unstructured.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - kcpscheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + kcpscheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) func ToUnstructuredOrDie(obj runtime.Object) *unstructured.Unstructured { diff --git a/pkg/admission/initializers/initializer.go b/pkg/admission/initializers/initializer.go index 32e006b00b1..82acba70cfc 100644 --- a/pkg/admission/initializers/initializer.go +++ b/pkg/admission/initializers/initializer.go @@ -24,8 +24,8 @@ import ( "k8s.io/apiserver/pkg/admission/initializer" quota "k8s.io/apiserver/pkg/quota/v1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) // NewKcpInformersInitializer returns an admission plugin initializer that injects diff --git a/pkg/admission/initializers/interfaces.go b/pkg/admission/initializers/interfaces.go index 8174177232d..7985c686536 100644 --- a/pkg/admission/initializers/interfaces.go +++ b/pkg/admission/initializers/interfaces.go @@ -20,8 +20,8 @@ import ( kcpkubernetesinformers "github.com/kcp-dev/client-go/informers" kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) // WantsKcpInformers interface should be implemented by admission plugins diff --git a/pkg/admission/kubequota/kubequota_admission.go b/pkg/admission/kubequota/kubequota_admission.go index 1b59e58423a..82da3053b57 100644 --- a/pkg/admission/kubequota/kubequota_admission.go +++ b/pkg/admission/kubequota/kubequota_admission.go @@ -40,10 +40,10 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/pkg/admission/initializers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) // PluginName is the name of this admission plugin. diff --git a/pkg/admission/kubequota/kubequota_clusterworkspace_monitor.go b/pkg/admission/kubequota/kubequota_clusterworkspace_monitor.go index aa1ec3e95a9..c035d6c6d58 100644 --- a/pkg/admission/kubequota/kubequota_clusterworkspace_monitor.go +++ b/pkg/admission/kubequota/kubequota_clusterworkspace_monitor.go @@ -29,8 +29,8 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const logicalClusterDeletionMonitorControllerName = "kcp-kubequota-logical-cluster-deletion-monitor" diff --git a/pkg/admission/logicalcluster/admission.go b/pkg/admission/logicalcluster/admission.go index ea166f335cc..ffe0fb0297a 100644 --- a/pkg/admission/logicalcluster/admission.go +++ b/pkg/admission/logicalcluster/admission.go @@ -30,10 +30,10 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) // Protects deletion of LogicalCluster if spec.directlyDeletable is false. diff --git a/pkg/admission/logicalcluster/admission_test.go b/pkg/admission/logicalcluster/admission_test.go index 07db490f321..46bf3559ba8 100644 --- a/pkg/admission/logicalcluster/admission_test.go +++ b/pkg/admission/logicalcluster/admission_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) func updateAttr(obj, old *corev1alpha1.LogicalCluster) admission.Attributes { diff --git a/pkg/admission/logicalclusterfinalizer/logicalclusterfinalizer_admission.go b/pkg/admission/logicalclusterfinalizer/logicalclusterfinalizer_admission.go index a86037b93a7..09388f4973a 100644 --- a/pkg/admission/logicalclusterfinalizer/logicalclusterfinalizer_admission.go +++ b/pkg/admission/logicalclusterfinalizer/logicalclusterfinalizer_admission.go @@ -22,8 +22,8 @@ import ( "k8s.io/apiserver/pkg/admission" "github.com/kcp-dev/kcp/pkg/admission/finalizer" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/core/logicalclusterdeletion/deletion" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) const ( diff --git a/pkg/admission/namespacelifecycle/admission.go b/pkg/admission/namespacelifecycle/admission.go index c78fea562b0..7ed3f7cb5f9 100644 --- a/pkg/admission/namespacelifecycle/admission.go +++ b/pkg/admission/namespacelifecycle/admission.go @@ -37,8 +37,8 @@ import ( kubernetesclient "k8s.io/client-go/kubernetes" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/admission/namespacelifecycle/admission_test.go b/pkg/admission/namespacelifecycle/admission_test.go index a4a04d14869..70d61db2dfa 100644 --- a/pkg/admission/namespacelifecycle/admission_test.go +++ b/pkg/admission/namespacelifecycle/admission_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/endpoints/request" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func TestAdmit(t *testing.T) { diff --git a/pkg/admission/pathannotation/pathannotation_admission.go b/pkg/admission/pathannotation/pathannotation_admission.go index 405dd61c4a4..5a0de891522 100644 --- a/pkg/admission/pathannotation/pathannotation_admission.go +++ b/pkg/admission/pathannotation/pathannotation_admission.go @@ -30,13 +30,13 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/admission/pathannotation/pathannotation_admission_test.go b/pkg/admission/pathannotation/pathannotation_admission_test.go index 99b47ce09eb..e4c2877d47d 100644 --- a/pkg/admission/pathannotation/pathannotation_admission_test.go +++ b/pkg/admission/pathannotation/pathannotation_admission_test.go @@ -30,11 +30,11 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/endpoints/request" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) func TestPathAnnotationAdmit(t *testing.T) { diff --git a/pkg/admission/permissionclaims/mutating_permission_claims.go b/pkg/admission/permissionclaims/mutating_permission_claims.go index 914d4a99720..02e2fb1fd68 100644 --- a/pkg/admission/permissionclaims/mutating_permission_claims.go +++ b/pkg/admission/permissionclaims/mutating_permission_claims.go @@ -29,9 +29,9 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/permissionclaim" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/admission/reservedcrdannotations/admission.go b/pkg/admission/reservedcrdannotations/admission.go index b6054cff01a..04119bc0443 100644 --- a/pkg/admission/reservedcrdannotations/admission.go +++ b/pkg/admission/reservedcrdannotations/admission.go @@ -29,8 +29,8 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/endpoints/request" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibinding" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const ( diff --git a/pkg/admission/reservedcrdannotations/admission_test.go b/pkg/admission/reservedcrdannotations/admission_test.go index 0a7b9cd9d17..6f7a8845746 100644 --- a/pkg/admission/reservedcrdannotations/admission_test.go +++ b/pkg/admission/reservedcrdannotations/admission_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func createAttr(obj *apiextensions.CustomResourceDefinition) admission.Attributes { diff --git a/pkg/admission/reservedcrdgroups/admission_test.go b/pkg/admission/reservedcrdgroups/admission_test.go index be23f806ab3..5b9dc8f8228 100644 --- a/pkg/admission/reservedcrdgroups/admission_test.go +++ b/pkg/admission/reservedcrdgroups/admission_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func createAttr(obj *apiextensions.CustomResourceDefinition) admission.Attributes { diff --git a/pkg/admission/reservedmetadata/admission.go b/pkg/admission/reservedmetadata/admission.go index 1477bd2ecf2..c45a64133df 100644 --- a/pkg/admission/reservedmetadata/admission.go +++ b/pkg/admission/reservedmetadata/admission.go @@ -28,12 +28,12 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/utils/strings/slices" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" "github.com/kcp-dev/kcp/pkg/syncer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/admission/reservednames/admission.go b/pkg/admission/reservednames/admission.go index ff71c9d2bd5..fc7c919a315 100644 --- a/pkg/admission/reservednames/admission.go +++ b/pkg/admission/reservednames/admission.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apiserver/pkg/admission" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // PluginName is the name used to identify this admission webhook. diff --git a/pkg/admission/reservednames/admission_test.go b/pkg/admission/reservednames/admission_test.go index 50d1a970ee1..d84a974a1d6 100644 --- a/pkg/admission/reservednames/admission_test.go +++ b/pkg/admission/reservednames/admission_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/authentication/user" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) func createAttr(name string, obj runtime.Object, kind, resource string) admission.Attributes { diff --git a/pkg/admission/shard/admission.go b/pkg/admission/shard/admission.go index 5b2250f2c49..e16923b9c19 100644 --- a/pkg/admission/shard/admission.go +++ b/pkg/admission/shard/admission.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apiserver/pkg/admission" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) // Default the external and virtual URLs with the base URL if they are not set. diff --git a/pkg/admission/shard/admission_test.go b/pkg/admission/shard/admission_test.go index 0ab75e6c6cc..605c56fdc38 100644 --- a/pkg/admission/shard/admission_test.go +++ b/pkg/admission/shard/admission_test.go @@ -30,8 +30,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) func createAttr(shard *corev1alpha1.Shard) admission.Attributes { diff --git a/pkg/admission/webhook/generic_webhook.go b/pkg/admission/webhook/generic_webhook.go index da62377c442..b62dcd4fb08 100644 --- a/pkg/admission/webhook/generic_webhook.go +++ b/pkg/admission/webhook/generic_webhook.go @@ -33,9 +33,9 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/pkg/admission/initializers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type ClusterAwareSource interface { diff --git a/pkg/admission/webhook/generic_webhook_test.go b/pkg/admission/webhook/generic_webhook_test.go index 7c3deffdc23..3021f784b3f 100644 --- a/pkg/admission/webhook/generic_webhook_test.go +++ b/pkg/admission/webhook/generic_webhook_test.go @@ -32,8 +32,8 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/endpoints/request" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" ) func attr(gvk schema.GroupVersionKind, name, resource string, op admission.Operation) admission.Attributes { diff --git a/pkg/admission/workspace/admission.go b/pkg/admission/workspace/admission.go index 56c62ceb979..ceb4c829d2f 100644 --- a/pkg/admission/workspace/admission.go +++ b/pkg/admission/workspace/admission.go @@ -35,11 +35,11 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) // Validate and admit Workspace creation and updates. diff --git a/pkg/admission/workspace/admission_test.go b/pkg/admission/workspace/admission_test.go index 9a867e179b4..702111deb96 100644 --- a/pkg/admission/workspace/admission_test.go +++ b/pkg/admission/workspace/admission_test.go @@ -35,10 +35,10 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) func createAttr(ws *tenancyv1alpha1.Workspace) admission.Attributes { diff --git a/pkg/admission/workspacetype/admission.go b/pkg/admission/workspacetype/admission.go index 2323ee1d214..06fcffe1ddd 100644 --- a/pkg/admission/workspacetype/admission.go +++ b/pkg/admission/workspacetype/admission.go @@ -27,8 +27,8 @@ import ( "k8s.io/apiserver/pkg/admission" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - "github.com/kcp-dev/kcp/pkg/apis/core" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // Validate WorkspaceTypes creation and updates for diff --git a/pkg/admission/workspacetypeexists/admission.go b/pkg/admission/workspacetypeexists/admission.go index 96fce64aa93..08fc0733c4e 100644 --- a/pkg/admission/workspacetypeexists/admission.go +++ b/pkg/admission/workspacetypeexists/admission.go @@ -37,13 +37,13 @@ import ( "k8s.io/client-go/tools/cache" kcpinitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/admission/workspacetypeexists/admission_test.go b/pkg/admission/workspacetypeexists/admission_test.go index d61381e6bdd..eed19ebec13 100644 --- a/pkg/admission/workspacetypeexists/admission_test.go +++ b/pkg/admission/workspacetypeexists/admission_test.go @@ -39,12 +39,12 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "github.com/kcp-dev/kcp/pkg/admission/helpers" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) func createAttr(obj *tenancyv1alpha1.Workspace) admission.Attributes { diff --git a/pkg/authorization/bootstrap/policy.go b/pkg/authorization/bootstrap/policy.go index bb7b38e5fe4..15346b33e17 100644 --- a/pkg/authorization/bootstrap/policy.go +++ b/pkg/authorization/bootstrap/policy.go @@ -23,8 +23,8 @@ import ( rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy" - "github.com/kcp-dev/kcp/pkg/apis/core" - "github.com/kcp-dev/kcp/pkg/apis/tenancy" + "github.com/kcp-dev/kcp/sdk/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/tenancy" ) const ( diff --git a/pkg/authorization/maximal_permission_policy_authorizer.go b/pkg/authorization/maximal_permission_policy_authorizer.go index 1efc37baa43..14cdc66d3b6 100644 --- a/pkg/authorization/maximal_permission_policy_authorizer.go +++ b/pkg/authorization/maximal_permission_policy_authorizer.go @@ -32,10 +32,10 @@ import ( "k8s.io/kubernetes/pkg/genericcontrolplane" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" rbacwrapper "github.com/kcp-dev/kcp/pkg/virtual/framework/wrappers/rbac" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/authorization/requiredgroups_authorizer.go b/pkg/authorization/requiredgroups_authorizer.go index 791a4eb91be..1180e5869dc 100644 --- a/pkg/authorization/requiredgroups_authorizer.go +++ b/pkg/authorization/requiredgroups_authorizer.go @@ -29,9 +29,9 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/authorization/requiredgroups_authorizer_test.go b/pkg/authorization/requiredgroups_authorizer_test.go index 27b78c50009..c560c7cd981 100644 --- a/pkg/authorization/requiredgroups_authorizer_test.go +++ b/pkg/authorization/requiredgroups_authorizer_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" "k8s.io/apiserver/pkg/endpoints/request" - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func TestRequiredGroupsAuthorizer(t *testing.T) { diff --git a/pkg/authorization/system_crd_authorizer.go b/pkg/authorization/system_crd_authorizer.go index 2e2f6aa1f4b..769af5d30e1 100644 --- a/pkg/authorization/system_crd_authorizer.go +++ b/pkg/authorization/system_crd_authorizer.go @@ -22,7 +22,7 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" genericapirequest "k8s.io/apiserver/pkg/endpoints/request" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // SystemCRDAuthorizer protects the system CRDs from users who are admins in their workspaces. diff --git a/pkg/authorization/workspace_content_authorizer.go b/pkg/authorization/workspace_content_authorizer.go index fbc21e58b46..15fad3e3fac 100644 --- a/pkg/authorization/workspace_content_authorizer.go +++ b/pkg/authorization/workspace_content_authorizer.go @@ -34,10 +34,10 @@ import ( "k8s.io/kubernetes/pkg/genericcontrolplane" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" rbacwrapper "github.com/kcp-dev/kcp/pkg/virtual/framework/wrappers/rbac" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/authorization/workspace_content_authorizer_test.go b/pkg/authorization/workspace_content_authorizer_test.go index d81616ae060..4d5b31b366f 100644 --- a/pkg/authorization/workspace_content_authorizer_test.go +++ b/pkg/authorization/workspace_content_authorizer_test.go @@ -36,8 +36,8 @@ import ( "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/genericcontrolplane" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) func newUser(name string, groups ...string) *user.DefaultInfo { diff --git a/pkg/cliplugins/bind/plugin/bind.go b/pkg/cliplugins/bind/plugin/bind.go index 23f51d5c8a0..2b5f4ed6179 100644 --- a/pkg/cliplugins/bind/plugin/bind.go +++ b/pkg/cliplugins/bind/plugin/bind.go @@ -31,10 +31,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/rest" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/cliplugins/base" pluginhelpers "github.com/kcp-dev/kcp/pkg/cliplugins/helpers" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) // BindOptions contains the options for creating an APIBinding. diff --git a/pkg/cliplugins/bind/plugin/bind_compute.go b/pkg/cliplugins/bind/plugin/bind_compute.go index f7d1a7048a8..02275cf6a66 100644 --- a/pkg/cliplugins/bind/plugin/bind_compute.go +++ b/pkg/cliplugins/bind/plugin/bind_compute.go @@ -36,13 +36,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/genericclioptions" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" "github.com/kcp-dev/kcp/pkg/cliplugins/base" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) type BindComputeOptions struct { diff --git a/pkg/cliplugins/claims/plugin/claims.go b/pkg/cliplugins/claims/plugin/claims.go index 24c92d53865..b23471f4066 100644 --- a/pkg/cliplugins/claims/plugin/claims.go +++ b/pkg/cliplugins/claims/plugin/claims.go @@ -32,10 +32,10 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - apiv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/cliplugins/base" pluginhelpers "github.com/kcp-dev/kcp/pkg/cliplugins/helpers" + apiv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) // GetAPIBindingOptions contains the options for fetching claims diff --git a/pkg/cliplugins/crd/plugin/snapshot.go b/pkg/cliplugins/crd/plugin/snapshot.go index 4dc9ab82785..e10ea70d718 100644 --- a/pkg/cliplugins/crd/plugin/snapshot.go +++ b/pkg/cliplugins/crd/plugin/snapshot.go @@ -33,8 +33,8 @@ import ( kubeyaml "k8s.io/apimachinery/pkg/util/yaml" "k8s.io/cli-runtime/pkg/genericclioptions" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/cliplugins/base" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // SnapshotOptions contains options for the snapshot command. diff --git a/pkg/cliplugins/workload/plugin/sync.go b/pkg/cliplugins/workload/plugin/sync.go index 11fcffcd80d..3cb2f2be0fb 100644 --- a/pkg/cliplugins/workload/plugin/sync.go +++ b/pkg/cliplugins/workload/plugin/sync.go @@ -52,13 +52,13 @@ import ( "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/util/sets" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" "github.com/kcp-dev/kcp/pkg/cliplugins/base" "github.com/kcp-dev/kcp/pkg/cliplugins/helpers" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) //go:embed *.yaml diff --git a/pkg/cliplugins/workload/plugin/workload.go b/pkg/cliplugins/workload/plugin/workload.go index d593b9a29ee..e6d70d8abe2 100644 --- a/pkg/cliplugins/workload/plugin/workload.go +++ b/pkg/cliplugins/workload/plugin/workload.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/cli-runtime/pkg/genericclioptions" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" "github.com/kcp-dev/kcp/pkg/cliplugins/base" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" ) // CordonOptions contains options for cordoning or uncordoning a SyncTarget. diff --git a/pkg/cliplugins/workspace/plugin/kubeconfig.go b/pkg/cliplugins/workspace/plugin/kubeconfig.go index 1efeb95b769..1ed83ce1ea5 100644 --- a/pkg/cliplugins/workspace/plugin/kubeconfig.go +++ b/pkg/cliplugins/workspace/plugin/kubeconfig.go @@ -39,13 +39,13 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/cliplugins/base" pluginhelpers "github.com/kcp-dev/kcp/pkg/cliplugins/helpers" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) const ( diff --git a/pkg/cliplugins/workspace/plugin/kubeconfig_test.go b/pkg/cliplugins/workspace/plugin/kubeconfig_test.go index 2aff8683530..d48eef87237 100644 --- a/pkg/cliplugins/workspace/plugin/kubeconfig_test.go +++ b/pkg/cliplugins/workspace/plugin/kubeconfig_test.go @@ -39,13 +39,13 @@ import ( "k8s.io/client-go/tools/clientcmd" clientcmdapi "k8s.io/client-go/tools/clientcmd/api" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpfakeclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/fake" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpfakeclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/fake" ) func TestCreate(t *testing.T) { diff --git a/pkg/cliplugins/workspace/plugin/scheme.go b/pkg/cliplugins/workspace/plugin/scheme.go index f95cf484380..3ddbd597d11 100644 --- a/pkg/cliplugins/workspace/plugin/scheme.go +++ b/pkg/cliplugins/workspace/plugin/scheme.go @@ -19,7 +19,7 @@ package plugin import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kcpscheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + kcpscheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) func init() { diff --git a/pkg/conversion/conversion_factory.go b/pkg/conversion/conversion_factory.go index 73beff8e72f..0fb031f3037 100644 --- a/pkg/conversion/conversion_factory.go +++ b/pkg/conversion/conversion_factory.go @@ -25,8 +25,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apiextensions-apiserver/pkg/apiserver/conversion" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) // CRConverterFactory instantiates converters that are capable of converting custom resources between different API diff --git a/pkg/conversion/conversion_rules.go b/pkg/conversion/conversion_rules.go index ea01e9a069b..1ed1624726d 100644 --- a/pkg/conversion/conversion_rules.go +++ b/pkg/conversion/conversion_rules.go @@ -31,7 +31,7 @@ import ( kerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/validation/field" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const celCheckFrequency = 100 diff --git a/pkg/conversion/conversion_rules_test.go b/pkg/conversion/conversion_rules_test.go index 4d810714008..a2941f9c115 100644 --- a/pkg/conversion/conversion_rules_test.go +++ b/pkg/conversion/conversion_rules_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "sigs.k8s.io/yaml" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestCompileConversion(t *testing.T) { diff --git a/pkg/conversion/converter.go b/pkg/conversion/converter.go index 7337c91760a..ed2d1c2bd43 100644 --- a/pkg/conversion/converter.go +++ b/pkg/conversion/converter.go @@ -35,7 +35,7 @@ import ( compbasemetrics "k8s.io/component-base/metrics" "k8s.io/component-base/metrics/legacyregistry" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func init() { diff --git a/pkg/conversion/converter_test.go b/pkg/conversion/converter_test.go index 139a89dc71f..a62e0363641 100644 --- a/pkg/conversion/converter_test.go +++ b/pkg/conversion/converter_test.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/yaml" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestPreserveMap(t *testing.T) { diff --git a/pkg/conversion/deferred_converter.go b/pkg/conversion/deferred_converter.go index a9c306edc09..62b1ffc7be5 100644 --- a/pkg/conversion/deferred_converter.go +++ b/pkg/conversion/deferred_converter.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // deferredConverter implements conversion.Converter and determines on the fly what type of converter to use. diff --git a/pkg/conversion/deferred_converter_test.go b/pkg/conversion/deferred_converter_test.go index e5e20efd4a6..0092803f817 100644 --- a/pkg/conversion/deferred_converter_test.go +++ b/pkg/conversion/deferred_converter_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/yaml" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestDeferredConverter_getConverter(t *testing.T) { diff --git a/pkg/index/index.go b/pkg/index/index.go index 918ddb25747..42776dbff02 100644 --- a/pkg/index/index.go +++ b/pkg/index/index.go @@ -22,8 +22,8 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // Index implements a mapping from logical cluster to (shard) URL. diff --git a/pkg/index/index_test.go b/pkg/index/index_test.go index 55e31a3bb46..b51eb914689 100644 --- a/pkg/index/index_test.go +++ b/pkg/index/index_test.go @@ -23,8 +23,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) type shardStub struct { diff --git a/pkg/indexers/apibinding.go b/pkg/indexers/apibinding.go index 9f20a057a08..332970ff833 100644 --- a/pkg/indexers/apibinding.go +++ b/pkg/indexers/apibinding.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // ClusterAndGroupResourceValue returns the index value for use with diff --git a/pkg/indexers/apibinding_test.go b/pkg/indexers/apibinding_test.go index 9628700a15d..d8267d803b3 100644 --- a/pkg/indexers/apibinding_test.go +++ b/pkg/indexers/apibinding_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestIndexAPIBindingByAPIExport(t *testing.T) { diff --git a/pkg/indexers/apiexport.go b/pkg/indexers/apiexport.go index 413f9e0ac3d..b5f4626c60c 100644 --- a/pkg/indexers/apiexport.go +++ b/pkg/indexers/apiexport.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const ( diff --git a/pkg/indexers/indexers.go b/pkg/indexers/indexers.go index af988dbf680..df7df76a8ed 100644 --- a/pkg/indexers/indexers.go +++ b/pkg/indexers/indexers.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - "github.com/kcp-dev/kcp/pkg/apis/core" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" syncershared "github.com/kcp-dev/kcp/pkg/syncer/shared" + "github.com/kcp-dev/kcp/sdk/apis/core" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/indexers/workload.go b/pkg/indexers/workload.go index 614cfb8e60c..8e49fbb2140 100644 --- a/pkg/indexers/workload.go +++ b/pkg/indexers/workload.go @@ -21,7 +21,7 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go index ddf44838ef3..2effed6228d 100644 --- a/pkg/openapi/zz_generated.openapi.go +++ b/pkg/openapi/zz_generated.openapi.go @@ -31,102 +31,102 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImport": schema_pkg_apis_apiresource_v1alpha1_APIResourceImport(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportCondition": schema_pkg_apis_apiresource_v1alpha1_APIResourceImportCondition(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportList": schema_pkg_apis_apiresource_v1alpha1_APIResourceImportList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportSpec": schema_pkg_apis_apiresource_v1alpha1_APIResourceImportSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportStatus": schema_pkg_apis_apiresource_v1alpha1_APIResourceImportStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition": schema_pkg_apis_apiresource_v1alpha1_ColumnDefinition(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.CommonAPIResourceSpec": schema_pkg_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion": schema_pkg_apis_apiresource_v1alpha1_GroupVersion(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResource": schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResource(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceCondition": schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceCondition(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceList": schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceSpec": schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceStatus": schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource": schema_pkg_apis_apiresource_v1alpha1_SubResource(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBinding": schema_pkg_apis_apis_v1alpha1_APIBinding(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingList": schema_pkg_apis_apis_v1alpha1_APIBindingList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingSpec": schema_pkg_apis_apis_v1alpha1_APIBindingSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingStatus": schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversion": schema_pkg_apis_apis_v1alpha1_APIConversion(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionList": schema_pkg_apis_apis_v1alpha1_APIConversionList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionRule": schema_pkg_apis_apis_v1alpha1_APIConversionRule(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionSpec": schema_pkg_apis_apis_v1alpha1_APIConversionSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExport": schema_pkg_apis_apis_v1alpha1_APIExport(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpoint": schema_pkg_apis_apis_v1alpha1_APIExportEndpoint(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSlice": schema_pkg_apis_apis_v1alpha1_APIExportEndpointSlice(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceList": schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceSpec": schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceStatus": schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportList": schema_pkg_apis_apis_v1alpha1_APIExportList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportSpec": schema_pkg_apis_apis_v1alpha1_APIExportSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportStatus": schema_pkg_apis_apis_v1alpha1_APIExportStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchema": schema_pkg_apis_apis_v1alpha1_APIResourceSchema(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchemaList": schema_pkg_apis_apis_v1alpha1_APIResourceSchemaList(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchemaSpec": schema_pkg_apis_apis_v1alpha1_APIResourceSchemaSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceVersion": schema_pkg_apis_apis_v1alpha1_APIResourceVersion(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIVersionConversion": schema_pkg_apis_apis_v1alpha1_APIVersionConversion(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.AcceptablePermissionClaim": schema_pkg_apis_apis_v1alpha1_AcceptablePermissionClaim(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BindingReference": schema_pkg_apis_apis_v1alpha1_BindingReference(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BoundAPIResource": schema_pkg_apis_apis_v1alpha1_BoundAPIResource(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BoundAPIResourceSchema": schema_pkg_apis_apis_v1alpha1_BoundAPIResourceSchema(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ExportBindingReference": schema_pkg_apis_apis_v1alpha1_ExportBindingReference(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.GroupResource": schema_pkg_apis_apis_v1alpha1_GroupResource(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.Identity": schema_pkg_apis_apis_v1alpha1_Identity(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.LocalAPIExportPolicy": schema_pkg_apis_apis_v1alpha1_LocalAPIExportPolicy(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.MaximalPermissionPolicy": schema_pkg_apis_apis_v1alpha1_MaximalPermissionPolicy(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.PermissionClaim": schema_pkg_apis_apis_v1alpha1_PermissionClaim(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ResourceSelector": schema_pkg_apis_apis_v1alpha1_ResourceSelector(ref), - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.VirtualWorkspace": schema_pkg_apis_apis_v1alpha1_VirtualWorkspace(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalCluster": schema_pkg_apis_core_v1alpha1_LogicalCluster(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterList": schema_pkg_apis_core_v1alpha1_LogicalClusterList(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterOwner": schema_pkg_apis_core_v1alpha1_LogicalClusterOwner(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterSpec": schema_pkg_apis_core_v1alpha1_LogicalClusterSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterStatus": schema_pkg_apis_core_v1alpha1_LogicalClusterStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.Shard": schema_pkg_apis_core_v1alpha1_Shard(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardList": schema_pkg_apis_core_v1alpha1_ShardList(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardSpec": schema_pkg_apis_core_v1alpha1_ShardSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardStatus": schema_pkg_apis_core_v1alpha1_ShardStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.AvailableSelectorLabel": schema_pkg_apis_scheduling_v1alpha1_AvailableSelectorLabel(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.GroupVersionResource": schema_pkg_apis_scheduling_v1alpha1_GroupVersionResource(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.Location": schema_pkg_apis_scheduling_v1alpha1_Location(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationList": schema_pkg_apis_scheduling_v1alpha1_LocationList(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationReference": schema_pkg_apis_scheduling_v1alpha1_LocationReference(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationSpec": schema_pkg_apis_scheduling_v1alpha1_LocationSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationStatus": schema_pkg_apis_scheduling_v1alpha1_LocationStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.Placement": schema_pkg_apis_scheduling_v1alpha1_Placement(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementList": schema_pkg_apis_scheduling_v1alpha1_PlacementList(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementSpec": schema_pkg_apis_scheduling_v1alpha1_PlacementSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementStatus": schema_pkg_apis_scheduling_v1alpha1_PlacementStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.APIExportReference": schema_pkg_apis_tenancy_v1alpha1_APIExportReference(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.VirtualWorkspace": schema_pkg_apis_tenancy_v1alpha1_VirtualWorkspace(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.Workspace": schema_pkg_apis_tenancy_v1alpha1_Workspace(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceList": schema_pkg_apis_tenancy_v1alpha1_WorkspaceList(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceLocation": schema_pkg_apis_tenancy_v1alpha1_WorkspaceLocation(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceSpec": schema_pkg_apis_tenancy_v1alpha1_WorkspaceSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceStatus": schema_pkg_apis_tenancy_v1alpha1_WorkspaceStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceType": schema_pkg_apis_tenancy_v1alpha1_WorkspaceType(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeExtension": schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeExtension(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeList": schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeList(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference": schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeReference(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSelector": schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSelector(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSpec": schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeStatus": schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition": schema_conditions_apis_conditions_v1alpha1_Condition(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.Partition": schema_pkg_apis_topology_v1alpha1_Partition(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionList": schema_pkg_apis_topology_v1alpha1_PartitionList(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSet": schema_pkg_apis_topology_v1alpha1_PartitionSet(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetList": schema_pkg_apis_topology_v1alpha1_PartitionSetList(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetSpec": schema_pkg_apis_topology_v1alpha1_PartitionSetSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetStatus": schema_pkg_apis_topology_v1alpha1_PartitionSetStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSpec": schema_pkg_apis_topology_v1alpha1_PartitionSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.ResourceToSync": schema_pkg_apis_workload_v1alpha1_ResourceToSync(ref), - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTarget": schema_pkg_apis_workload_v1alpha1_SyncTarget(ref), - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetList": schema_pkg_apis_workload_v1alpha1_SyncTargetList(ref), - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetSpec": schema_pkg_apis_workload_v1alpha1_SyncTargetSpec(ref), - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetStatus": schema_pkg_apis_workload_v1alpha1_SyncTargetStatus(ref), - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.VirtualWorkspace": schema_pkg_apis_workload_v1alpha1_VirtualWorkspace(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImport": schema_sdk_apis_apiresource_v1alpha1_APIResourceImport(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportCondition": schema_sdk_apis_apiresource_v1alpha1_APIResourceImportCondition(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportList": schema_sdk_apis_apiresource_v1alpha1_APIResourceImportList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportSpec": schema_sdk_apis_apiresource_v1alpha1_APIResourceImportSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportStatus": schema_sdk_apis_apiresource_v1alpha1_APIResourceImportStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition": schema_sdk_apis_apiresource_v1alpha1_ColumnDefinition(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.CommonAPIResourceSpec": schema_sdk_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion": schema_sdk_apis_apiresource_v1alpha1_GroupVersion(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResource": schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResource(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceCondition": schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceCondition(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceList": schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceSpec": schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceStatus": schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource": schema_sdk_apis_apiresource_v1alpha1_SubResource(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBinding": schema_sdk_apis_apis_v1alpha1_APIBinding(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingList": schema_sdk_apis_apis_v1alpha1_APIBindingList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingSpec": schema_sdk_apis_apis_v1alpha1_APIBindingSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingStatus": schema_sdk_apis_apis_v1alpha1_APIBindingStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversion": schema_sdk_apis_apis_v1alpha1_APIConversion(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionList": schema_sdk_apis_apis_v1alpha1_APIConversionList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionRule": schema_sdk_apis_apis_v1alpha1_APIConversionRule(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionSpec": schema_sdk_apis_apis_v1alpha1_APIConversionSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExport": schema_sdk_apis_apis_v1alpha1_APIExport(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpoint": schema_sdk_apis_apis_v1alpha1_APIExportEndpoint(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSlice": schema_sdk_apis_apis_v1alpha1_APIExportEndpointSlice(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceList": schema_sdk_apis_apis_v1alpha1_APIExportEndpointSliceList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceSpec": schema_sdk_apis_apis_v1alpha1_APIExportEndpointSliceSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceStatus": schema_sdk_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportList": schema_sdk_apis_apis_v1alpha1_APIExportList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportSpec": schema_sdk_apis_apis_v1alpha1_APIExportSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportStatus": schema_sdk_apis_apis_v1alpha1_APIExportStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchema": schema_sdk_apis_apis_v1alpha1_APIResourceSchema(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchemaList": schema_sdk_apis_apis_v1alpha1_APIResourceSchemaList(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchemaSpec": schema_sdk_apis_apis_v1alpha1_APIResourceSchemaSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceVersion": schema_sdk_apis_apis_v1alpha1_APIResourceVersion(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIVersionConversion": schema_sdk_apis_apis_v1alpha1_APIVersionConversion(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.AcceptablePermissionClaim": schema_sdk_apis_apis_v1alpha1_AcceptablePermissionClaim(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BindingReference": schema_sdk_apis_apis_v1alpha1_BindingReference(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BoundAPIResource": schema_sdk_apis_apis_v1alpha1_BoundAPIResource(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BoundAPIResourceSchema": schema_sdk_apis_apis_v1alpha1_BoundAPIResourceSchema(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ExportBindingReference": schema_sdk_apis_apis_v1alpha1_ExportBindingReference(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.GroupResource": schema_sdk_apis_apis_v1alpha1_GroupResource(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.Identity": schema_sdk_apis_apis_v1alpha1_Identity(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.LocalAPIExportPolicy": schema_sdk_apis_apis_v1alpha1_LocalAPIExportPolicy(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.MaximalPermissionPolicy": schema_sdk_apis_apis_v1alpha1_MaximalPermissionPolicy(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.PermissionClaim": schema_sdk_apis_apis_v1alpha1_PermissionClaim(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ResourceSelector": schema_sdk_apis_apis_v1alpha1_ResourceSelector(ref), + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.VirtualWorkspace": schema_sdk_apis_apis_v1alpha1_VirtualWorkspace(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalCluster": schema_sdk_apis_core_v1alpha1_LogicalCluster(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterList": schema_sdk_apis_core_v1alpha1_LogicalClusterList(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterOwner": schema_sdk_apis_core_v1alpha1_LogicalClusterOwner(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterSpec": schema_sdk_apis_core_v1alpha1_LogicalClusterSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterStatus": schema_sdk_apis_core_v1alpha1_LogicalClusterStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.Shard": schema_sdk_apis_core_v1alpha1_Shard(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardList": schema_sdk_apis_core_v1alpha1_ShardList(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardSpec": schema_sdk_apis_core_v1alpha1_ShardSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardStatus": schema_sdk_apis_core_v1alpha1_ShardStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.AvailableSelectorLabel": schema_sdk_apis_scheduling_v1alpha1_AvailableSelectorLabel(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.GroupVersionResource": schema_sdk_apis_scheduling_v1alpha1_GroupVersionResource(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.Location": schema_sdk_apis_scheduling_v1alpha1_Location(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationList": schema_sdk_apis_scheduling_v1alpha1_LocationList(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationReference": schema_sdk_apis_scheduling_v1alpha1_LocationReference(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationSpec": schema_sdk_apis_scheduling_v1alpha1_LocationSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationStatus": schema_sdk_apis_scheduling_v1alpha1_LocationStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.Placement": schema_sdk_apis_scheduling_v1alpha1_Placement(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementList": schema_sdk_apis_scheduling_v1alpha1_PlacementList(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementSpec": schema_sdk_apis_scheduling_v1alpha1_PlacementSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementStatus": schema_sdk_apis_scheduling_v1alpha1_PlacementStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.APIExportReference": schema_sdk_apis_tenancy_v1alpha1_APIExportReference(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.VirtualWorkspace": schema_sdk_apis_tenancy_v1alpha1_VirtualWorkspace(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.Workspace": schema_sdk_apis_tenancy_v1alpha1_Workspace(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceList": schema_sdk_apis_tenancy_v1alpha1_WorkspaceList(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceLocation": schema_sdk_apis_tenancy_v1alpha1_WorkspaceLocation(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceSpec": schema_sdk_apis_tenancy_v1alpha1_WorkspaceSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceStatus": schema_sdk_apis_tenancy_v1alpha1_WorkspaceStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceType": schema_sdk_apis_tenancy_v1alpha1_WorkspaceType(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeExtension": schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeExtension(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeList": schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeList(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference": schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeReference(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSelector": schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeSelector(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSpec": schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeStatus": schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition": schema_conditions_apis_conditions_v1alpha1_Condition(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.Partition": schema_sdk_apis_topology_v1alpha1_Partition(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionList": schema_sdk_apis_topology_v1alpha1_PartitionList(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSet": schema_sdk_apis_topology_v1alpha1_PartitionSet(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetList": schema_sdk_apis_topology_v1alpha1_PartitionSetList(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetSpec": schema_sdk_apis_topology_v1alpha1_PartitionSetSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetStatus": schema_sdk_apis_topology_v1alpha1_PartitionSetStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSpec": schema_sdk_apis_topology_v1alpha1_PartitionSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.ResourceToSync": schema_sdk_apis_workload_v1alpha1_ResourceToSync(ref), + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTarget": schema_sdk_apis_workload_v1alpha1_SyncTarget(ref), + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetList": schema_sdk_apis_workload_v1alpha1_SyncTargetList(ref), + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetSpec": schema_sdk_apis_workload_v1alpha1_SyncTargetSpec(ref), + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetStatus": schema_sdk_apis_workload_v1alpha1_SyncTargetStatus(ref), + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.VirtualWorkspace": schema_sdk_apis_workload_v1alpha1_VirtualWorkspace(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroup": schema_pkg_apis_meta_v1_APIGroup(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": schema_pkg_apis_meta_v1_APIGroupList(ref), "k8s.io/apimachinery/pkg/apis/meta/v1.APIResource": schema_pkg_apis_meta_v1_APIResource(ref), @@ -182,7 +182,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA } } -func schema_pkg_apis_apiresource_v1alpha1_APIResourceImport(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_APIResourceImport(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -212,24 +212,24 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImport(ref common.Reference "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportSpec", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportSpec", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_APIResourceImportCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -282,7 +282,7 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportCondition(ref common. } } -func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_APIResourceImportList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -316,7 +316,7 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportList(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImport"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImport"), }, }, }, @@ -327,11 +327,11 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportList(ref common.Refer }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImport", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImport", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_APIResourceImportSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -341,7 +341,7 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportSpec(ref common.Refer "groupVersion": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion"), }, }, "scope": { @@ -435,7 +435,7 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportSpec(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource"), }, }, }, @@ -454,7 +454,7 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportSpec(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition"), }, }, }, @@ -480,11 +480,11 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportSpec(ref common.Refer }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, } } -func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_APIResourceImportStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -498,7 +498,7 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportStatus(ref common.Ref Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportCondition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportCondition"), }, }, }, @@ -508,11 +508,11 @@ func schema_pkg_apis_apiresource_v1alpha1_APIResourceImportStatus(ref common.Ref }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.APIResourceImportCondition"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.APIResourceImportCondition"}, } } -func schema_pkg_apis_apiresource_v1alpha1_ColumnDefinition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_ColumnDefinition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -571,7 +571,7 @@ func schema_pkg_apis_apiresource_v1alpha1_ColumnDefinition(ref common.ReferenceC } } -func schema_pkg_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -581,7 +581,7 @@ func schema_pkg_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref common.Refer "groupVersion": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion"), }, }, "scope": { @@ -675,7 +675,7 @@ func schema_pkg_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource"), }, }, }, @@ -694,7 +694,7 @@ func schema_pkg_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition"), }, }, }, @@ -705,11 +705,11 @@ func schema_pkg_apis_apiresource_v1alpha1_CommonAPIResourceSpec(ref common.Refer }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, } } -func schema_pkg_apis_apiresource_v1alpha1_GroupVersion(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_GroupVersion(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -735,7 +735,7 @@ func schema_pkg_apis_apiresource_v1alpha1_GroupVersion(ref common.ReferenceCallb } } -func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -765,24 +765,24 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResource(ref common.Refer "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceSpec", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceSpec", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -835,7 +835,7 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceCondition(ref com } } -func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -869,7 +869,7 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceList(ref common.R Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResource"), }, }, }, @@ -880,11 +880,11 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceList(ref common.R }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResource", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResource", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -894,7 +894,7 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref common.R "groupVersion": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion"), }, }, "scope": { @@ -988,7 +988,7 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref common.R Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource"), }, }, }, @@ -1007,7 +1007,7 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref common.R Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition"), }, }, }, @@ -1024,11 +1024,11 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceSpec(ref common.R }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.ColumnDefinition", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.GroupVersion", "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.SubResource", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.ColumnDefinition", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.GroupVersion", "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.SubResource", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, } } -func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_NegotiatedAPIResourceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1042,7 +1042,7 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceStatus(ref common Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceCondition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceCondition"), }, }, }, @@ -1052,11 +1052,11 @@ func schema_pkg_apis_apiresource_v1alpha1_NegotiatedAPIResourceStatus(ref common }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1.NegotiatedAPIResourceCondition"}, + "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1.NegotiatedAPIResourceCondition"}, } } -func schema_pkg_apis_apiresource_v1alpha1_SubResource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apiresource_v1alpha1_SubResource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1076,7 +1076,7 @@ func schema_pkg_apis_apiresource_v1alpha1_SubResource(ref common.ReferenceCallba } } -func schema_pkg_apis_apis_v1alpha1_APIBinding(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIBinding(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1107,25 +1107,25 @@ func schema_pkg_apis_apis_v1alpha1_APIBinding(ref common.ReferenceCallback) comm SchemaProps: spec.SchemaProps{ Description: "Spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Description: "Status communicates the observed state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingSpec", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBindingStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingSpec", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBindingStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIBindingList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIBindingList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1159,7 +1159,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingList(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBinding"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBinding"), }, }, }, @@ -1170,11 +1170,11 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingList(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIBinding", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIBinding", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIBindingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIBindingSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1185,7 +1185,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingSpec(ref common.ReferenceCallback) SchemaProps: spec.SchemaProps{ Description: "reference uniquely identifies an API to bind to.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BindingReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BindingReference"), }, }, "permissionClaims": { @@ -1196,7 +1196,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingSpec(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.AcceptablePermissionClaim"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.AcceptablePermissionClaim"), }, }, }, @@ -1207,11 +1207,11 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingSpec(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.AcceptablePermissionClaim", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BindingReference"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.AcceptablePermissionClaim", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BindingReference"}, } } -func schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1242,7 +1242,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BoundAPIResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BoundAPIResource"), }, }, }, @@ -1263,7 +1263,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -1277,7 +1277,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.PermissionClaim"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.PermissionClaim"), }, }, }, @@ -1291,7 +1291,7 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.PermissionClaim"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.PermissionClaim"), }, }, }, @@ -1301,11 +1301,11 @@ func schema_pkg_apis_apis_v1alpha1_APIBindingStatus(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BoundAPIResource", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.PermissionClaim", "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BoundAPIResource", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.PermissionClaim", "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_apis_v1alpha1_APIConversion(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIConversion(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1336,7 +1336,7 @@ func schema_pkg_apis_apis_v1alpha1_APIConversion(ref common.ReferenceCallback) c SchemaProps: spec.SchemaProps{ Description: "Spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionSpec"), }, }, }, @@ -1344,11 +1344,11 @@ func schema_pkg_apis_apis_v1alpha1_APIConversion(ref common.ReferenceCallback) c }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIConversionList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIConversionList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1382,7 +1382,7 @@ func schema_pkg_apis_apis_v1alpha1_APIConversionList(ref common.ReferenceCallbac Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversion"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversion"), }, }, }, @@ -1393,11 +1393,11 @@ func schema_pkg_apis_apis_v1alpha1_APIConversionList(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversion", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversion", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIConversionRule(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIConversionRule(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1434,7 +1434,7 @@ func schema_pkg_apis_apis_v1alpha1_APIConversionRule(ref common.ReferenceCallbac } } -func schema_pkg_apis_apis_v1alpha1_APIConversionSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIConversionSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1458,7 +1458,7 @@ func schema_pkg_apis_apis_v1alpha1_APIConversionSpec(ref common.ReferenceCallbac Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIVersionConversion"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIVersionConversion"), }, }, }, @@ -1469,11 +1469,11 @@ func schema_pkg_apis_apis_v1alpha1_APIConversionSpec(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIVersionConversion"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIVersionConversion"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExport(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExport(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1504,25 +1504,25 @@ func schema_pkg_apis_apis_v1alpha1_APIExport(ref common.ReferenceCallback) commo SchemaProps: spec.SchemaProps{ Description: "Spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Description: "Status communicates the observed state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportSpec", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportSpec", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportEndpoint(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportEndpoint(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1544,7 +1544,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpoint(ref common.ReferenceCallbac } } -func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSlice(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportEndpointSlice(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1575,25 +1575,25 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSlice(ref common.ReferenceCa SchemaProps: spec.SchemaProps{ Description: "spec holds the desired state: - the targetted APIExport - an optional partition for filtering", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Description: "status communicates the observed state: the filtered list of endpoints for the APIExport service.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceSpec", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSliceStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceSpec", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSliceStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportEndpointSliceList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1627,7 +1627,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceList(ref common.Referen Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSlice"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSlice"), }, }, }, @@ -1638,11 +1638,11 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceList(ref common.Referen }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpointSlice", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpointSlice", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportEndpointSliceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1653,7 +1653,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceSpec(ref common.Referen SchemaProps: spec.SchemaProps{ Description: "export points to the API export.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ExportBindingReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ExportBindingReference"), }, }, "partition": { @@ -1668,11 +1668,11 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceSpec(ref common.Referen }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ExportBindingReference"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ExportBindingReference"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1687,7 +1687,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -1701,7 +1701,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref common.Refer Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpoint"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpoint"), }, }, }, @@ -1711,11 +1711,11 @@ func schema_pkg_apis_apis_v1alpha1_APIExportEndpointSliceStatus(ref common.Refer }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExportEndpoint", "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExportEndpoint", "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1749,7 +1749,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportList(ref common.ReferenceCallback) c Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExport"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExport"), }, }, }, @@ -1760,11 +1760,11 @@ func schema_pkg_apis_apis_v1alpha1_APIExportList(ref common.ReferenceCallback) c }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIExport", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIExport", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1794,13 +1794,13 @@ func schema_pkg_apis_apis_v1alpha1_APIExportSpec(ref common.ReferenceCallback) c "identity": { SchemaProps: spec.SchemaProps{ Description: "identity points to a secret that contains the API identity in the 'key' file. The API identity determines an unique etcd prefix for objects stored via this APIExport.\n\nDifferent APIExport in a workspace can share a common identity, or have different ones. The identity (the secret) can also be transferred to another workspace when the APIExport is moved.\n\nThe identity is a secret of the API provider. The APIBindings referencing this APIExport will store a derived, non-sensitive value of this identity.\n\nThe identity of an APIExport cannot be changed. A derived, non-sensitive value of the identity key is stored in the APIExport status and this value is immutable.\n\nThe identity is defaulted. A secret with the name of the APIExport is automatically created.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.Identity"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.Identity"), }, }, "maximalPermissionPolicy": { SchemaProps: spec.SchemaProps{ Description: "maximalPermissionPolicy will allow for a service provider to set an upper bound on what is allowed for a consumer of this API. If the policy is not set, no upper bound is applied, i.e the consuming users can do whatever the user workspace allows the user to do.\n\nThe policy consists of RBAC (Cluster)Roles and (Cluster)Bindings. A request of a user in a workspace that binds to this APIExport via an APIBinding is additionally checked against these rules, with the user name and the groups prefixed with `apis.kcp.io:binding:`.\n\nFor example: assume a user `adam` with groups `system:authenticated` and `a-team` binds to this APIExport in another workspace root:org:ws. Then a request in that workspace against a resource of this APIExport is authorized as every other request in that workspace, but in addition the RBAC policy here in the APIExport workspace has to grant access to the user `apis.kcp.io:binding:adam` with the groups `apis.kcp.io:binding:system:authenticated` and `apis.kcp.io:binding:a-team`.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.MaximalPermissionPolicy"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.MaximalPermissionPolicy"), }, }, "permissionClaims": { @@ -1820,7 +1820,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportSpec(ref common.ReferenceCallback) c Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.PermissionClaim"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.PermissionClaim"), }, }, }, @@ -1830,11 +1830,11 @@ func schema_pkg_apis_apis_v1alpha1_APIExportSpec(ref common.ReferenceCallback) c }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.Identity", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.MaximalPermissionPolicy", "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.PermissionClaim"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.Identity", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.MaximalPermissionPolicy", "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.PermissionClaim"}, } } -func schema_pkg_apis_apis_v1alpha1_APIExportStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIExportStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1856,7 +1856,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportStatus(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -1870,7 +1870,7 @@ func schema_pkg_apis_apis_v1alpha1_APIExportStatus(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.VirtualWorkspace"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.VirtualWorkspace"), }, }, }, @@ -1880,11 +1880,11 @@ func schema_pkg_apis_apis_v1alpha1_APIExportStatus(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.VirtualWorkspace", "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.VirtualWorkspace", "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_apis_v1alpha1_APIResourceSchema(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIResourceSchema(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1915,18 +1915,18 @@ func schema_pkg_apis_apis_v1alpha1_APIResourceSchema(ref common.ReferenceCallbac SchemaProps: spec.SchemaProps{ Description: "Spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchemaSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchemaSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchemaSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchemaSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIResourceSchemaList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIResourceSchemaList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1960,7 +1960,7 @@ func schema_pkg_apis_apis_v1alpha1_APIResourceSchemaList(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchema"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchema"), }, }, }, @@ -1971,11 +1971,11 @@ func schema_pkg_apis_apis_v1alpha1_APIResourceSchemaList(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceSchema", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceSchema", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_apis_v1alpha1_APIResourceSchemaSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIResourceSchemaSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2021,7 +2021,7 @@ func schema_pkg_apis_apis_v1alpha1_APIResourceSchemaSpec(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceVersion"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceVersion"), }, }, }, @@ -2032,11 +2032,11 @@ func schema_pkg_apis_apis_v1alpha1_APIResourceSchemaSpec(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIResourceVersion", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIResourceVersion", "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1.CustomResourceDefinitionNames"}, } } -func schema_pkg_apis_apis_v1alpha1_APIResourceVersion(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIResourceVersion(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2131,7 +2131,7 @@ func schema_pkg_apis_apis_v1alpha1_APIResourceVersion(ref common.ReferenceCallba } } -func schema_pkg_apis_apis_v1alpha1_APIVersionConversion(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_APIVersionConversion(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2170,7 +2170,7 @@ func schema_pkg_apis_apis_v1alpha1_APIVersionConversion(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionRule"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionRule"), }, }, }, @@ -2196,11 +2196,11 @@ func schema_pkg_apis_apis_v1alpha1_APIVersionConversion(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.APIConversionRule"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.APIConversionRule"}, } } -func schema_pkg_apis_apis_v1alpha1_AcceptablePermissionClaim(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_AcceptablePermissionClaim(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2222,7 +2222,7 @@ func schema_pkg_apis_apis_v1alpha1_AcceptablePermissionClaim(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ResourceSelector"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ResourceSelector"), }, }, }, @@ -2247,11 +2247,11 @@ func schema_pkg_apis_apis_v1alpha1_AcceptablePermissionClaim(ref common.Referenc }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ResourceSelector"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ResourceSelector"}, } } -func schema_pkg_apis_apis_v1alpha1_BindingReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_BindingReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2261,18 +2261,18 @@ func schema_pkg_apis_apis_v1alpha1_BindingReference(ref common.ReferenceCallback "export": { SchemaProps: spec.SchemaProps{ Description: "export is a reference to an APIExport by cluster name and export name. The creator of the APIBinding needs to have access to the APIExport with the verb `bind` in order to bind to it.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ExportBindingReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ExportBindingReference"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ExportBindingReference"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ExportBindingReference"}, } } -func schema_pkg_apis_apis_v1alpha1_BoundAPIResource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_BoundAPIResource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2299,7 +2299,7 @@ func schema_pkg_apis_apis_v1alpha1_BoundAPIResource(ref common.ReferenceCallback SchemaProps: spec.SchemaProps{ Description: "Schema references the APIResourceSchema that is bound to this API.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BoundAPIResourceSchema"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BoundAPIResourceSchema"), }, }, "storageVersions": { @@ -2327,11 +2327,11 @@ func schema_pkg_apis_apis_v1alpha1_BoundAPIResource(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.BoundAPIResourceSchema"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.BoundAPIResourceSchema"}, } } -func schema_pkg_apis_apis_v1alpha1_BoundAPIResourceSchema(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_BoundAPIResourceSchema(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2369,7 +2369,7 @@ func schema_pkg_apis_apis_v1alpha1_BoundAPIResourceSchema(ref common.ReferenceCa } } -func schema_pkg_apis_apis_v1alpha1_ExportBindingReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_ExportBindingReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2398,7 +2398,7 @@ func schema_pkg_apis_apis_v1alpha1_ExportBindingReference(ref common.ReferenceCa } } -func schema_pkg_apis_apis_v1alpha1_GroupResource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_GroupResource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2427,7 +2427,7 @@ func schema_pkg_apis_apis_v1alpha1_GroupResource(ref common.ReferenceCallback) c } } -func schema_pkg_apis_apis_v1alpha1_Identity(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_Identity(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2448,7 +2448,7 @@ func schema_pkg_apis_apis_v1alpha1_Identity(ref common.ReferenceCallback) common } } -func schema_pkg_apis_apis_v1alpha1_LocalAPIExportPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_LocalAPIExportPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2459,7 +2459,7 @@ func schema_pkg_apis_apis_v1alpha1_LocalAPIExportPolicy(ref common.ReferenceCall } } -func schema_pkg_apis_apis_v1alpha1_MaximalPermissionPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_MaximalPermissionPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2469,18 +2469,18 @@ func schema_pkg_apis_apis_v1alpha1_MaximalPermissionPolicy(ref common.ReferenceC "local": { SchemaProps: spec.SchemaProps{ Description: "local is the policy that is defined in same workspace as the API Export.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.LocalAPIExportPolicy"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.LocalAPIExportPolicy"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.LocalAPIExportPolicy"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.LocalAPIExportPolicy"}, } } -func schema_pkg_apis_apis_v1alpha1_PermissionClaim(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_PermissionClaim(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2502,7 +2502,7 @@ func schema_pkg_apis_apis_v1alpha1_PermissionClaim(ref common.ReferenceCallback) Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ResourceSelector"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ResourceSelector"), }, }, }, @@ -2519,11 +2519,11 @@ func schema_pkg_apis_apis_v1alpha1_PermissionClaim(ref common.ReferenceCallback) }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1.ResourceSelector"}, + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1.ResourceSelector"}, } } -func schema_pkg_apis_apis_v1alpha1_ResourceSelector(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_ResourceSelector(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2549,7 +2549,7 @@ func schema_pkg_apis_apis_v1alpha1_ResourceSelector(ref common.ReferenceCallback } } -func schema_pkg_apis_apis_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_apis_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2570,7 +2570,7 @@ func schema_pkg_apis_apis_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback } } -func schema_pkg_apis_core_v1alpha1_LogicalCluster(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_LogicalCluster(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2600,24 +2600,24 @@ func schema_pkg_apis_core_v1alpha1_LogicalCluster(ref common.ReferenceCallback) "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterSpec", "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterSpec", "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_core_v1alpha1_LogicalClusterList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_LogicalClusterList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2651,7 +2651,7 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterList(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalCluster"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalCluster"), }, }, }, @@ -2662,11 +2662,11 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterList(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalCluster", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalCluster", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_core_v1alpha1_LogicalClusterOwner(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_LogicalClusterOwner(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2727,7 +2727,7 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterOwner(ref common.ReferenceCallb } } -func schema_pkg_apis_core_v1alpha1_LogicalClusterSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_LogicalClusterSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2744,7 +2744,7 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterSpec(ref common.ReferenceCallba "owner": { SchemaProps: spec.SchemaProps{ Description: "owner is a reference to a resource controlling the life-cycle of this logical cluster. On deletion of the LogicalCluster, the finalizer core.kcp.io/logicalcluster is removed from the owner.\n\nWhen this object is deleted, but the owner is not deleted, the owner is deleted too.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterOwner"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterOwner"), }, }, "initializers": { @@ -2766,11 +2766,11 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterSpec(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.LogicalClusterOwner"}, + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.LogicalClusterOwner"}, } } -func schema_pkg_apis_core_v1alpha1_LogicalClusterStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_LogicalClusterStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2799,7 +2799,7 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterStatus(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -2824,11 +2824,11 @@ func schema_pkg_apis_core_v1alpha1_LogicalClusterStatus(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_core_v1alpha1_Shard(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_Shard(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2858,24 +2858,24 @@ func schema_pkg_apis_core_v1alpha1_Shard(ref common.ReferenceCallback) common.Op "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardSpec", "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.ShardStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardSpec", "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.ShardStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_core_v1alpha1_ShardList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_ShardList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2909,7 +2909,7 @@ func schema_pkg_apis_core_v1alpha1_ShardList(ref common.ReferenceCallback) commo Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.Shard"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.Shard"), }, }, }, @@ -2920,11 +2920,11 @@ func schema_pkg_apis_core_v1alpha1_ShardList(ref common.ReferenceCallback) commo }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1.Shard", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1.Shard", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_core_v1alpha1_ShardSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_ShardSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2960,7 +2960,7 @@ func schema_pkg_apis_core_v1alpha1_ShardSpec(ref common.ReferenceCallback) commo } } -func schema_pkg_apis_core_v1alpha1_ShardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_core_v1alpha1_ShardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -2990,7 +2990,7 @@ func schema_pkg_apis_core_v1alpha1_ShardStatus(ref common.ReferenceCallback) com Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -3000,11 +3000,11 @@ func schema_pkg_apis_core_v1alpha1_ShardStatus(ref common.ReferenceCallback) com }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, } } -func schema_pkg_apis_scheduling_v1alpha1_AvailableSelectorLabel(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_AvailableSelectorLabel(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3053,7 +3053,7 @@ func schema_pkg_apis_scheduling_v1alpha1_AvailableSelectorLabel(ref common.Refer } } -func schema_pkg_apis_scheduling_v1alpha1_GroupVersionResource(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_GroupVersionResource(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3090,7 +3090,7 @@ func schema_pkg_apis_scheduling_v1alpha1_GroupVersionResource(ref common.Referen } } -func schema_pkg_apis_scheduling_v1alpha1_Location(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_Location(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3120,24 +3120,24 @@ func schema_pkg_apis_scheduling_v1alpha1_Location(ref common.ReferenceCallback) "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationSpec", "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationSpec", "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_scheduling_v1alpha1_LocationList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_LocationList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3171,7 +3171,7 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationList(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.Location"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.Location"), }, }, }, @@ -3182,11 +3182,11 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationList(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.Location", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.Location", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_scheduling_v1alpha1_LocationReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_LocationReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3216,7 +3216,7 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationReference(ref common.ReferenceC } } -func schema_pkg_apis_scheduling_v1alpha1_LocationSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_LocationSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3227,7 +3227,7 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationSpec(ref common.ReferenceCallba SchemaProps: spec.SchemaProps{ Description: "resource is the group-version-resource of the instances that are subject to this location.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.GroupVersionResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.GroupVersionResource"), }, }, "description": { @@ -3253,7 +3253,7 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationSpec(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.AvailableSelectorLabel"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.AvailableSelectorLabel"), }, }, }, @@ -3270,11 +3270,11 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationSpec(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.AvailableSelectorLabel", "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.GroupVersionResource", "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.AvailableSelectorLabel", "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.GroupVersionResource", "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"}, } } -func schema_pkg_apis_scheduling_v1alpha1_LocationStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_LocationStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3301,7 +3301,7 @@ func schema_pkg_apis_scheduling_v1alpha1_LocationStatus(ref common.ReferenceCall } } -func schema_pkg_apis_scheduling_v1alpha1_Placement(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_Placement(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3331,24 +3331,24 @@ func schema_pkg_apis_scheduling_v1alpha1_Placement(ref common.ReferenceCallback) "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementSpec", "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.PlacementStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementSpec", "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.PlacementStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_scheduling_v1alpha1_PlacementList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_PlacementList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3382,7 +3382,7 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementList(ref common.ReferenceCallb Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.Placement"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.Placement"), }, }, }, @@ -3393,11 +3393,11 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementList(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.Placement", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.Placement", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_scheduling_v1alpha1_PlacementSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_PlacementSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3421,7 +3421,7 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementSpec(ref common.ReferenceCallb SchemaProps: spec.SchemaProps{ Description: "locationResource is the group-version-resource of the instances that are subject to the locations to select.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.GroupVersionResource"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.GroupVersionResource"), }, }, "namespaceSelector": { @@ -3442,11 +3442,11 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementSpec(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.GroupVersionResource", "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.GroupVersionResource", "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"}, } } -func schema_pkg_apis_scheduling_v1alpha1_PlacementStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_scheduling_v1alpha1_PlacementStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3462,7 +3462,7 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementStatus(ref common.ReferenceCal "selectedLocation": { SchemaProps: spec.SchemaProps{ Description: "selectedLocation is the location that a picked by this placement.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationReference"), }, }, "conditions": { @@ -3473,7 +3473,7 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementStatus(ref common.ReferenceCal Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -3483,11 +3483,11 @@ func schema_pkg_apis_scheduling_v1alpha1_PlacementStatus(ref common.ReferenceCal }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1.LocationReference", "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1.LocationReference", "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_tenancy_v1alpha1_APIExportReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_APIExportReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3516,7 +3516,7 @@ func schema_pkg_apis_tenancy_v1alpha1_APIExportReference(ref common.ReferenceCal } } -func schema_pkg_apis_tenancy_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3537,7 +3537,7 @@ func schema_pkg_apis_tenancy_v1alpha1_VirtualWorkspace(ref common.ReferenceCallb } } -func schema_pkg_apis_tenancy_v1alpha1_Workspace(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_Workspace(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3567,13 +3567,13 @@ func schema_pkg_apis_tenancy_v1alpha1_Workspace(ref common.ReferenceCallback) co "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceStatus"), }, }, }, @@ -3581,11 +3581,11 @@ func schema_pkg_apis_tenancy_v1alpha1_Workspace(ref common.ReferenceCallback) co }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceSpec", "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceSpec", "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3619,7 +3619,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceList(ref common.ReferenceCallback Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.Workspace"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.Workspace"), }, }, }, @@ -3630,11 +3630,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceList(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.Workspace", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.Workspace", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceLocation(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceLocation(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3654,7 +3654,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceLocation(ref common.ReferenceCall } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3665,13 +3665,13 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceSpec(ref common.ReferenceCallback SchemaProps: spec.SchemaProps{ Description: "type defines properties of the workspace both on creation (e.g. initial resources and initially installed APIs) and during runtime (e.g. permissions). If no type is provided, the default type for the workspace in which this workspace is nesting will be used.\n\nThe type is a reference to a WorkspaceType in the listed workspace, but lower-cased. The WorkspaceType existence is validated at admission during creation. The type is immutable after creation. The use of a type is gated via the RBAC workspacetypes/use resource permission.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"), }, }, "location": { SchemaProps: spec.SchemaProps{ Description: "location constraints where this workspace can be scheduled to.\n\nIf the no location is specified, an arbitrary location is chosen.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceLocation"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceLocation"), }, }, "cluster": { @@ -3692,11 +3692,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceSpec(ref common.ReferenceCallback }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceLocation", "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceLocation", "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3718,7 +3718,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceStatus(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -3743,11 +3743,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceStatus(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceType(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceType(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3777,24 +3777,24 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceType(ref common.ReferenceCallback "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSpec", "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSpec", "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeExtension(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeExtension(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3809,7 +3809,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeExtension(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"), }, }, }, @@ -3819,11 +3819,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeExtension(ref common.Referenc }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3857,7 +3857,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeList(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceType"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceType"), }, }, }, @@ -3868,11 +3868,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeList(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceType", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceType", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeReference(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeReference(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3901,7 +3901,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeReference(ref common.Referenc } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSelector(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeSelector(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3923,7 +3923,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSelector(ref common.Reference Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"), }, }, }, @@ -3933,11 +3933,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSelector(ref common.Reference }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -3954,7 +3954,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref common.ReferenceCall SchemaProps: spec.SchemaProps{ Description: "extend is a list of other WorkspaceTypes whose initializers and limitAllowedChildren and limitAllowedParents this WorkspaceType is inheriting. By (transitively) extending another WorkspaceType, this WorkspaceType will be considered as that other type in evaluation of limitAllowedChildren and limitAllowedParents constraints.\n\nA dependency cycle stop this WorkspaceType from being admitted as the type of a Workspace.\n\nA non-existing dependency stop this WorkspaceType from being admitted as the type of a Workspace.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeExtension"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeExtension"), }, }, "additionalWorkspaceLabels": { @@ -3976,19 +3976,19 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref common.ReferenceCall "defaultChildWorkspaceType": { SchemaProps: spec.SchemaProps{ Description: "defaultChildWorkspaceType is the WorkspaceType that will be used by default if another, nested Workspace is created in a workspace of this type. When this field is unset, the user must specify a type when creating nested workspaces. Extending another WorkspaceType does not inherit its defaultChildWorkspaceType.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference"), }, }, "limitAllowedChildren": { SchemaProps: spec.SchemaProps{ Description: "limitAllowedChildren specifies constraints for sub-workspaces created in workspaces of this type. These are in addition to child constraints of types this one extends.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSelector"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSelector"), }, }, "limitAllowedParents": { SchemaProps: spec.SchemaProps{ Description: "limitAllowedParents specifies constraints for the parent workspace that workspaces of this type are created in. These are in addition to parent constraints of types this one extends.", - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSelector"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSelector"), }, }, "defaultAPIBindings": { @@ -3999,7 +3999,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.APIExportReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.APIExportReference"), }, }, }, @@ -4009,11 +4009,11 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeSpec(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.APIExportReference", "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeExtension", "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeReference", "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.WorkspaceTypeSelector"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.APIExportReference", "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeExtension", "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeReference", "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.WorkspaceTypeSelector"}, } } -func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4028,7 +4028,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -4042,7 +4042,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.VirtualWorkspace"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.VirtualWorkspace"), }, }, }, @@ -4052,7 +4052,7 @@ func schema_pkg_apis_tenancy_v1alpha1_WorkspaceTypeStatus(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.VirtualWorkspace", "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.VirtualWorkspace", "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } @@ -4116,7 +4116,7 @@ func schema_conditions_apis_conditions_v1alpha1_Condition(ref common.ReferenceCa } } -func schema_pkg_apis_topology_v1alpha1_Partition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_Partition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4147,18 +4147,18 @@ func schema_pkg_apis_topology_v1alpha1_Partition(ref common.ReferenceCallback) c SchemaProps: spec.SchemaProps{ Description: "spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSpec"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSpec", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_topology_v1alpha1_PartitionList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_PartitionList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4192,7 +4192,7 @@ func schema_pkg_apis_topology_v1alpha1_PartitionList(ref common.ReferenceCallbac Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.Partition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.Partition"), }, }, }, @@ -4203,11 +4203,11 @@ func schema_pkg_apis_topology_v1alpha1_PartitionList(ref common.ReferenceCallbac }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.Partition", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.Partition", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_topology_v1alpha1_PartitionSet(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_PartitionSet(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4238,25 +4238,25 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSet(ref common.ReferenceCallback SchemaProps: spec.SchemaProps{ Description: "spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Description: "status holds information about the current status", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetSpec", "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSetStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetSpec", "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSetStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_topology_v1alpha1_PartitionSetList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_PartitionSetList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4290,7 +4290,7 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSetList(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSet"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSet"), }, }, }, @@ -4301,11 +4301,11 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSetList(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1.PartitionSet", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1.PartitionSet", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_topology_v1alpha1_PartitionSetSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_PartitionSetSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4341,7 +4341,7 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSetSpec(ref common.ReferenceCall } } -func schema_pkg_apis_topology_v1alpha1_PartitionSetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_PartitionSetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4363,7 +4363,7 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSetStatus(ref common.ReferenceCa Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -4373,11 +4373,11 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSetStatus(ref common.ReferenceCa }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"}, } } -func schema_pkg_apis_topology_v1alpha1_PartitionSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_topology_v1alpha1_PartitionSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4398,7 +4398,7 @@ func schema_pkg_apis_topology_v1alpha1_PartitionSpec(ref common.ReferenceCallbac } } -func schema_pkg_apis_workload_v1alpha1_ResourceToSync(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_workload_v1alpha1_ResourceToSync(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4441,7 +4441,7 @@ func schema_pkg_apis_workload_v1alpha1_ResourceToSync(ref common.ReferenceCallba } } -func schema_pkg_apis_workload_v1alpha1_SyncTarget(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_workload_v1alpha1_SyncTarget(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4472,25 +4472,25 @@ func schema_pkg_apis_workload_v1alpha1_SyncTarget(ref common.ReferenceCallback) SchemaProps: spec.SchemaProps{ Description: "Spec holds the desired state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetSpec"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Description: "Status communicates the observed state.", Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetStatus"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetSpec", "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTargetStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetSpec", "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTargetStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_pkg_apis_workload_v1alpha1_SyncTargetList(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_workload_v1alpha1_SyncTargetList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4524,7 +4524,7 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetList(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTarget"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTarget"), }, }, }, @@ -4535,11 +4535,11 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetList(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.SyncTarget", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.SyncTarget", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, } } -func schema_pkg_apis_workload_v1alpha1_SyncTargetSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_workload_v1alpha1_SyncTargetSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4568,7 +4568,7 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetSpec(ref common.ReferenceCallba Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.APIExportReference"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.APIExportReference"), }, }, }, @@ -4594,11 +4594,11 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetSpec(ref common.ReferenceCallba }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1.APIExportReference", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1.APIExportReference", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } -func schema_pkg_apis_workload_v1alpha1_SyncTargetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_workload_v1alpha1_SyncTargetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -4643,7 +4643,7 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetStatus(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition"), }, }, }, @@ -4657,7 +4657,7 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetStatus(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.ResourceToSync"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.ResourceToSync"), }, }, }, @@ -4677,7 +4677,7 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetStatus(ref common.ReferenceCall Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.VirtualWorkspace"), + Ref: ref("github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.VirtualWorkspace"), }, }, }, @@ -4687,11 +4687,11 @@ func schema_pkg_apis_workload_v1alpha1_SyncTargetStatus(ref common.ReferenceCall }, }, Dependencies: []string{ - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1.Condition", "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.ResourceToSync", "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1.VirtualWorkspace", "k8s.io/apimachinery/pkg/api/resource.Quantity", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1.Condition", "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.ResourceToSync", "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1.VirtualWorkspace", "k8s.io/apimachinery/pkg/api/resource.Quantity", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } -func schema_pkg_apis_workload_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_sdk_apis_workload_v1alpha1_VirtualWorkspace(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/pkg/permissionclaim/permissionclaim_labeler.go b/pkg/permissionclaim/permissionclaim_labeler.go index eb7e8bd74ed..18d6b4a74ea 100644 --- a/pkg/permissionclaim/permissionclaim_labeler.go +++ b/pkg/permissionclaim/permissionclaim_labeler.go @@ -27,12 +27,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1/permissionclaims" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1/permissionclaims" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) // Labeler calculates labels to apply to all instances of a cluster-group-resource based on permission claims. diff --git a/pkg/proxy/index/index_controller.go b/pkg/proxy/index/index_controller.go index 0fec9fd0179..39bb3ca328a 100644 --- a/pkg/proxy/index/index_controller.go +++ b/pkg/proxy/index/index_controller.go @@ -31,15 +31,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - tenancyv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/index" indexrewriters "github.com/kcp-dev/kcp/pkg/index/rewriters" "github.com/kcp-dev/kcp/pkg/logging" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + tenancyv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go index 64de3f25b7e..3d0690a2b2f 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -29,15 +29,15 @@ import ( _ "k8s.io/component-base/metrics/prometheus/workqueue" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" frontproxyfilters "github.com/kcp-dev/kcp/pkg/proxy/filters" "github.com/kcp-dev/kcp/pkg/proxy/index" "github.com/kcp-dev/kcp/pkg/proxy/metrics" "github.com/kcp-dev/kcp/pkg/server" "github.com/kcp-dev/kcp/pkg/server/requestinfo" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type Server struct { diff --git a/pkg/reconciler/apis/apibinding/apibinding_controller.go b/pkg/reconciler/apis/apibinding/apibinding_controller.go index e5ac93b8c8d..133d34bdb5a 100644 --- a/pkg/reconciler/apis/apibinding/apibinding_controller.go +++ b/pkg/reconciler/apis/apibinding/apibinding_controller.go @@ -41,14 +41,14 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/apibinding/apibinding_indexes.go b/pkg/reconciler/apis/apibinding/apibinding_indexes.go index 6dbffcf13d3..088a08ff29d 100644 --- a/pkg/reconciler/apis/apibinding/apibinding_indexes.go +++ b/pkg/reconciler/apis/apibinding/apibinding_indexes.go @@ -21,8 +21,8 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client" ) const indexAPIExportsByAPIResourceSchema = "apiExportsByAPIResourceSchema" diff --git a/pkg/reconciler/apis/apibinding/apibinding_indexes_test.go b/pkg/reconciler/apis/apibinding/apibinding_indexes_test.go index 72a8c6fcb16..e5a625292ab 100644 --- a/pkg/reconciler/apis/apibinding/apibinding_indexes_test.go +++ b/pkg/reconciler/apis/apibinding/apibinding_indexes_test.go @@ -24,8 +24,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client" ) func TestIndexAPIExportByAPIResourceSchemas(t *testing.T) { diff --git a/pkg/reconciler/apis/apibinding/apibinding_reconcile.go b/pkg/reconciler/apis/apibinding/apibinding_reconcile.go index 615657e1392..119dd16c1ee 100644 --- a/pkg/reconciler/apis/apibinding/apibinding_reconcile.go +++ b/pkg/reconciler/apis/apibinding/apibinding_reconcile.go @@ -34,10 +34,10 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) type reconcileStatus int diff --git a/pkg/reconciler/apis/apibinding/apibinding_reconcile_test.go b/pkg/reconciler/apis/apibinding/apibinding_reconcile_test.go index f8d30a87306..1f79f05b8d0 100644 --- a/pkg/reconciler/apis/apibinding/apibinding_reconcile_test.go +++ b/pkg/reconciler/apis/apibinding/apibinding_reconcile_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/utils/pointer" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // requireConditionMatches looks for a condition matching c in g. Only fields that are set in c are compared (Type is diff --git a/pkg/reconciler/apis/apibinding/conflict_checker.go b/pkg/reconciler/apis/apibinding/conflict_checker.go index d8eb0f1d52e..a5a68b323a6 100644 --- a/pkg/reconciler/apis/apibinding/conflict_checker.go +++ b/pkg/reconciler/apis/apibinding/conflict_checker.go @@ -25,7 +25,7 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/apimachinery/pkg/util/sets" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // byUID implements sort.Interface based on the UID field of CustomResourceDefinition. diff --git a/pkg/reconciler/apis/apibinding/conflict_checker_test.go b/pkg/reconciler/apis/apibinding/conflict_checker_test.go index 5122707ad4d..c9b957a50d3 100644 --- a/pkg/reconciler/apis/apibinding/conflict_checker_test.go +++ b/pkg/reconciler/apis/apibinding/conflict_checker_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestNameConflictCheckerGetBoundCRDs(t *testing.T) { diff --git a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletion_controller.go b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletion_controller.go index fc55443349d..8ffd0fdcfeb 100644 --- a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletion_controller.go +++ b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletion_controller.go @@ -37,15 +37,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" "github.com/kcp-dev/kcp/pkg/reconciler/core/logicalclusterdeletion/deletion" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor.go b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor.go index 4f7ccd200e2..f24b33b5549 100644 --- a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor.go +++ b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/projection" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) type gvrDeletionMetadata struct { diff --git a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor_test.go b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor_test.go index f935be54713..6ae911d0126 100644 --- a/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor_test.go +++ b/pkg/reconciler/apis/apibindingdeletion/apibinding_deletor_test.go @@ -28,10 +28,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/reconciler/core/logicalclusterdeletion/deletion" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func TestMutateResourceRemainingStatus(t *testing.T) { diff --git a/pkg/reconciler/apis/apiexport/apiexport_controller.go b/pkg/reconciler/apis/apiexport/apiexport_controller.go index 8b8c9d663ae..1ef3fcfccaf 100644 --- a/pkg/reconciler/apis/apiexport/apiexport_controller.go +++ b/pkg/reconciler/apis/apiexport/apiexport_controller.go @@ -37,15 +37,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/apiexport/apiexport_controller_test.go b/pkg/reconciler/apis/apiexport/apiexport_controller_test.go index ddccf6e380a..195b5b3ac30 100644 --- a/pkg/reconciler/apis/apiexport/apiexport_controller_test.go +++ b/pkg/reconciler/apis/apiexport/apiexport_controller_test.go @@ -30,10 +30,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func TestReconcile(t *testing.T) { diff --git a/pkg/reconciler/apis/apiexport/apiexport_reconcile.go b/pkg/reconciler/apis/apiexport/apiexport_reconcile.go index 5a546f560aa..bb7ce3d6ecd 100644 --- a/pkg/reconciler/apis/apiexport/apiexport_reconcile.go +++ b/pkg/reconciler/apis/apiexport/apiexport_reconcile.go @@ -31,11 +31,11 @@ import ( "k8s.io/klog/v2" virtualworkspacesoptions "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/logging" apiexportbuilder "github.com/kcp-dev/kcp/pkg/virtual/apiexport/builder" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func (c *controller) reconcile(ctx context.Context, apiExport *apisv1alpha1.APIExport) error { diff --git a/pkg/reconciler/apis/apiexport/crypto.go b/pkg/reconciler/apis/apiexport/crypto.go index 58618508231..986f29876aa 100644 --- a/pkg/reconciler/apis/apiexport/crypto.go +++ b/pkg/reconciler/apis/apiexport/crypto.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/crypto" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func GenerateIdentitySecret(ctx context.Context, ns string, apiExportName string) (*corev1.Secret, error) { diff --git a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go index 094f3b4ecc8..cb5e2bf3324 100644 --- a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go +++ b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller.go @@ -35,18 +35,18 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - apisinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - topologyinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/topology/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + apisinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + topologyinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/topology/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller_test.go b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller_test.go index 02d6cc62fd4..0b17ce4c87e 100644 --- a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller_test.go +++ b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_controller_test.go @@ -30,11 +30,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) func TestReconcile(t *testing.T) { diff --git a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_indexes.go b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_indexes.go index eb58ad99580..b55d565e8d1 100644 --- a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_indexes.go +++ b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_indexes.go @@ -21,8 +21,8 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client" ) const ( diff --git a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_reconcile.go b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_reconcile.go index 63cf26d79f4..09cd8556104 100644 --- a/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_reconcile.go +++ b/pkg/reconciler/apis/apiexportendpointslice/apiexportendpointslice_reconcile.go @@ -30,13 +30,13 @@ import ( "k8s.io/klog/v2" virtualworkspacesoptions "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" apiexportbuilder "github.com/kcp-dev/kcp/pkg/virtual/apiexport/builder" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) type endpointsReconciler struct { diff --git a/pkg/reconciler/apis/apiresource/controller.go b/pkg/reconciler/apis/apiresource/controller.go index ca65d8f0939..edfa9cdfe77 100644 --- a/pkg/reconciler/apis/apiresource/controller.go +++ b/pkg/reconciler/apis/apiresource/controller.go @@ -36,11 +36,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apiresourceinformer "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apiresource/v1alpha1" - apiresourcev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apiresource/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apiresourceinformer "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apiresource/v1alpha1" + apiresourcev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apiresource/v1alpha1" ) const clusterNameAndGVRIndexName = "clusterNameAndGVR" diff --git a/pkg/reconciler/apis/apiresource/negotiation.go b/pkg/reconciler/apis/apiresource/negotiation.go index 53e61e0c82f..2343610f3be 100644 --- a/pkg/reconciler/apis/apiresource/negotiation.go +++ b/pkg/reconciler/apis/apiresource/negotiation.go @@ -34,8 +34,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/klog/v2" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" "github.com/kcp-dev/kcp/pkg/schemacompat" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" ) func (c *Controller) process(ctx context.Context, key queueElement) error { diff --git a/pkg/reconciler/apis/crdcleanup/crdcleanup_controller.go b/pkg/reconciler/apis/crdcleanup/crdcleanup_controller.go index 741a65a1530..e69f31f872b 100644 --- a/pkg/reconciler/apis/crdcleanup/crdcleanup_controller.go +++ b/pkg/reconciler/apis/crdcleanup/crdcleanup_controller.go @@ -36,11 +36,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibinding" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/crdcleanup/crdcleanup_controller_test.go b/pkg/reconciler/apis/crdcleanup/crdcleanup_controller_test.go index ad2910ff67d..f5c5e01ec61 100644 --- a/pkg/reconciler/apis/crdcleanup/crdcleanup_controller_test.go +++ b/pkg/reconciler/apis/crdcleanup/crdcleanup_controller_test.go @@ -28,8 +28,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestBoundCRDDeletion(t *testing.T) { diff --git a/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller.go b/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller.go index 261cf95eb84..61bcba630b5 100644 --- a/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller.go +++ b/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller.go @@ -38,12 +38,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller_test.go b/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller_test.go index 7b7371ef78f..acc35d7a7e4 100644 --- a/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller_test.go +++ b/pkg/reconciler/apis/extraannotationsync/apibindingannotation_controller_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestSyncExtraAnnotationPatch(t *testing.T) { diff --git a/pkg/reconciler/apis/identitycache/api_export_identity_controller.go b/pkg/reconciler/apis/identitycache/api_export_identity_controller.go index d49632ace04..5865453c580 100644 --- a/pkg/reconciler/apis/identitycache/api_export_identity_controller.go +++ b/pkg/reconciler/apis/identitycache/api_export_identity_controller.go @@ -36,10 +36,10 @@ import ( "k8s.io/klog/v2" configshard "github.com/kcp-dev/kcp/config/shard" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/identitycache/api_export_identity_reconcile.go b/pkg/reconciler/apis/identitycache/api_export_identity_reconcile.go index 2373d5f232d..d88b488aaf9 100644 --- a/pkg/reconciler/apis/identitycache/api_export_identity_reconcile.go +++ b/pkg/reconciler/apis/identitycache/api_export_identity_reconcile.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" configshard "github.com/kcp-dev/kcp/config/shard" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/core" ) func (c *controller) reconcile(ctx context.Context) error { diff --git a/pkg/reconciler/apis/identitycache/api_export_identity_reconcile_test.go b/pkg/reconciler/apis/identitycache/api_export_identity_reconcile_test.go index f39af8c7d7f..a596e1863b8 100644 --- a/pkg/reconciler/apis/identitycache/api_export_identity_reconcile_test.go +++ b/pkg/reconciler/apis/identitycache/api_export_identity_reconcile_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestReconcile(t *testing.T) { diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_controller.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_controller.go index 882a0a2413d..dbddc48c66e 100644 --- a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_controller.go +++ b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_controller.go @@ -34,15 +34,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile.go index f3bae3e2747..1dbbcbb4e45 100644 --- a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile.go +++ b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile.go @@ -35,10 +35,10 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // reconcilePermissionClaims determines the resources that need to be labeled for access by a permission claim. diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile_test.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile_test.go index 37411b1af16..3662e299e5e 100644 --- a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile_test.go +++ b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_reconcile_test.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/require" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestClaimSetKeys(t *testing.T) { diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_controller.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_controller.go index 9aa2baa6bd2..284f54eb67b 100644 --- a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_controller.go +++ b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_controller.go @@ -35,12 +35,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/permissionclaim" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go index 03fe89841bd..555fa7ed3a7 100644 --- a/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go +++ b/pkg/reconciler/apis/permissionclaimlabel/permissionclaimlabel_resource_reconcile.go @@ -33,7 +33,7 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func (c *resourceController) reconcile(ctx context.Context, obj *unstructured.Unstructured, gvr *schema.GroupVersionResource) error { diff --git a/pkg/reconciler/apis/replicateclusterrole/replicateclusterrole_controller.go b/pkg/reconciler/apis/replicateclusterrole/replicateclusterrole_controller.go index 420445a15fd..34ef5d125b8 100644 --- a/pkg/reconciler/apis/replicateclusterrole/replicateclusterrole_controller.go +++ b/pkg/reconciler/apis/replicateclusterrole/replicateclusterrole_controller.go @@ -26,9 +26,9 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/util/sets" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterroles" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const ( diff --git a/pkg/reconciler/apis/replicateclusterrolebinding/replicateclusterrolebinding_controller.go b/pkg/reconciler/apis/replicateclusterrolebinding/replicateclusterrolebinding_controller.go index 31a11670f5e..26040c6c06a 100644 --- a/pkg/reconciler/apis/replicateclusterrolebinding/replicateclusterrolebinding_controller.go +++ b/pkg/reconciler/apis/replicateclusterrolebinding/replicateclusterrolebinding_controller.go @@ -20,9 +20,9 @@ import ( kcprbacinformers "github.com/kcp-dev/client-go/informers/rbac/v1" kcpkubernetesclientset "github.com/kcp-dev/client-go/kubernetes" - "github.com/kcp-dev/kcp/pkg/apis/apis" "github.com/kcp-dev/kcp/pkg/reconciler/apis/replicateclusterrole" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterrolebindings" + "github.com/kcp-dev/kcp/sdk/apis/apis" ) const ( diff --git a/pkg/reconciler/apis/replicatelogicalcluster/replicatelogicalcluster_controller.go b/pkg/reconciler/apis/replicatelogicalcluster/replicatelogicalcluster_controller.go index 2a18887d887..7e9cfc0573d 100644 --- a/pkg/reconciler/apis/replicatelogicalcluster/replicatelogicalcluster_controller.go +++ b/pkg/reconciler/apis/replicatelogicalcluster/replicatelogicalcluster_controller.go @@ -26,14 +26,14 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labellogicalcluster" "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/cache/labelclusterrolebindings/labelclusterrolebinding_reconcile.go b/pkg/reconciler/cache/labelclusterrolebindings/labelclusterrolebinding_reconcile.go index 0a14472ae0f..7b83f92f913 100644 --- a/pkg/reconciler/cache/labelclusterrolebindings/labelclusterrolebinding_reconcile.go +++ b/pkg/reconciler/cache/labelclusterrolebindings/labelclusterrolebinding_reconcile.go @@ -26,7 +26,7 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/genericcontrolplane" - kcpcorehelper "github.com/kcp-dev/kcp/pkg/apis/core/helper" + kcpcorehelper "github.com/kcp-dev/kcp/sdk/apis/core/helper" ) func (c *controller) reconcile(ctx context.Context, crb *rbacv1.ClusterRoleBinding) (bool, error) { diff --git a/pkg/reconciler/cache/labelclusterroles/labelclusterrole_reconcile.go b/pkg/reconciler/cache/labelclusterroles/labelclusterrole_reconcile.go index 68cce085a3b..656ea0aac1e 100644 --- a/pkg/reconciler/cache/labelclusterroles/labelclusterrole_reconcile.go +++ b/pkg/reconciler/cache/labelclusterroles/labelclusterrole_reconcile.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/klog/v2" - kcpcorehelper "github.com/kcp-dev/kcp/pkg/apis/core/helper" "github.com/kcp-dev/kcp/pkg/indexers" + kcpcorehelper "github.com/kcp-dev/kcp/sdk/apis/core/helper" ) func (c *controller) reconcile(ctx context.Context, rb *rbacv1.ClusterRole) (bool, error) { diff --git a/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_controller.go b/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_controller.go index f23203466bf..0f2f7751960 100644 --- a/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_controller.go +++ b/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_controller.go @@ -31,14 +31,14 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) type Controller interface { diff --git a/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_reconcile.go b/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_reconcile.go index 28aa5ae863d..3509bbaca57 100644 --- a/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_reconcile.go +++ b/pkg/reconciler/cache/labellogicalcluster/labellogicalcluster_reconcile.go @@ -21,8 +21,8 @@ import ( "k8s.io/klog/v2" - kcpcorehelper "github.com/kcp-dev/kcp/pkg/apis/core/helper" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + kcpcorehelper "github.com/kcp-dev/kcp/sdk/apis/core/helper" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func (c *controller) reconcile(ctx context.Context, cluster *corev1alpha1.LogicalCluster) (bool, error) { diff --git a/pkg/reconciler/cache/replication/replication_controller.go b/pkg/reconciler/cache/replication/replication_controller.go index eeca2a22a02..8b0ade248b7 100644 --- a/pkg/reconciler/cache/replication/replication_controller.go +++ b/pkg/reconciler/cache/replication/replication_controller.go @@ -36,17 +36,17 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" cacheclient "github.com/kcp-dev/kcp/pkg/cache/client" "github.com/kcp-dev/kcp/pkg/cache/client/shard" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const ( diff --git a/pkg/reconciler/cache/replication/replication_reconcile_unstructured_test.go b/pkg/reconciler/cache/replication/replication_reconcile_unstructured_test.go index 1beee584a9e..e6f81441155 100644 --- a/pkg/reconciler/cache/replication/replication_reconcile_unstructured_test.go +++ b/pkg/reconciler/cache/replication/replication_reconcile_unstructured_test.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestEnsureUnstructuredSpec(t *testing.T) { diff --git a/pkg/reconciler/coordination/deployment/deployment_controller.go b/pkg/reconciler/coordination/deployment/deployment_controller.go index 6c4e8108487..7486c74b1d9 100644 --- a/pkg/reconciler/coordination/deployment/deployment_controller.go +++ b/pkg/reconciler/coordination/deployment/deployment_controller.go @@ -41,10 +41,10 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/workload/helpers" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + "github.com/kcp-dev/kcp/sdk/apis/workload/helpers" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/tmc/pkg/coordination" ) diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_controller.go b/pkg/reconciler/core/logicalcluster/logicalcluster_controller.go index 714a8f2b536..48cfdce804b 100644 --- a/pkg/reconciler/core/logicalcluster/logicalcluster_controller.go +++ b/pkg/reconciler/core/logicalcluster/logicalcluster_controller.go @@ -31,13 +31,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile.go index 2384aae7862..b7838413c20 100644 --- a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile.go +++ b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile.go @@ -21,7 +21,7 @@ import ( utilserrors "k8s.io/apimachinery/pkg/util/errors" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) type reconcileStatus int diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata.go index f1c5c402c60..0882ca309cc 100644 --- a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata.go +++ b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata.go @@ -25,9 +25,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) type metaDataReconciler struct { diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata_test.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata_test.go index 0900d34d40c..bd4e7499162 100644 --- a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata_test.go +++ b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_metadata_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func TestReconcileMetadata(t *testing.T) { diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_phase.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_phase.go index 09705d6bbb7..b9631368819 100644 --- a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_phase.go +++ b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_phase.go @@ -19,10 +19,10 @@ package logicalcluster import ( "context" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) type phaseReconciler struct{} diff --git a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_url.go b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_url.go index 1db5f1931c8..f3ea639e6e8 100644 --- a/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_url.go +++ b/pkg/reconciler/core/logicalcluster/logicalcluster_reconcile_url.go @@ -22,7 +22,7 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) type urlReconciler struct { diff --git a/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor.go b/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor.go index 43cfd555de5..d3130742f7f 100644 --- a/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor.go +++ b/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor.go @@ -50,12 +50,12 @@ import ( "k8s.io/client-go/discovery" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/projection" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) const ( diff --git a/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor_test.go b/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor_test.go index 22102bd2923..2461a5d01fe 100644 --- a/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor_test.go +++ b/pkg/reconciler/core/logicalclusterdeletion/deletion/logicalcluster_resource_deletor_test.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) var scheme *runtime.Scheme diff --git a/pkg/reconciler/core/logicalclusterdeletion/logicalcluster_deletion_controller.go b/pkg/reconciler/core/logicalclusterdeletion/logicalcluster_deletion_controller.go index 9ebe3dd6172..80b44e41f31 100644 --- a/pkg/reconciler/core/logicalclusterdeletion/logicalcluster_deletion_controller.go +++ b/pkg/reconciler/core/logicalclusterdeletion/logicalcluster_deletion_controller.go @@ -41,14 +41,14 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" "github.com/kcp-dev/kcp/pkg/reconciler/core/logicalclusterdeletion/deletion" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/core/replicateclusterrole/replicateclusterrole_controller.go b/pkg/reconciler/core/replicateclusterrole/replicateclusterrole_controller.go index 64c5341376f..60f00591781 100644 --- a/pkg/reconciler/core/replicateclusterrole/replicateclusterrole_controller.go +++ b/pkg/reconciler/core/replicateclusterrole/replicateclusterrole_controller.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterroles" "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/core/replicateclusterrolebinding/replicateclusterrolebinding_controller.go b/pkg/reconciler/core/replicateclusterrolebinding/replicateclusterrolebinding_controller.go index 21ae95a7469..e156fb8c0f3 100644 --- a/pkg/reconciler/core/replicateclusterrolebinding/replicateclusterrolebinding_controller.go +++ b/pkg/reconciler/core/replicateclusterrolebinding/replicateclusterrolebinding_controller.go @@ -24,12 +24,12 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/client-go/tools/cache" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterrolebindings" "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication" "github.com/kcp-dev/kcp/pkg/reconciler/core/replicateclusterrole" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/core/shard/shard_controller.go b/pkg/reconciler/core/shard/shard_controller.go index ba2ad73a4dd..dc4c1adc7fc 100644 --- a/pkg/reconciler/core/shard/shard_controller.go +++ b/pkg/reconciler/core/shard/shard_controller.go @@ -32,12 +32,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/garbagecollector/garbagecollector_controller.go b/pkg/reconciler/garbagecollector/garbagecollector_controller.go index a85849f7621..995e53aeec0 100644 --- a/pkg/reconciler/garbagecollector/garbagecollector_controller.go +++ b/pkg/reconciler/garbagecollector/garbagecollector_controller.go @@ -37,11 +37,11 @@ import ( "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/controller/garbagecollector" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/projection" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/kubequota/kubequota_controller.go b/pkg/reconciler/kubequota/kubequota_controller.go index 012d7e9ec5e..2b4aa2caafc 100644 --- a/pkg/reconciler/kubequota/kubequota_controller.go +++ b/pkg/reconciler/kubequota/kubequota_controller.go @@ -40,10 +40,10 @@ import ( "k8s.io/kubernetes/pkg/controller/resourcequota" "k8s.io/kubernetes/pkg/quota/v1/install" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/scheduling/location/location_controller.go b/pkg/reconciler/scheduling/location/location_controller.go index 9e98f6c739a..dec935212e6 100644 --- a/pkg/reconciler/scheduling/location/location_controller.go +++ b/pkg/reconciler/scheduling/location/location_controller.go @@ -33,16 +33,16 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - schedulingv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/pkg/reconciler/scheduling/location/location_reconcile.go b/pkg/reconciler/scheduling/location/location_reconcile.go index e806b4d268f..391052ddbd4 100644 --- a/pkg/reconciler/scheduling/location/location_reconcile.go +++ b/pkg/reconciler/scheduling/location/location_reconcile.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/labels" utilserrors "k8s.io/apimachinery/pkg/util/errors" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type reconcileStatus int diff --git a/pkg/reconciler/scheduling/location/location_reconcile_test.go b/pkg/reconciler/scheduling/location/location_reconcile_test.go index cd5d0696ff3..c7537792b50 100644 --- a/pkg/reconciler/scheduling/location/location_reconcile_test.go +++ b/pkg/reconciler/scheduling/location/location_reconcile_test.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type LocationCheck func(t *testing.T, l *schedulingv1alpha1.Location) diff --git a/pkg/reconciler/scheduling/location/workloadcluster_helpers.go b/pkg/reconciler/scheduling/location/workloadcluster_helpers.go index f0278b77dac..99d035ff9b0 100644 --- a/pkg/reconciler/scheduling/location/workloadcluster_helpers.go +++ b/pkg/reconciler/scheduling/location/workloadcluster_helpers.go @@ -23,10 +23,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // LocationSyncTargets returns a list of sync targets that match the given location definition. diff --git a/pkg/reconciler/scheduling/placement/placement_controller.go b/pkg/reconciler/scheduling/placement/placement_controller.go index 08cb7197fb9..223be803ccf 100644 --- a/pkg/reconciler/scheduling/placement/placement_controller.go +++ b/pkg/reconciler/scheduling/placement/placement_controller.go @@ -38,15 +38,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/core" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - schedulingv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + "github.com/kcp-dev/kcp/sdk/apis/core" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" ) const ( diff --git a/pkg/reconciler/scheduling/placement/placement_indexes.go b/pkg/reconciler/scheduling/placement/placement_indexes.go index afb6f133601..3a3d59e80ba 100644 --- a/pkg/reconciler/scheduling/placement/placement_indexes.go +++ b/pkg/reconciler/scheduling/placement/placement_indexes.go @@ -21,7 +21,7 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) func indexByLocationWorkspace(obj interface{}) ([]string, error) { diff --git a/pkg/reconciler/scheduling/placement/placement_reconcile.go b/pkg/reconciler/scheduling/placement/placement_reconcile.go index a4ac4b984e9..767e6088d8e 100644 --- a/pkg/reconciler/scheduling/placement/placement_reconcile.go +++ b/pkg/reconciler/scheduling/placement/placement_reconcile.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/labels" utilserrors "k8s.io/apimachinery/pkg/util/errors" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) type reconcileStatus int diff --git a/pkg/reconciler/scheduling/placement/placement_reconcile_namespace.go b/pkg/reconciler/scheduling/placement/placement_reconcile_namespace.go index ab66e775fd0..e4eadfc86cf 100644 --- a/pkg/reconciler/scheduling/placement/placement_reconcile_namespace.go +++ b/pkg/reconciler/scheduling/placement/placement_reconcile_namespace.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" utilserrors "k8s.io/apimachinery/pkg/util/errors" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) // placementNamespaceReconciler checks the namespaces bound to this placement and set the phase. diff --git a/pkg/reconciler/scheduling/placement/placement_reconcile_namespace_test.go b/pkg/reconciler/scheduling/placement/placement_reconcile_namespace_test.go index b758585e950..94c631d75cd 100644 --- a/pkg/reconciler/scheduling/placement/placement_reconcile_namespace_test.go +++ b/pkg/reconciler/scheduling/placement/placement_reconcile_namespace_test.go @@ -26,7 +26,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) func TestPlacementPhase(t *testing.T) { diff --git a/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go b/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go index 173c1e64cae..e9d453e87b8 100644 --- a/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go +++ b/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling.go @@ -26,9 +26,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/kube-openapi/pkg/util/sets" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // placementReconciler watches namespaces within a workspace and assigns those to location from diff --git a/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling_test.go b/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling_test.go index e89910d3104..fbf87238e76 100644 --- a/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling_test.go +++ b/pkg/reconciler/scheduling/placement/placement_reconcile_scheduling_test.go @@ -27,8 +27,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func TestPlacementScheduling(t *testing.T) { diff --git a/pkg/reconciler/tenancy/bootstrap/bootstrap_controller.go b/pkg/reconciler/tenancy/bootstrap/bootstrap_controller.go index 20ef8d58d37..f972257a557 100644 --- a/pkg/reconciler/tenancy/bootstrap/bootstrap_controller.go +++ b/pkg/reconciler/tenancy/bootstrap/bootstrap_controller.go @@ -35,15 +35,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/tenancy/bootstrap/bootstrap_reconcile.go b/pkg/reconciler/tenancy/bootstrap/bootstrap_reconcile.go index 7a38431d236..0ad3cf95c78 100644 --- a/pkg/reconciler/tenancy/bootstrap/bootstrap_reconcile.go +++ b/pkg/reconciler/tenancy/bootstrap/bootstrap_reconcile.go @@ -24,8 +24,8 @@ import ( "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" ) func (c *controller) reconcile(ctx context.Context, workspace *corev1alpha1.LogicalCluster) error { diff --git a/pkg/reconciler/tenancy/initialization/apibinder_initializer_controller.go b/pkg/reconciler/tenancy/initialization/apibinder_initializer_controller.go index 72fd177a90d..5b3916a7f5f 100644 --- a/pkg/reconciler/tenancy/initialization/apibinder_initializer_controller.go +++ b/pkg/reconciler/tenancy/initialization/apibinder_initializer_controller.go @@ -36,17 +36,17 @@ import ( "k8s.io/klog/v2" admission "github.com/kcp-dev/kcp/pkg/admission/workspacetypeexists" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - tenancyv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + tenancyv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" ) const ( diff --git a/pkg/reconciler/tenancy/initialization/apibinder_initializer_reconcile.go b/pkg/reconciler/tenancy/initialization/apibinder_initializer_reconcile.go index 65078fa6521..1c4bbd02b33 100644 --- a/pkg/reconciler/tenancy/initialization/apibinder_initializer_reconcile.go +++ b/pkg/reconciler/tenancy/initialization/apibinder_initializer_reconcile.go @@ -32,13 +32,13 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/logging" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func (b *APIBinder) reconcile(ctx context.Context, logicalCluster *corev1alpha1.LogicalCluster) error { diff --git a/pkg/reconciler/tenancy/logicalcluster/logicalcluster_controller.go b/pkg/reconciler/tenancy/logicalcluster/logicalcluster_controller.go index 89e02bc8a3f..6a23a1d1620 100644 --- a/pkg/reconciler/tenancy/logicalcluster/logicalcluster_controller.go +++ b/pkg/reconciler/tenancy/logicalcluster/logicalcluster_controller.go @@ -38,11 +38,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ( diff --git a/pkg/reconciler/tenancy/replicateclusterrole/replicateclusterrole_controller.go b/pkg/reconciler/tenancy/replicateclusterrole/replicateclusterrole_controller.go index e3cc52ef3f4..6618dba666c 100644 --- a/pkg/reconciler/tenancy/replicateclusterrole/replicateclusterrole_controller.go +++ b/pkg/reconciler/tenancy/replicateclusterrole/replicateclusterrole_controller.go @@ -24,8 +24,8 @@ import ( rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/util/sets" - "github.com/kcp-dev/kcp/pkg/apis/tenancy" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterroles" + "github.com/kcp-dev/kcp/sdk/apis/tenancy" ) const ( diff --git a/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go b/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go index e89c9cfb560..dcaefe93920 100644 --- a/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go +++ b/pkg/reconciler/tenancy/replicateclusterrolebinding/replicateclusterrolebinding_controller.go @@ -23,9 +23,9 @@ import ( rbacv1 "k8s.io/api/rbac/v1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labelclusterrolebindings" replicateclusterrole "github.com/kcp-dev/kcp/pkg/reconciler/tenancy/replicateclusterrole" + "github.com/kcp-dev/kcp/sdk/apis/tenancy" ) const ( diff --git a/pkg/reconciler/tenancy/replicatelogicalcluster/replicatelogicalcluster_controller.go b/pkg/reconciler/tenancy/replicatelogicalcluster/replicatelogicalcluster_controller.go index 9d090772d60..92702ab0296 100644 --- a/pkg/reconciler/tenancy/replicatelogicalcluster/replicatelogicalcluster_controller.go +++ b/pkg/reconciler/tenancy/replicatelogicalcluster/replicatelogicalcluster_controller.go @@ -26,14 +26,14 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/client-go/tools/cache" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - tenancyv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/reconciler/cache/labellogicalcluster" "github.com/kcp-dev/kcp/pkg/reconciler/cache/replication" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + tenancyv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" ) const ( diff --git a/pkg/reconciler/tenancy/workspace/workspace_controller.go b/pkg/reconciler/tenancy/workspace/workspace_controller.go index 500d314d9fe..4d22e550b06 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_controller.go +++ b/pkg/reconciler/tenancy/workspace/workspace_controller.go @@ -33,16 +33,16 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - tenancyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - tenancyv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + tenancyv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) const ( diff --git a/pkg/reconciler/tenancy/workspace/workspace_indexes.go b/pkg/reconciler/tenancy/workspace/workspace_indexes.go index 8333916abd5..d4d6089d326 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_indexes.go +++ b/pkg/reconciler/tenancy/workspace/workspace_indexes.go @@ -22,9 +22,9 @@ import ( "github.com/martinlindhe/base36" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) const ( diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile.go index 609a10ab4b2..1ecacd857f2 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile.go @@ -31,11 +31,11 @@ import ( restclient "k8s.io/client-go/rest" "github.com/kcp-dev/kcp/pkg/admission/workspacetypeexists" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/indexers" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) type reconcileStatus int diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_deletion.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_deletion.go index 429951ca152..19c06486e10 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile_deletion.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile_deletion.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) type deletionReconciler struct { diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata.go index 602638ce5df..4a3d556b2d3 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata.go @@ -23,8 +23,8 @@ import ( authenticationv1 "k8s.io/api/authentication/v1" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) type metaDataReconciler struct { diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata_test.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata_test.go index e278c7f9b17..9c1e945a215 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata_test.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile_metadata_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) func TestReconcileMetadata(t *testing.T) { diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_phase.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_phase.go index 3ba228a30e4..99648ff7974 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile_phase.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile_phase.go @@ -25,10 +25,10 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) type phaseReconciler struct { diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go index 8699de0c76e..975277a65a1 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling.go @@ -38,15 +38,15 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/pkg/admission/workspacetypeexists" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/authorization" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/logging" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) const ( diff --git a/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling_test.go b/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling_test.go index 4ac3a0ef796..6541c146460 100644 --- a/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling_test.go +++ b/pkg/reconciler/tenancy/workspace/workspace_reconcile_scheduling_test.go @@ -41,13 +41,13 @@ import ( "k8s.io/client-go/tools/cache" "github.com/kcp-dev/kcp/pkg/admission/workspacetypeexists" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpfakeclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/fake" "github.com/kcp-dev/kcp/pkg/indexers" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpfakeclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/fake" ) func TestReconcileScheduling(t *testing.T) { diff --git a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller.go b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller.go index 7ed670188c0..3c9ad42422e 100644 --- a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller.go +++ b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller.go @@ -32,16 +32,16 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - tenancyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - tenancyinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + tenancyinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) const ( diff --git a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go index 120978d10e3..63b450baf61 100644 --- a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go +++ b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile.go @@ -26,11 +26,11 @@ import ( "k8s.io/klog/v2" virtualworkspacesoptions "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func (c *controller) reconcile(ctx context.Context, wt *tenancyv1alpha1.WorkspaceType) { diff --git a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile_test.go b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile_test.go index 6a2495f36e0..a79a2a272d0 100644 --- a/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile_test.go +++ b/pkg/reconciler/tenancy/workspacetype/workspacetype_controller_reconcile_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestReconcile(t *testing.T) { diff --git a/pkg/reconciler/topology/partitionset/partitioning_test.go b/pkg/reconciler/topology/partitionset/partitioning_test.go index 87b411e7445..a312f388680 100644 --- a/pkg/reconciler/topology/partitionset/partitioning_test.go +++ b/pkg/reconciler/topology/partitionset/partitioning_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func TestPartition(t *testing.T) { diff --git a/pkg/reconciler/topology/partitionset/partitionset_controller.go b/pkg/reconciler/topology/partitionset/partitionset_controller.go index 2ed2d9469bd..c1ee14f8280 100644 --- a/pkg/reconciler/topology/partitionset/partitionset_controller.go +++ b/pkg/reconciler/topology/partitionset/partitionset_controller.go @@ -36,14 +36,14 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - topologyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" - coreinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - topologyinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/topology/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + topologyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" + coreinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + topologyinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/topology/v1alpha1" ) const ( diff --git a/pkg/reconciler/topology/partitionset/partitionset_controller_test.go b/pkg/reconciler/topology/partitionset/partitionset_controller_test.go index 4a869a0ec50..1cc0e399ae0 100644 --- a/pkg/reconciler/topology/partitionset/partitionset_controller_test.go +++ b/pkg/reconciler/topology/partitionset/partitionset_controller_test.go @@ -29,10 +29,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) func TestReconcile(t *testing.T) { diff --git a/pkg/reconciler/topology/partitionset/partitionset_reconcile.go b/pkg/reconciler/topology/partitionset/partitionset_reconcile.go index 4dee08ae90b..3f5e5e87caa 100644 --- a/pkg/reconciler/topology/partitionset/partitionset_reconcile.go +++ b/pkg/reconciler/topology/partitionset/partitionset_reconcile.go @@ -29,11 +29,11 @@ import ( "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/util/sets" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) func (c *controller) reconcile(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSet) error { diff --git a/pkg/reconciler/topology/partitionset/resources.go b/pkg/reconciler/topology/partitionset/resources.go index 14f118a4365..c3779a02864 100644 --- a/pkg/reconciler/topology/partitionset/resources.go +++ b/pkg/reconciler/topology/partitionset/resources.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) // generatePartition generates the Partition specifications based on diff --git a/pkg/reconciler/workload/apiexport/apiresourceschema.go b/pkg/reconciler/workload/apiexport/apiresourceschema.go index 330f955a32b..db7156072c1 100644 --- a/pkg/reconciler/workload/apiexport/apiresourceschema.go +++ b/pkg/reconciler/workload/apiexport/apiresourceschema.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func toAPIResourceSchema(r *apiresourcev1alpha1.NegotiatedAPIResource, name string) *apisv1alpha1.APIResourceSchema { diff --git a/pkg/reconciler/workload/apiexport/workload_apiexport_controller.go b/pkg/reconciler/workload/apiexport/workload_apiexport_controller.go index 25b5c240ff4..81b69bb4081 100644 --- a/pkg/reconciler/workload/apiexport/workload_apiexport_controller.go +++ b/pkg/reconciler/workload/apiexport/workload_apiexport_controller.go @@ -31,17 +31,17 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apiresourcev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apiresource/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - apiresourcev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apiresource/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apiresourcev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apiresource/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + apiresourcev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apiresource/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile.go b/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile.go index 0339c932879..99287af830f 100644 --- a/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile.go +++ b/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile.go @@ -34,10 +34,10 @@ import ( "k8s.io/klog/v2" "github.com/kcp-dev/kcp/config/rootcompute" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type reconcileStatus int diff --git a/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile_test.go b/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile_test.go index 5a586a44d69..7ea8dc5b805 100644 --- a/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile_test.go +++ b/pkg/reconciler/workload/apiexport/workload_apiexport_reconcile_test.go @@ -35,10 +35,10 @@ import ( "sigs.k8s.io/yaml" "github.com/kcp-dev/kcp/config/rootcompute" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type SchemaCheck func(t *testing.T, s *apisv1alpha1.APIResourceSchema) diff --git a/pkg/reconciler/workload/apiexportcreate/apiexportcreate_controller.go b/pkg/reconciler/workload/apiexportcreate/apiexportcreate_controller.go index b7f9a02f259..514dc46b058 100644 --- a/pkg/reconciler/workload/apiexportcreate/apiexportcreate_controller.go +++ b/pkg/reconciler/workload/apiexportcreate/apiexportcreate_controller.go @@ -36,18 +36,18 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - schedulingv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" reconcilerapiexport "github.com/kcp-dev/kcp/pkg/reconciler/workload/apiexport" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + schedulingv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/pkg/reconciler/workload/heartbeat/heartbeat_controller.go b/pkg/reconciler/workload/heartbeat/heartbeat_controller.go index 6070b17931b..816df179bf4 100644 --- a/pkg/reconciler/workload/heartbeat/heartbeat_controller.go +++ b/pkg/reconciler/workload/heartbeat/heartbeat_controller.go @@ -32,12 +32,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - workloadv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + workloadv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" ) const ControllerName = "kcp-synctarget-heartbeat" diff --git a/pkg/reconciler/workload/heartbeat/heartbeat_reconciler.go b/pkg/reconciler/workload/heartbeat/heartbeat_reconciler.go index 21050d2fe95..ed4577ba3a7 100644 --- a/pkg/reconciler/workload/heartbeat/heartbeat_reconciler.go +++ b/pkg/reconciler/workload/heartbeat/heartbeat_reconciler.go @@ -22,9 +22,9 @@ import ( "k8s.io/klog/v2" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func (c *Controller) reconcile(ctx context.Context, key string, cluster *workloadv1alpha1.SyncTarget) error { diff --git a/pkg/reconciler/workload/heartbeat/heartbeat_reconciler_test.go b/pkg/reconciler/workload/heartbeat/heartbeat_reconciler_test.go index 4e04739ac30..c59f18443e6 100644 --- a/pkg/reconciler/workload/heartbeat/heartbeat_reconciler_test.go +++ b/pkg/reconciler/workload/heartbeat/heartbeat_reconciler_test.go @@ -25,8 +25,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/util/workqueue" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type fakeDelayingQueue struct { diff --git a/pkg/reconciler/workload/namespace/namespace_controller.go b/pkg/reconciler/workload/namespace/namespace_controller.go index e4488154da7..15c535ba442 100644 --- a/pkg/reconciler/workload/namespace/namespace_controller.go +++ b/pkg/reconciler/workload/namespace/namespace_controller.go @@ -42,11 +42,11 @@ import ( "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/util/sets" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - schedulingv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apiexport" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + schedulingv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" ) const ( diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile.go b/pkg/reconciler/workload/namespace/namespace_reconcile.go index 842d86b4ed8..aeb6d7c859b 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/labels" utilserrors "k8s.io/apimachinery/pkg/util/errors" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) type reconcileStatus int diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind.go b/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind.go index 3be7a7d44db..b0b58cbba77 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // bindNamespaceReconciler updates the existing annotation and creates an empty one if diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind_test.go b/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind_test.go index 400728614d2..f92f6b292d9 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind_test.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile_placementbind_test.go @@ -29,9 +29,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) func TestBindPlacement(t *testing.T) { diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling.go b/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling.go index 1ad7c34a7fc..091417a815c 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling.go @@ -31,8 +31,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const removingGracePeriod = 5 * time.Second diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling_test.go b/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling_test.go index 4dcbcb60c82..f0c4fcbe65a 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling_test.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile_scheduling_test.go @@ -28,8 +28,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestScheduling(t *testing.T) { diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile_status.go b/pkg/reconciler/workload/namespace/namespace_reconcile_status.go index 2e2d1d3acfe..42219742467 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile_status.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile_status.go @@ -30,9 +30,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) const ( diff --git a/pkg/reconciler/workload/namespace/namespace_reconcile_status_test.go b/pkg/reconciler/workload/namespace/namespace_reconcile_status_test.go index 6b78680a748..7772056f5ad 100644 --- a/pkg/reconciler/workload/namespace/namespace_reconcile_status_test.go +++ b/pkg/reconciler/workload/namespace/namespace_reconcile_status_test.go @@ -24,10 +24,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestSetScheduledCondition(t *testing.T) { diff --git a/pkg/reconciler/workload/placement/placement_controller.go b/pkg/reconciler/workload/placement/placement_controller.go index c1e8b92dcdf..215a4ad5f2d 100644 --- a/pkg/reconciler/workload/placement/placement_controller.go +++ b/pkg/reconciler/workload/placement/placement_controller.go @@ -35,23 +35,23 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - apisinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - schedulinginformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" - workloadinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - apislisters "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" + apisinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + schedulinginformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" + workloadinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + apislisters "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/pkg/reconciler/workload/placement/placement_indexes.go b/pkg/reconciler/workload/placement/placement_indexes.go index b24e74a19b3..3398c644655 100644 --- a/pkg/reconciler/workload/placement/placement_indexes.go +++ b/pkg/reconciler/workload/placement/placement_indexes.go @@ -19,7 +19,7 @@ package placement import ( "fmt" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) func indexBySelectedLocationPath(obj interface{}) ([]string, error) { diff --git a/pkg/reconciler/workload/placement/placement_reconcile.go b/pkg/reconciler/workload/placement/placement_reconcile.go index adc1e0dd451..2b39536585a 100644 --- a/pkg/reconciler/workload/placement/placement_reconcile.go +++ b/pkg/reconciler/workload/placement/placement_reconcile.go @@ -27,10 +27,10 @@ import ( utilserrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type reconcileStatus int diff --git a/pkg/reconciler/workload/placement/placement_reconcile_scheduling.go b/pkg/reconciler/workload/placement/placement_reconcile_scheduling.go index bb109c8cbe3..7c135818de5 100644 --- a/pkg/reconciler/workload/placement/placement_reconcile_scheduling.go +++ b/pkg/reconciler/workload/placement/placement_reconcile_scheduling.go @@ -31,12 +31,12 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" locationreconciler "github.com/kcp-dev/kcp/pkg/reconciler/scheduling/location" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // placementSchedulingReconciler schedules placments according to the selected locations. diff --git a/pkg/reconciler/workload/placement/placement_reconcile_scheduling_test.go b/pkg/reconciler/workload/placement/placement_reconcile_scheduling_test.go index f2cff533302..98effd47165 100644 --- a/pkg/reconciler/workload/placement/placement_reconcile_scheduling_test.go +++ b/pkg/reconciler/workload/placement/placement_reconcile_scheduling_test.go @@ -31,11 +31,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestSchedulingReconcile(t *testing.T) { diff --git a/pkg/reconciler/workload/resource/resource_controller.go b/pkg/reconciler/workload/resource/resource_controller.go index 0d017f2d544..29522908d92 100644 --- a/pkg/reconciler/workload/resource/resource_controller.go +++ b/pkg/reconciler/workload/resource/resource_controller.go @@ -44,15 +44,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - schedulingv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apiexport" "github.com/kcp-dev/kcp/pkg/syncer/shared" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + schedulingv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" ) const ( diff --git a/pkg/reconciler/workload/resource/resource_reconcile.go b/pkg/reconciler/workload/resource/resource_reconcile.go index bf557d3e4e2..678aa0d9073 100644 --- a/pkg/reconciler/workload/resource/resource_reconcile.go +++ b/pkg/reconciler/workload/resource/resource_reconcile.go @@ -36,9 +36,9 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" syncershared "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // reconcileResource is responsible for setting the cluster for a resource of diff --git a/pkg/reconciler/workload/synctarget/synctarget_controller.go b/pkg/reconciler/workload/synctarget/synctarget_controller.go index ef139987949..b4a73737c2b 100644 --- a/pkg/reconciler/workload/synctarget/synctarget_controller.go +++ b/pkg/reconciler/workload/synctarget/synctarget_controller.go @@ -36,13 +36,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) const ControllerName = "kcp-synctarget-controller" diff --git a/pkg/reconciler/workload/synctarget/synctarget_reconcile.go b/pkg/reconciler/workload/synctarget/synctarget_reconcile.go index d4cc7e007fa..e9c1fb3efc3 100644 --- a/pkg/reconciler/workload/synctarget/synctarget_reconcile.go +++ b/pkg/reconciler/workload/synctarget/synctarget_reconcile.go @@ -28,8 +28,8 @@ import ( "k8s.io/klog/v2" virtualworkspacesoptions "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" syncerbuilder "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/builder" ) diff --git a/pkg/reconciler/workload/synctarget/synctarget_reconcile_test.go b/pkg/reconciler/workload/synctarget/synctarget_reconcile_test.go index 3c51b49fed1..4c253852702 100644 --- a/pkg/reconciler/workload/synctarget/synctarget_reconcile_test.go +++ b/pkg/reconciler/workload/synctarget/synctarget_reconcile_test.go @@ -26,8 +26,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestReconciler(t *testing.T) { diff --git a/pkg/reconciler/workload/synctargetexports/synctarget_indexes.go b/pkg/reconciler/workload/synctargetexports/synctarget_indexes.go index d572055a44d..94f84ac64e5 100644 --- a/pkg/reconciler/workload/synctargetexports/synctarget_indexes.go +++ b/pkg/reconciler/workload/synctargetexports/synctarget_indexes.go @@ -22,9 +22,9 @@ import ( kcpcache "github.com/kcp-dev/apimachinery/v2/pkg/cache" "github.com/kcp-dev/logicalcluster/v3" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" reconcilerapiexport "github.com/kcp-dev/kcp/pkg/reconciler/workload/apiexport" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // indexAPIExportsByAPIResourceSchemasFunc is an index function that maps an APIExport to its spec.latestResourceSchemas. diff --git a/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile.go b/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile.go index cf1463ecaed..cb3e7922b5b 100644 --- a/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile.go +++ b/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile.go @@ -27,10 +27,10 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/validation/field" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/schemacompat" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // apiCompatibleReconciler sets state for each synced resource based on resource schema and apiimports. diff --git a/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile_test.go b/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile_test.go index 5ead007ce92..d5ae8b985f2 100644 --- a/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile_test.go +++ b/pkg/reconciler/workload/synctargetexports/synctargetcompatible_reconcile_test.go @@ -29,10 +29,10 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestSyncTargetCompatibleReconcile(t *testing.T) { diff --git a/pkg/reconciler/workload/synctargetexports/synctargetexports_controller.go b/pkg/reconciler/workload/synctargetexports/synctargetexports_controller.go index c5e983040ce..c3a376656fb 100644 --- a/pkg/reconciler/workload/synctargetexports/synctargetexports_controller.go +++ b/pkg/reconciler/workload/synctargetexports/synctargetexports_controller.go @@ -35,21 +35,21 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - workloadv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" - apiresourcev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apiresource/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - apiresourcev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apiresource/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/committer" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + workloadv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" + apiresourcev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apiresource/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + apiresourcev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apiresource/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile.go b/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile.go index 97d34882447..259502a9765 100644 --- a/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile.go +++ b/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // exportReconciler updates syncedResource in SyncTarget status based on supportedAPIExports. diff --git a/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile_test.go b/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile_test.go index 935fae58815..60ea98879a0 100644 --- a/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile_test.go +++ b/pkg/reconciler/workload/synctargetexports/synctargetexports_reconcile_test.go @@ -28,9 +28,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestSyncTargetExportReconcile(t *testing.T) { diff --git a/pkg/server/apiextensions.go b/pkg/server/apiextensions.go index 8bcc8ee3076..2b6403f6c64 100644 --- a/pkg/server/apiextensions.go +++ b/pkg/server/apiextensions.go @@ -37,13 +37,13 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibinding" "github.com/kcp-dev/kcp/pkg/server/filters" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) // SystemCRDClusterName is the logical cluster we install system CRDs into for now. These are needed diff --git a/pkg/server/apiextensions_test.go b/pkg/server/apiextensions_test.go index dcca6001b22..a7f83e109a6 100644 --- a/pkg/server/apiextensions_test.go +++ b/pkg/server/apiextensions_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "github.com/kcp-dev/kcp/pkg/admission/reservedcrdgroups" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestSystemCRDsLogicalClusterName(t *testing.T) { diff --git a/pkg/server/bootstrap/identity.go b/pkg/server/bootstrap/identity.go index a4bd6fa7d03..01292728b99 100644 --- a/pkg/server/bootstrap/identity.go +++ b/pkg/server/bootstrap/identity.go @@ -36,12 +36,12 @@ import ( "k8s.io/klog/v2" configshard "github.com/kcp-dev/kcp/config/shard" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/reconciler/apis/identitycache" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) var ( diff --git a/pkg/server/config.go b/pkg/server/config.go index 1f4e9f683b3..7e51667b961 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -53,11 +53,8 @@ import ( quotainstall "k8s.io/kubernetes/pkg/quota/v1/install" kcpadmissioninitializers "github.com/kcp-dev/kcp/pkg/admission/initializers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/conversion" "github.com/kcp-dev/kcp/pkg/embeddedetcd" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" @@ -69,6 +66,9 @@ import ( "github.com/kcp-dev/kcp/pkg/server/options/batteries" "github.com/kcp-dev/kcp/pkg/server/requestinfo" "github.com/kcp-dev/kcp/pkg/tunneler" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type Config struct { diff --git a/pkg/server/controllers.go b/pkg/server/controllers.go index 1be0a03a0c4..4f4d53f7dce 100644 --- a/pkg/server/controllers.go +++ b/pkg/server/controllers.go @@ -47,11 +47,7 @@ import ( "k8s.io/kubernetes/pkg/serviceaccount" configuniversal "github.com/kcp-dev/kcp/config/universal" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibinding" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apibindingdeletion" @@ -83,6 +79,10 @@ import ( "github.com/kcp-dev/kcp/pkg/reconciler/topology/partitionset" workloadsapiexport "github.com/kcp-dev/kcp/pkg/reconciler/workload/apiexport" initializingworkspacesbuilder "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces/builder" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) func postStartHookName(controllerName string) string { diff --git a/pkg/server/home_workspaces.go b/pkg/server/home_workspaces.go index 4d3960b60c8..afccb7e7b64 100644 --- a/pkg/server/home_workspaces.go +++ b/pkg/server/home_workspaces.go @@ -41,18 +41,18 @@ import ( "github.com/kcp-dev/kcp/pkg/admission/workspace" "github.com/kcp-dev/kcp/pkg/admission/workspacetypeexists" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" indexrewriters "github.com/kcp-dev/kcp/pkg/index/rewriters" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" reconcilerworkspace "github.com/kcp-dev/kcp/pkg/reconciler/tenancy/workspace" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) var ( diff --git a/pkg/server/indexes.go b/pkg/server/indexes.go index b31cf348d9e..5749987a8af 100644 --- a/pkg/server/indexes.go +++ b/pkg/server/indexes.go @@ -21,7 +21,7 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) const ( diff --git a/pkg/server/localproxy.go b/pkg/server/localproxy.go index bff6de6194b..7064bf61f73 100644 --- a/pkg/server/localproxy.go +++ b/pkg/server/localproxy.go @@ -29,13 +29,13 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - corev1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - tenancyv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/index" indexrewriters "github.com/kcp-dev/kcp/pkg/index/rewriters" "github.com/kcp-dev/kcp/pkg/server/filters" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + corev1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + tenancyv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" ) // WithLocalProxy returns a handler with a local-only mini-front-proxy. It is diff --git a/pkg/server/options/authorization.go b/pkg/server/options/authorization.go index 38b07b32f0a..1e06a92d704 100644 --- a/pkg/server/options/authorization.go +++ b/pkg/server/options/authorization.go @@ -28,7 +28,7 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" authz "github.com/kcp-dev/kcp/pkg/authorization" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type Authorization struct { diff --git a/pkg/server/server.go b/pkg/server/server.go index f3cc88f3cb7..fcdf0623a79 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -38,13 +38,13 @@ import ( configrootphase0 "github.com/kcp-dev/kcp/config/root-phase0" configshard "github.com/kcp-dev/kcp/config/shard" systemcrds "github.com/kcp-dev/kcp/config/system-crds" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/informer" metadataclient "github.com/kcp-dev/kcp/pkg/metadata" virtualrootapiserver "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) const resyncPeriod = 10 * time.Hour diff --git a/pkg/server/virtual.go b/pkg/server/virtual.go index a86c811e6a9..6197f034dc0 100644 --- a/pkg/server/virtual.go +++ b/pkg/server/virtual.go @@ -31,10 +31,10 @@ import ( "k8s.io/client-go/rest" virtualcommandoptions "github.com/kcp-dev/kcp/cmd/virtual-workspaces/options" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" kcpserveroptions "github.com/kcp-dev/kcp/pkg/server/options" virtualrootapiserver "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" virtualoptions "github.com/kcp-dev/kcp/pkg/virtual/options" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type mux interface { diff --git a/pkg/syncer/apiimporter.go b/pkg/syncer/apiimporter.go index 10ca1c5dc2f..bee70f10486 100644 --- a/pkg/syncer/apiimporter.go +++ b/pkg/syncer/apiimporter.go @@ -37,15 +37,15 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclusterclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apiresourceinformer "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apiresource/v1alpha1" - workloadinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/crdpuller" "github.com/kcp-dev/kcp/pkg/logging" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclusterclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apiresourceinformer "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apiresource/v1alpha1" + workloadinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) var clusterKind = reflect.TypeOf(workloadv1alpha1.SyncTarget{}).Name() diff --git a/pkg/syncer/endpoints/endpoint_downstream_controller.go b/pkg/syncer/endpoints/endpoint_downstream_controller.go index da82cb896d7..040f496b439 100644 --- a/pkg/syncer/endpoints/endpoint_downstream_controller.go +++ b/pkg/syncer/endpoints/endpoint_downstream_controller.go @@ -38,10 +38,10 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/syncer/endpoints/endpoint_downstream_process.go b/pkg/syncer/endpoints/endpoint_downstream_process.go index 52bb1ac711f..b0f0b4d0e62 100644 --- a/pkg/syncer/endpoints/endpoint_downstream_process.go +++ b/pkg/syncer/endpoints/endpoint_downstream_process.go @@ -26,9 +26,9 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func (c *controller) process(ctx context.Context, key string) error { diff --git a/pkg/syncer/endpoints/endpoint_downstream_process_test.go b/pkg/syncer/endpoints/endpoint_downstream_process_test.go index 953f55623c6..fa5c450e045 100644 --- a/pkg/syncer/endpoints/endpoint_downstream_process_test.go +++ b/pkg/syncer/endpoints/endpoint_downstream_process_test.go @@ -35,8 +35,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/util/workqueue" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var scheme *runtime.Scheme diff --git a/pkg/syncer/namespace/namespace_downstream_process_test.go b/pkg/syncer/namespace/namespace_downstream_process_test.go index e32d6c8a154..daa7a6afb83 100644 --- a/pkg/syncer/namespace/namespace_downstream_process_test.go +++ b/pkg/syncer/namespace/namespace_downstream_process_test.go @@ -35,8 +35,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client" ) func TestSyncerNamespaceProcess(t *testing.T) { diff --git a/pkg/syncer/resourcesync/controller.go b/pkg/syncer/resourcesync/controller.go index 82b1ad1975a..8e62a21f477 100644 --- a/pkg/syncer/resourcesync/controller.go +++ b/pkg/syncer/resourcesync/controller.go @@ -48,14 +48,14 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - workloadv1alpha1typed "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + workloadv1alpha1typed "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/pkg/syncer/shared/finalizer.go b/pkg/syncer/shared/finalizer.go index 71c3f3b4852..a170dbd736c 100644 --- a/pkg/syncer/shared/finalizer.go +++ b/pkg/syncer/shared/finalizer.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/syncer/shared/helpers.go b/pkg/syncer/shared/helpers.go index c3eed6488e1..453fe8d9130 100644 --- a/pkg/syncer/shared/helpers.go +++ b/pkg/syncer/shared/helpers.go @@ -30,7 +30,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/kube-openapi/pkg/util/sets" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // SyncableClusterScopedResources holds a set of cluster-wide GVR that are allowed to be synced. diff --git a/pkg/syncer/spec/mutators/podspecable.go b/pkg/syncer/spec/mutators/podspecable.go index 1ebb765efbc..1fff756dbb4 100644 --- a/pkg/syncer/spec/mutators/podspecable.go +++ b/pkg/syncer/spec/mutators/podspecable.go @@ -31,8 +31,8 @@ import ( listerscorev1 "k8s.io/client-go/listers/core/v1" utilspointer "k8s.io/utils/pointer" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type ListSecretFunc func(clusterName logicalcluster.Name, namespace string) ([]runtime.Object, error) diff --git a/pkg/syncer/spec/mutators/podspecable_test.go b/pkg/syncer/spec/mutators/podspecable_test.go index c2d196ed24c..0ad69a3e682 100644 --- a/pkg/syncer/spec/mutators/podspecable_test.go +++ b/pkg/syncer/spec/mutators/podspecable_test.go @@ -36,8 +36,8 @@ import ( "k8s.io/client-go/tools/cache" utilspointer "k8s.io/utils/pointer" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var kcpApiAccessVolume = corev1.Volume{ diff --git a/pkg/syncer/spec/spec_controller.go b/pkg/syncer/spec/spec_controller.go index 36e31eeb04f..f57bc132fe7 100644 --- a/pkg/syncer/spec/spec_controller.go +++ b/pkg/syncer/spec/spec_controller.go @@ -43,13 +43,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" syncerindexers "github.com/kcp-dev/kcp/pkg/syncer/indexers" "github.com/kcp-dev/kcp/pkg/syncer/shared" "github.com/kcp-dev/kcp/pkg/syncer/spec/dns" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" . "github.com/kcp-dev/kcp/tmc/pkg/logging" ) diff --git a/pkg/syncer/spec/spec_process.go b/pkg/syncer/spec/spec_process.go index 831061301e1..dc8685ba34d 100644 --- a/pkg/syncer/spec/spec_process.go +++ b/pkg/syncer/spec/spec_process.go @@ -41,9 +41,9 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/pointer" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" . "github.com/kcp-dev/kcp/tmc/pkg/logging" ) diff --git a/pkg/syncer/spec/spec_process_test.go b/pkg/syncer/spec/spec_process_test.go index 4c6da831b67..fa3c9f13d52 100644 --- a/pkg/syncer/spec/spec_process_test.go +++ b/pkg/syncer/spec/spec_process_test.go @@ -54,12 +54,12 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/syncer/indexers" "github.com/kcp-dev/kcp/pkg/syncer/shared" "github.com/kcp-dev/kcp/pkg/syncer/spec/dns" "github.com/kcp-dev/kcp/pkg/syncer/spec/mutators" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var scheme *runtime.Scheme diff --git a/pkg/syncer/status/status_controller.go b/pkg/syncer/status/status_controller.go index d87dd812c8c..57ccea5663c 100644 --- a/pkg/syncer/status/status_controller.go +++ b/pkg/syncer/status/status_controller.go @@ -38,10 +38,10 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/syncer/status/status_process.go b/pkg/syncer/status/status_process.go index e0415a974d0..89fe6964a1b 100644 --- a/pkg/syncer/status/status_process.go +++ b/pkg/syncer/status/status_process.go @@ -34,10 +34,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" workloadcliplugin "github.com/kcp-dev/kcp/pkg/cliplugins/workload/plugin" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" . "github.com/kcp-dev/kcp/tmc/pkg/logging" ) diff --git a/pkg/syncer/status/status_process_test.go b/pkg/syncer/status/status_process_test.go index a17a6ed997c..ffa9504a8a3 100644 --- a/pkg/syncer/status/status_process_test.go +++ b/pkg/syncer/status/status_process_test.go @@ -45,9 +45,9 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/syncer/indexers" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var scheme *runtime.Scheme diff --git a/pkg/syncer/syncer.go b/pkg/syncer/syncer.go index 991cb46316b..00cda6c00b6 100644 --- a/pkg/syncer/syncer.go +++ b/pkg/syncer/syncer.go @@ -44,10 +44,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclusterclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/syncer/controllermanager" @@ -60,6 +56,10 @@ import ( "github.com/kcp-dev/kcp/pkg/syncer/spec/mutators" "github.com/kcp-dev/kcp/pkg/syncer/status" "github.com/kcp-dev/kcp/pkg/syncer/upsync" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclusterclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" . "github.com/kcp-dev/kcp/tmc/pkg/logging" ) diff --git a/pkg/syncer/tunneler.go b/pkg/syncer/tunneler.go index bc4fb29af1c..dad134c3de7 100644 --- a/pkg/syncer/tunneler.go +++ b/pkg/syncer/tunneler.go @@ -39,10 +39,10 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/clock" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/server/requestinfo" "github.com/kcp-dev/kcp/pkg/syncer/shared" "github.com/kcp-dev/kcp/pkg/tunneler" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var ( diff --git a/pkg/syncer/tunneler_test.go b/pkg/syncer/tunneler_test.go index f34fd0418f6..d444a78f7dd 100644 --- a/pkg/syncer/tunneler_test.go +++ b/pkg/syncer/tunneler_test.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func Test_withPodAccessCheck(t *testing.T) { diff --git a/pkg/syncer/upsync/upsync_controller.go b/pkg/syncer/upsync/upsync_controller.go index 7a3204ca327..4f7431993a8 100644 --- a/pkg/syncer/upsync/upsync_controller.go +++ b/pkg/syncer/upsync/upsync_controller.go @@ -44,12 +44,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/logging" syncerindexers "github.com/kcp-dev/kcp/pkg/syncer/indexers" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const controllerName = "kcp-resource-upsyncer" diff --git a/pkg/syncer/upsync/upsync_process_test.go b/pkg/syncer/upsync/upsync_process_test.go index 61ab97935bd..a96547c34c1 100644 --- a/pkg/syncer/upsync/upsync_process_test.go +++ b/pkg/syncer/upsync/upsync_process_test.go @@ -46,9 +46,9 @@ import ( "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/util/sets" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" ddsif "github.com/kcp-dev/kcp/pkg/informer" "github.com/kcp-dev/kcp/pkg/syncer/indexers" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var scheme *runtime.Scheme diff --git a/pkg/syncer/upsync/upsync_reconcile.go b/pkg/syncer/upsync/upsync_reconcile.go index b19cb68f525..3488b01c1f3 100644 --- a/pkg/syncer/upsync/upsync_reconcile.go +++ b/pkg/syncer/upsync/upsync_reconcile.go @@ -31,8 +31,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" . "github.com/kcp-dev/kcp/tmc/pkg/logging" ) diff --git a/pkg/tunneler/podsubresourceproxy_handler.go b/pkg/tunneler/podsubresourceproxy_handler.go index 9b285574c62..02e4c997e0e 100644 --- a/pkg/tunneler/podsubresourceproxy_handler.go +++ b/pkg/tunneler/podsubresourceproxy_handler.go @@ -37,10 +37,10 @@ import ( "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) var ( diff --git a/pkg/tunneler/podsubresourceproxy_handler_test.go b/pkg/tunneler/podsubresourceproxy_handler_test.go index 2cf256e2970..f2828965dc3 100644 --- a/pkg/tunneler/podsubresourceproxy_handler_test.go +++ b/pkg/tunneler/podsubresourceproxy_handler_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apiserver/pkg/endpoints/request" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) func TestPodSubresourceProxyingHandler(t *testing.T) { diff --git a/pkg/tunneler/syncertunnel_handler.go b/pkg/tunneler/syncertunnel_handler.go index 526088f3bc0..06b73f6fc03 100644 --- a/pkg/tunneler/syncertunnel_handler.go +++ b/pkg/tunneler/syncertunnel_handler.go @@ -25,7 +25,7 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/klog/v2" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // WithSyncerTunnelHandler adds an HTTP Handler that handles reverse connections via the tunnel subresource: diff --git a/pkg/tunneler/tunnel.go b/pkg/tunneler/tunnel.go index 28f48df1622..21973da68f4 100644 --- a/pkg/tunneler/tunnel.go +++ b/pkg/tunneler/tunnel.go @@ -26,7 +26,7 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) const ( diff --git a/pkg/virtual/apiexport/authorizer/content.go b/pkg/virtual/apiexport/authorizer/content.go index 70cb866fb2a..d5a082a64f7 100644 --- a/pkg/virtual/apiexport/authorizer/content.go +++ b/pkg/virtual/apiexport/authorizer/content.go @@ -26,9 +26,9 @@ import ( "k8s.io/apiserver/pkg/authorization/authorizer" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) type apiExportsContentAuthorizer struct { diff --git a/pkg/virtual/apiexport/authorizer/maximal_permission_policy.go b/pkg/virtual/apiexport/authorizer/maximal_permission_policy.go index d4258d6f8a5..1264263db21 100644 --- a/pkg/virtual/apiexport/authorizer/maximal_permission_policy.go +++ b/pkg/virtual/apiexport/authorizer/maximal_permission_policy.go @@ -28,11 +28,11 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" ) type maximalPermissionAuthorizer struct { diff --git a/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go b/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go index 4456852a464..524f8f2e230 100644 --- a/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go +++ b/pkg/virtual/apiexport/authorizer/maximal_permission_policy_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "k8s.io/apiserver/pkg/authorization/authorizer" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestMaximalPermissionPolicyAuthorizer(t *testing.T) { diff --git a/pkg/virtual/apiexport/builder/build.go b/pkg/virtual/apiexport/builder/build.go index 8d48e1c244d..d5a74de82ac 100644 --- a/pkg/virtual/apiexport/builder/build.go +++ b/pkg/virtual/apiexport/builder/build.go @@ -35,11 +35,8 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" virtualapiexportauth "github.com/kcp-dev/kcp/pkg/virtual/apiexport/authorizer" "github.com/kcp-dev/kcp/pkg/virtual/apiexport/controllers/apireconciler" "github.com/kcp-dev/kcp/pkg/virtual/apiexport/schemas" @@ -50,6 +47,9 @@ import ( dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const VirtualWorkspaceName string = "apiexport" diff --git a/pkg/virtual/apiexport/builder/forwarding.go b/pkg/virtual/apiexport/builder/forwarding.go index abfed207992..0a5d878284c 100644 --- a/pkg/virtual/apiexport/builder/forwarding.go +++ b/pkg/virtual/apiexport/builder/forwarding.go @@ -32,10 +32,10 @@ import ( "k8s.io/apiserver/pkg/registry/rest" "k8s.io/kube-openapi/pkg/validation/validate" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1/permissionclaims" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apiserver" registry "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1/permissionclaims" ) func provideAPIExportFilteredRestStorage(ctx context.Context, dynamicClusterClientFunc registry.DynamicClusterClientFunc, clusterName logicalcluster.Name, exportName string) (apiserver.RestProviderFunc, error) { diff --git a/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller.go b/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller.go index 36178acd4f0..3605c9c74dc 100644 --- a/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller.go +++ b/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller.go @@ -34,14 +34,14 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) const ( diff --git a/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller_test.go b/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller_test.go index 0a8cdb34211..c2869c9f890 100644 --- a/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller_test.go +++ b/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_controller_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2/ktesting" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) func TestEnqueueAPIResourceSchema(t *testing.T) { diff --git a/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_reconcile.go b/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_reconcile.go index faba7446463..4784cc713e4 100644 --- a/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_reconcile.go +++ b/pkg/virtual/apiexport/controllers/apireconciler/apiexport_apireconciler_reconcile.go @@ -30,15 +30,15 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1/permissionclaims" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/virtual/apiexport/schemas" apiexportbuiltin "github.com/kcp-dev/kcp/pkg/virtual/apiexport/schemas/builtin" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1/permissionclaims" ) func (c *APIReconciler) reconcile(ctx context.Context, apiExport *apisv1alpha1.APIExport, apiDomainKey dynamiccontext.APIDomainKey) error { diff --git a/pkg/virtual/apiexport/options/options.go b/pkg/virtual/apiexport/options/options.go index 0bfe05809a9..1e92079d28f 100644 --- a/pkg/virtual/apiexport/options/options.go +++ b/pkg/virtual/apiexport/options/options.go @@ -25,10 +25,10 @@ import ( "k8s.io/client-go/rest" "github.com/kcp-dev/kcp/pkg/authorization" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/virtual/apiexport/builder" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type APIExport struct{} diff --git a/pkg/virtual/apiexport/schemas/apis.go b/pkg/virtual/apiexport/schemas/apis.go index 9c3ba6518eb..11d005d2b51 100644 --- a/pkg/virtual/apiexport/schemas/apis.go +++ b/pkg/virtual/apiexport/schemas/apis.go @@ -24,7 +24,7 @@ import ( "k8s.io/utils/pointer" configcrds "github.com/kcp-dev/kcp/config/crds" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) var ApisKcpDevSchemas = map[string]*apisv1alpha1.APIResourceSchema{} diff --git a/pkg/virtual/apiexport/schemas/builtin/builtin.go b/pkg/virtual/apiexport/schemas/builtin/builtin.go index 62c122b2c57..c97235c5dab 100644 --- a/pkg/virtual/apiexport/schemas/builtin/builtin.go +++ b/pkg/virtual/apiexport/schemas/builtin/builtin.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/pkg/api/genericcontrolplanescheme" generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/virtual/framework/internalapis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // Create APIResourceSchemas for built-in APIs available as permission claims diff --git a/pkg/virtual/framework/dynamic/apidefinition/types.go b/pkg/virtual/framework/dynamic/apidefinition/types.go index ad7aad3e5fb..347a95b2073 100644 --- a/pkg/virtual/framework/dynamic/apidefinition/types.go +++ b/pkg/virtual/framework/dynamic/apidefinition/types.go @@ -25,8 +25,8 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers" "k8s.io/apiserver/pkg/registry/rest" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // APIDefinition provides access to all the information needed to serve a given API resource. diff --git a/pkg/virtual/framework/dynamic/apiserver/handler.go b/pkg/virtual/framework/dynamic/apiserver/handler.go index fff9a98e98d..b5034926246 100644 --- a/pkg/virtual/framework/dynamic/apiserver/handler.go +++ b/pkg/virtual/framework/dynamic/apiserver/handler.go @@ -37,10 +37,10 @@ import ( kubernetesscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/kube-openapi/pkg/validation/spec" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // resourceHandler serves the `/apis` and `/api` endpoints. diff --git a/pkg/virtual/framework/dynamic/apiserver/handler_test.go b/pkg/virtual/framework/dynamic/apiserver/handler_test.go index 72d1290799c..5ebcb0d5cd2 100644 --- a/pkg/virtual/framework/dynamic/apiserver/handler_test.go +++ b/pkg/virtual/framework/dynamic/apiserver/handler_test.go @@ -41,9 +41,9 @@ import ( utilopenapi "k8s.io/apiserver/pkg/util/openapi" "sigs.k8s.io/yaml" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dyncamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) type mockedAPISetRetriever apidefinition.APIDefinitionSet diff --git a/pkg/virtual/framework/dynamic/apiserver/serving_info.go b/pkg/virtual/framework/dynamic/apiserver/serving_info.go index babfa1ca5c2..35df53bc232 100644 --- a/pkg/virtual/framework/dynamic/apiserver/serving_info.go +++ b/pkg/virtual/framework/dynamic/apiserver/serving_info.go @@ -49,9 +49,9 @@ import ( "k8s.io/kube-openapi/pkg/validation/strfmt" "k8s.io/kube-openapi/pkg/validation/validate" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) var _ apidefinition.APIDefinition = (*servingInfo)(nil) diff --git a/pkg/virtual/framework/dynamic/example_test.go b/pkg/virtual/framework/dynamic/example_test.go index 47a2b63624f..311c03844e2 100644 --- a/pkg/virtual/framework/dynamic/example_test.go +++ b/pkg/virtual/framework/dynamic/example_test.go @@ -24,12 +24,12 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" virtualframework "github.com/kcp-dev/kcp/pkg/virtual/framework" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apiserver" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // Typical Usage of a DynamicVirtualWorkspace. diff --git a/pkg/virtual/framework/internalapis/import.go b/pkg/virtual/framework/internalapis/import.go index 5c6887d7b5b..67ce23f5703 100644 --- a/pkg/virtual/framework/internalapis/import.go +++ b/pkg/virtual/framework/internalapis/import.go @@ -31,8 +31,8 @@ import ( "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/util" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/crdpuller" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // InternalAPI describes an API to be imported from some schemes and generated OpenAPI V2 definitions. diff --git a/pkg/virtual/framework/internalapis/import_test.go b/pkg/virtual/framework/internalapis/import_test.go index 50f26d43a24..fc19283a2ee 100644 --- a/pkg/virtual/framework/internalapis/import_test.go +++ b/pkg/virtual/framework/internalapis/import_test.go @@ -35,8 +35,8 @@ import ( k8sopenapi "k8s.io/kubernetes/pkg/generated/openapi" "sigs.k8s.io/yaml" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" kcpopenapi "github.com/kcp-dev/kcp/pkg/openapi" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) //go:embed fixtures/*.yaml diff --git a/pkg/virtual/framework/wrappers/rbac/cluster_filtering.go b/pkg/virtual/framework/wrappers/rbac/cluster_filtering.go index f9cd73706cf..350c516636a 100644 --- a/pkg/virtual/framework/wrappers/rbac/cluster_filtering.go +++ b/pkg/virtual/framework/wrappers/rbac/cluster_filtering.go @@ -26,7 +26,7 @@ import ( rbaclisters "k8s.io/client-go/listers/rbac/v1" "k8s.io/client-go/tools/cache" - "github.com/kcp-dev/kcp/pkg/client" + "github.com/kcp-dev/kcp/sdk/client" ) func FilterInformers(clusterName logicalcluster.Name, informers rbacinformers.Interface) rbacinformers.Interface { diff --git a/pkg/virtual/initializingworkspaces/builder/build.go b/pkg/virtual/initializingworkspaces/builder/build.go index 4dd01914610..13fab544bf1 100644 --- a/pkg/virtual/initializingworkspaces/builder/build.go +++ b/pkg/virtual/initializingworkspaces/builder/build.go @@ -43,12 +43,7 @@ import ( "k8s.io/utils/pointer" rootphase0 "github.com/kcp-dev/kcp/config/root-phase0" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/server/requestinfo" "github.com/kcp-dev/kcp/pkg/virtual/framework" virtualworkspacesdynamic "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic" @@ -58,6 +53,11 @@ import ( "github.com/kcp-dev/kcp/pkg/virtual/framework/handler" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) func BuildVirtualWorkspace( diff --git a/pkg/virtual/initializingworkspaces/builder/forwarding.go b/pkg/virtual/initializingworkspaces/builder/forwarding.go index 431d4917980..09fcf01347d 100644 --- a/pkg/virtual/initializingworkspaces/builder/forwarding.go +++ b/pkg/virtual/initializingworkspaces/builder/forwarding.go @@ -37,11 +37,11 @@ import ( "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/validation/validate" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apiserver" registry "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) func initializingWorkspaceRequirements(initializer corev1alpha1.LogicalClusterInitializer) (labels.Requirements, error) { diff --git a/pkg/virtual/initializingworkspaces/options/options.go b/pkg/virtual/initializingworkspaces/options/options.go index c51f6208779..ab3b305a763 100644 --- a/pkg/virtual/initializingworkspaces/options/options.go +++ b/pkg/virtual/initializingworkspaces/options/options.go @@ -25,10 +25,10 @@ import ( "k8s.io/client-go/rest" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces" "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces/builder" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type InitializingWorkspaces struct{} diff --git a/pkg/virtual/options/options.go b/pkg/virtual/options/options.go index d87a09d2ada..3c59fa4670d 100644 --- a/pkg/virtual/options/options.go +++ b/pkg/virtual/options/options.go @@ -24,10 +24,10 @@ import ( "k8s.io/client-go/rest" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" apiexportoptions "github.com/kcp-dev/kcp/pkg/virtual/apiexport/options" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" initializingworkspacesoptions "github.com/kcp-dev/kcp/pkg/virtual/initializingworkspaces/options" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) const virtualWorkspacesFlagPrefix = "virtual-workspaces-" diff --git a/sdk/apis/apiresource/v1alpha1/register.go b/sdk/apis/apiresource/v1alpha1/register.go index cb9752c7252..b91a2957ed2 100644 --- a/sdk/apis/apiresource/v1alpha1/register.go +++ b/sdk/apis/apiresource/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/apiresource" + "github.com/kcp-dev/kcp/sdk/apis/apiresource" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/apis/v1alpha1/permissionclaims/labels.go b/sdk/apis/apis/v1alpha1/permissionclaims/labels.go index 32301b539ee..8c052ca71d3 100644 --- a/sdk/apis/apis/v1alpha1/permissionclaims/labels.go +++ b/sdk/apis/apis/v1alpha1/permissionclaims/labels.go @@ -23,7 +23,7 @@ import ( "github.com/kcp-dev/logicalcluster/v3" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // ToLabelKeyAndValue creates a safe key and value for labeling a resource to grant access diff --git a/sdk/apis/apis/v1alpha1/register.go b/sdk/apis/apis/v1alpha1/register.go index b05bfd69d76..bf852062df8 100644 --- a/sdk/apis/apis/v1alpha1/register.go +++ b/sdk/apis/apis/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/apis" + "github.com/kcp-dev/kcp/sdk/apis/apis" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/apis/v1alpha1/types_apibinding.go b/sdk/apis/apis/v1alpha1/types_apibinding.go index 11ecf2e3084..ff20a962aac 100644 --- a/sdk/apis/apis/v1alpha1/types_apibinding.go +++ b/sdk/apis/apis/v1alpha1/types_apibinding.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) const ( diff --git a/sdk/apis/apis/v1alpha1/types_apibinding_test.go b/sdk/apis/apis/v1alpha1/types_apibinding_test.go index 4deefabf709..04c9da462f7 100644 --- a/sdk/apis/apis/v1alpha1/types_apibinding_test.go +++ b/sdk/apis/apis/v1alpha1/types_apibinding_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - apitest "github.com/kcp-dev/kcp/pkg/apis/test" + apitest "github.com/kcp-dev/kcp/sdk/apis/test" ) // TestAPIBindingPermissionClaimCELValidation will validate the permission claims for an otherwise valid APIBinding. diff --git a/sdk/apis/apis/v1alpha1/types_apiexport.go b/sdk/apis/apis/v1alpha1/types_apiexport.go index bd142830845..5b0e0cbf7e7 100644 --- a/sdk/apis/apis/v1alpha1/types_apiexport.go +++ b/sdk/apis/apis/v1alpha1/types_apiexport.go @@ -22,7 +22,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // These are valid conditions of APIExport. diff --git a/sdk/apis/apis/v1alpha1/types_apiexport_test.go b/sdk/apis/apis/v1alpha1/types_apiexport_test.go index 1d00df8d12f..7fe9e1244e8 100644 --- a/sdk/apis/apis/v1alpha1/types_apiexport_test.go +++ b/sdk/apis/apis/v1alpha1/types_apiexport_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/require" - apitest "github.com/kcp-dev/kcp/pkg/apis/test" + apitest "github.com/kcp-dev/kcp/sdk/apis/test" ) func TestAPIExportPermissionClaimCELValidation(t *testing.T) { diff --git a/sdk/apis/apis/v1alpha1/types_apiexportendpointslice.go b/sdk/apis/apis/v1alpha1/types_apiexportendpointslice.go index 57cf5b58cdd..07b647705e0 100644 --- a/sdk/apis/apis/v1alpha1/types_apiexportendpointslice.go +++ b/sdk/apis/apis/v1alpha1/types_apiexportendpointslice.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // +crd diff --git a/sdk/apis/apis/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/apis/v1alpha1/zz_generated.deepcopy.go index 60066d9bfe4..f08d099053d 100644 --- a/sdk/apis/apis/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/apis/v1alpha1/zz_generated.deepcopy.go @@ -26,7 +26,7 @@ import ( v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtime "k8s.io/apimachinery/pkg/runtime" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/apis/core/helper/replicate.go b/sdk/apis/core/helper/replicate.go index d4756539856..1ef4f707ac8 100644 --- a/sdk/apis/core/helper/replicate.go +++ b/sdk/apis/core/helper/replicate.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/core" ) // ReplicateForValue returns the replicate value for the given controller added. diff --git a/sdk/apis/core/helper/replicate_test.go b/sdk/apis/core/helper/replicate_test.go index 6ad756be3f4..0110254bef5 100644 --- a/sdk/apis/core/helper/replicate_test.go +++ b/sdk/apis/core/helper/replicate_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/core" ) func TestReplicateForValue(t *testing.T) { diff --git a/sdk/apis/core/v1alpha1/logicalcluster_types.go b/sdk/apis/core/v1alpha1/logicalcluster_types.go index 8984ecc2bc6..e56c7db8aab 100644 --- a/sdk/apis/core/v1alpha1/logicalcluster_types.go +++ b/sdk/apis/core/v1alpha1/logicalcluster_types.go @@ -17,11 +17,11 @@ limitations under the License. package v1alpha1 import ( - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // LogicalCluster describes the current logical cluster. It is used to authorize diff --git a/sdk/apis/core/v1alpha1/register.go b/sdk/apis/core/v1alpha1/register.go index ec5fa19aee9..4036159d4c0 100644 --- a/sdk/apis/core/v1alpha1/register.go +++ b/sdk/apis/core/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/core" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/core/v1alpha1/shard_types.go b/sdk/apis/core/v1alpha1/shard_types.go index 445420cce0e..49c47108da8 100644 --- a/sdk/apis/core/v1alpha1/shard_types.go +++ b/sdk/apis/core/v1alpha1/shard_types.go @@ -18,10 +18,10 @@ package v1alpha1 import ( corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // RootShard holds a name of the root shard. diff --git a/sdk/apis/core/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/core/v1alpha1/zz_generated.deepcopy.go index 2bc54f8c7d2..90b206416e0 100644 --- a/sdk/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/api/core/v1" runtime "k8s.io/apimachinery/pkg/runtime" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/apis/scheduling/v1alpha1/register.go b/sdk/apis/scheduling/v1alpha1/register.go index 43af59b721f..d28da52b061 100644 --- a/sdk/apis/scheduling/v1alpha1/register.go +++ b/sdk/apis/scheduling/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/scheduling" + "github.com/kcp-dev/kcp/sdk/apis/scheduling" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/scheduling/v1alpha1/types_placement.go b/sdk/apis/scheduling/v1alpha1/types_placement.go index 6eac76a469c..caa584e0553 100644 --- a/sdk/apis/scheduling/v1alpha1/types_placement.go +++ b/sdk/apis/scheduling/v1alpha1/types_placement.go @@ -19,8 +19,8 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // Placement defines a selection rule to choose ONE location for MULTIPLE namespaces in a workspace. diff --git a/sdk/apis/scheduling/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/scheduling/v1alpha1/zz_generated.deepcopy.go index 10261ec46da..1af84c24f5d 100644 --- a/sdk/apis/scheduling/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/scheduling/v1alpha1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/apis/tenancy/initialization/utils.go b/sdk/apis/tenancy/initialization/utils.go index b373e449884..966280dae8e 100644 --- a/sdk/apis/tenancy/initialization/utils.go +++ b/sdk/apis/tenancy/initialization/utils.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/util/validation" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) func InitializerPresent(initializer corev1alpha1.LogicalClusterInitializer, initializers []corev1alpha1.LogicalClusterInitializer) bool { diff --git a/sdk/apis/tenancy/initialization/utils_test.go b/sdk/apis/tenancy/initialization/utils_test.go index cf7e4309ed7..6bc4cf3bdd4 100644 --- a/sdk/apis/tenancy/initialization/utils_test.go +++ b/sdk/apis/tenancy/initialization/utils_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/validation" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func TestInitializerToLabel(t *testing.T) { diff --git a/sdk/apis/tenancy/v1alpha1/register.go b/sdk/apis/tenancy/v1alpha1/register.go index 62d674c468d..e7f45ff2a34 100644 --- a/sdk/apis/tenancy/v1alpha1/register.go +++ b/sdk/apis/tenancy/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/tenancy" + "github.com/kcp-dev/kcp/sdk/apis/tenancy" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/tenancy/v1alpha1/types_workspace.go b/sdk/apis/tenancy/v1alpha1/types_workspace.go index 5d3de80ad34..3e2a84a6b03 100644 --- a/sdk/apis/tenancy/v1alpha1/types_workspace.go +++ b/sdk/apis/tenancy/v1alpha1/types_workspace.go @@ -21,8 +21,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // WorkspaceTypeReference is a globally unique, fully qualified reference to a workspace type. diff --git a/sdk/apis/tenancy/v1alpha1/types_workspace_test.go b/sdk/apis/tenancy/v1alpha1/types_workspace_test.go index 9e48672a653..153d598ee26 100644 --- a/sdk/apis/tenancy/v1alpha1/types_workspace_test.go +++ b/sdk/apis/tenancy/v1alpha1/types_workspace_test.go @@ -23,7 +23,7 @@ import ( "sigs.k8s.io/yaml" - apitest "github.com/kcp-dev/kcp/pkg/apis/test" + apitest "github.com/kcp-dev/kcp/sdk/apis/test" ) func TestWorkspaceCELValidation(t *testing.T) { diff --git a/sdk/apis/tenancy/v1alpha1/types_workspacetype.go b/sdk/apis/tenancy/v1alpha1/types_workspacetype.go index fdbc71fc2ba..0e7b6d1ef38 100644 --- a/sdk/apis/tenancy/v1alpha1/types_workspacetype.go +++ b/sdk/apis/tenancy/v1alpha1/types_workspacetype.go @@ -19,8 +19,8 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // WorkspaceTypeReservedNames defines the set of names that may not be diff --git a/sdk/apis/tenancy/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/tenancy/v1alpha1/zz_generated.deepcopy.go index 2bcdc727779..a25491ca0da 100644 --- a/sdk/apis/tenancy/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/tenancy/v1alpha1/zz_generated.deepcopy.go @@ -25,8 +25,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/apis/third_party/conditions/util/conditions/getter.go b/sdk/apis/third_party/conditions/util/conditions/getter.go index 6efd63e371f..b0e3c049603 100644 --- a/sdk/apis/third_party/conditions/util/conditions/getter.go +++ b/sdk/apis/third_party/conditions/util/conditions/getter.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // Getter interface defines methods that an object should implement in order to diff --git a/sdk/apis/third_party/conditions/util/conditions/getter_test.go b/sdk/apis/third_party/conditions/util/conditions/getter_test.go index 8a3e2f3accb..07fe3084ca3 100644 --- a/sdk/apis/third_party/conditions/util/conditions/getter_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/getter_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) var ( diff --git a/sdk/apis/third_party/conditions/util/conditions/matcher.go b/sdk/apis/third_party/conditions/util/conditions/matcher.go index 38700122e21..e2be6b1d9d6 100644 --- a/sdk/apis/third_party/conditions/util/conditions/matcher.go +++ b/sdk/apis/third_party/conditions/util/conditions/matcher.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega" "github.com/onsi/gomega/types" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // MatchConditions returns a custom matcher to check equality of conditionsapi.Conditions. diff --git a/sdk/apis/third_party/conditions/util/conditions/matcher_test.go b/sdk/apis/third_party/conditions/util/conditions/matcher_test.go index ce708f4b4bd..7648500cd0d 100644 --- a/sdk/apis/third_party/conditions/util/conditions/matcher_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/matcher_test.go @@ -24,7 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestMatchConditions(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/matchers.go b/sdk/apis/third_party/conditions/util/conditions/matchers.go index dfd7c94660b..960534038f6 100644 --- a/sdk/apis/third_party/conditions/util/conditions/matchers.go +++ b/sdk/apis/third_party/conditions/util/conditions/matchers.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // HaveSameStateOf matches a condition to have the same state of another. diff --git a/sdk/apis/third_party/conditions/util/conditions/merge.go b/sdk/apis/third_party/conditions/util/conditions/merge.go index 10508de0e85..f2d2926b122 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge.go @@ -21,7 +21,7 @@ import ( corev1 "k8s.io/api/core/v1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // localizedCondition defines a condition with the information of the object the conditions diff --git a/sdk/apis/third_party/conditions/util/conditions/merge_strategies.go b/sdk/apis/third_party/conditions/util/conditions/merge_strategies.go index 7931279f026..8e9e3721855 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge_strategies.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge_strategies.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // mergeOptions allows to set strategies for merging a set of conditions into a single condition, diff --git a/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go b/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go index 0b29861a1d1..2397c86b694 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge_strategies_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestGetStepCounterMessage(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/merge_test.go b/sdk/apis/third_party/conditions/util/conditions/merge_test.go index 41b4763f29b..8efad92c011 100644 --- a/sdk/apis/third_party/conditions/util/conditions/merge_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/merge_test.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestNewConditionsGroup(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/patch.go b/sdk/apis/third_party/conditions/util/conditions/patch.go index b3fa66a6ad5..0e7e9c66d9e 100644 --- a/sdk/apis/third_party/conditions/util/conditions/patch.go +++ b/sdk/apis/third_party/conditions/util/conditions/patch.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // Patch defines a list of operations to change a list of conditions into another. diff --git a/sdk/apis/third_party/conditions/util/conditions/patch_test.go b/sdk/apis/third_party/conditions/util/conditions/patch_test.go index 0c60c2db248..44e6ac73b29 100644 --- a/sdk/apis/third_party/conditions/util/conditions/patch_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/patch_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestNewPatch(t *testing.T) { diff --git a/sdk/apis/third_party/conditions/util/conditions/setter.go b/sdk/apis/third_party/conditions/util/conditions/setter.go index c227f7a361d..f746ede2544 100644 --- a/sdk/apis/third_party/conditions/util/conditions/setter.go +++ b/sdk/apis/third_party/conditions/util/conditions/setter.go @@ -24,7 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // Setter interface defines methods that an object should implement in order to diff --git a/sdk/apis/third_party/conditions/util/conditions/setter_test.go b/sdk/apis/third_party/conditions/util/conditions/setter_test.go index ceaca502a77..9bebd4855c3 100644 --- a/sdk/apis/third_party/conditions/util/conditions/setter_test.go +++ b/sdk/apis/third_party/conditions/util/conditions/setter_test.go @@ -28,7 +28,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestHasSameState(t *testing.T) { diff --git a/sdk/apis/topology/v1alpha1/register.go b/sdk/apis/topology/v1alpha1/register.go index 03bda0fa8d7..ab4d5c7aea2 100644 --- a/sdk/apis/topology/v1alpha1/register.go +++ b/sdk/apis/topology/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/topology" + "github.com/kcp-dev/kcp/sdk/apis/topology" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/topology/v1alpha1/types_partitionset.go b/sdk/apis/topology/v1alpha1/types_partitionset.go index 9249587b554..c6f0c817472 100644 --- a/sdk/apis/topology/v1alpha1/types_partitionset.go +++ b/sdk/apis/topology/v1alpha1/types_partitionset.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // +crd diff --git a/sdk/apis/topology/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/topology/v1alpha1/zz_generated.deepcopy.go index 85a417303f5..80f51b74c88 100644 --- a/sdk/apis/topology/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/topology/v1alpha1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/apis/workload/helpers/syncintent.go b/sdk/apis/workload/helpers/syncintent.go index 58f2efd4fb7..320162e7fe1 100644 --- a/sdk/apis/workload/helpers/syncintent.go +++ b/sdk/apis/workload/helpers/syncintent.go @@ -22,7 +22,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // SyncIntent gathers all the information related to the Syncing of diff --git a/sdk/apis/workload/v1alpha1/register.go b/sdk/apis/workload/v1alpha1/register.go index 1701b658ef3..f248641edda 100644 --- a/sdk/apis/workload/v1alpha1/register.go +++ b/sdk/apis/workload/v1alpha1/register.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/workload" + "github.com/kcp-dev/kcp/sdk/apis/workload" ) // SchemeGroupVersion is group version used to register these objects diff --git a/sdk/apis/workload/v1alpha1/synctarget_types.go b/sdk/apis/workload/v1alpha1/synctarget_types.go index 9aba97a1e54..fa32a2fee77 100644 --- a/sdk/apis/workload/v1alpha1/synctarget_types.go +++ b/sdk/apis/workload/v1alpha1/synctarget_types.go @@ -20,10 +20,10 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" ) // SyncTarget describes a member cluster capable of running workloads. diff --git a/sdk/apis/workload/v1alpha1/zz_generated.deepcopy.go b/sdk/apis/workload/v1alpha1/zz_generated.deepcopy.go index 3534627d4d0..7889f26d1f0 100644 --- a/sdk/apis/workload/v1alpha1/zz_generated.deepcopy.go +++ b/sdk/apis/workload/v1alpha1/zz_generated.deepcopy.go @@ -26,8 +26,8 @@ import ( resource "k8s.io/apimachinery/pkg/api/resource" runtime "k8s.io/apimachinery/pkg/runtime" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/sdk/client/clientset/versioned/clientset.go b/sdk/client/clientset/versioned/clientset.go index 58be8c6b3e0..1f97d5ac2c4 100644 --- a/sdk/client/clientset/versioned/clientset.go +++ b/sdk/client/clientset/versioned/clientset.go @@ -26,13 +26,13 @@ import ( rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) type Interface interface { diff --git a/sdk/client/clientset/versioned/cluster/clientset.go b/sdk/client/clientset/versioned/cluster/clientset.go index bcd71e27ece..7ee35251b95 100644 --- a/sdk/client/clientset/versioned/cluster/clientset.go +++ b/sdk/client/clientset/versioned/cluster/clientset.go @@ -32,14 +32,14 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/util/flowcontrol" - client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/workload/v1alpha1" + client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1" ) type ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/fake/clientset.go b/sdk/client/clientset/versioned/cluster/fake/clientset.go index c46aea77c1b..cd4b8c66258 100644 --- a/sdk/client/clientset/versioned/cluster/fake/clientset.go +++ b/sdk/client/clientset/versioned/cluster/fake/clientset.go @@ -29,30 +29,30 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/discovery" - client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpapiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apiresource/v1alpha1" - fakeapiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake" - kcpapisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apis/v1alpha1" - fakeapisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake" - kcpcorev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/core/v1alpha1" - fakecorev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/core/v1alpha1/fake" - kcpschedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/scheduling/v1alpha1" - fakeschedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake" - kcptenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/tenancy/v1alpha1" - faketenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake" - kcptopologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/topology/v1alpha1" - faketopologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake" - kcpworkloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/workload/v1alpha1" - fakeworkloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake" - clientscheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpapiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1" + fakeapiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake" + kcpapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1" + fakeapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake" + kcpcorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1" + fakecorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake" + kcpschedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1" + fakeschedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake" + kcptenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1" + faketenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake" + kcptopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1" + faketopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake" + kcpworkloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1" + fakeworkloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake" + clientscheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/sdk/client/clientset/versioned/cluster/scheme/register.go b/sdk/client/clientset/versioned/cluster/scheme/register.go index e4c3c8a0594..a27494a6615 100644 --- a/sdk/client/clientset/versioned/cluster/scheme/register.go +++ b/sdk/client/clientset/versioned/cluster/scheme/register.go @@ -28,13 +28,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresource_client.go b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresource_client.go index 37a1f78cdc9..b3630791891 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresource_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresource_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) type ApiresourceV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresourceimport.go b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresourceimport.go index 06cad2fec53..a59b541c4b1 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresourceimport.go +++ b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/apiresourceimport.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apiresourcev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apiresourcev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) // APIResourceImportsClusterGetter has a method to return a APIResourceImportClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresource_client.go b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresource_client.go index ee59e1e384f..fe190b1a9e1 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresource_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresource_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcpapiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apiresource/v1alpha1" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + kcpapiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) var _ kcpapiresourcev1alpha1.ApiresourceV1alpha1ClusterInterface = (*ApiresourceV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresourceimport.go b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresourceimport.go index a2269e54163..cdae583b5ef 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresourceimport.go +++ b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/apiresourceimport.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apiresourcev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apiresourcev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) var aPIResourceImportsResource = schema.GroupVersionResource{Group: "apiresource.kcp.io", Version: "v1alpha1", Resource: "apiresourceimports"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/negotiatedapiresource.go b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/negotiatedapiresource.go index f192400cd30..dcced96bb67 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/negotiatedapiresource.go +++ b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/fake/negotiatedapiresource.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apiresourcev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apiresourcev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) var negotiatedAPIResourcesResource = schema.GroupVersionResource{Group: "apiresource.kcp.io", Version: "v1alpha1", Resource: "negotiatedapiresources"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/negotiatedapiresource.go b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/negotiatedapiresource.go index 39cfacc8ca0..4ed31f821e2 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/negotiatedapiresource.go +++ b/sdk/client/clientset/versioned/cluster/typed/apiresource/v1alpha1/negotiatedapiresource.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apiresourcev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apiresourcev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) // NegotiatedAPIResourcesClusterGetter has a method to return a NegotiatedAPIResourceClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apibinding.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apibinding.go index 9bad81a122a..9038b4a427c 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apibinding.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apibinding.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) // APIBindingsClusterGetter has a method to return a APIBindingClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiconversion.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiconversion.go index 9587e29f8a3..322e066cdab 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiconversion.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiconversion.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) // APIConversionsClusterGetter has a method to return a APIConversionClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexport.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexport.go index 0d827654b09..f9d8abed76a 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexport.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexport.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) // APIExportsClusterGetter has a method to return a APIExportClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexportendpointslice.go index 3890d0331d8..40092cf4577 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexportendpointslice.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) // APIExportEndpointSlicesClusterGetter has a method to return a APIExportEndpointSliceClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiresourceschema.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiresourceschema.go index e0aaf1d0476..6a2520f9953 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiresourceschema.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) // APIResourceSchemasClusterGetter has a method to return a APIResourceSchemaClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apis_client.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apis_client.go index 5e48b203d25..68cd13a0096 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apis_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apis_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) type ApisV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apibinding.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apibinding.go index 0d00f7e1813..8f0d202eb26 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apibinding.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apibinding.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) var aPIBindingsResource = schema.GroupVersionResource{Group: "apis.kcp.io", Version: "v1alpha1", Resource: "apibindings"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiconversion.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiconversion.go index 944c2cee951..9abb4e9ef42 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiconversion.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiconversion.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) var aPIConversionsResource = schema.GroupVersionResource{Group: "apis.kcp.io", Version: "v1alpha1", Resource: "apiconversions"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexport.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexport.go index d422ba0c517..282e5c49494 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexport.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexport.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) var aPIExportsResource = schema.GroupVersionResource{Group: "apis.kcp.io", Version: "v1alpha1", Resource: "apiexports"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexportendpointslice.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexportendpointslice.go index 81d397a9603..7dd7b45aa0d 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexportendpointslice.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiexportendpointslice.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) var aPIExportEndpointSlicesResource = schema.GroupVersionResource{Group: "apis.kcp.io", Version: "v1alpha1", Resource: "apiexportendpointslices"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiresourceschema.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiresourceschema.go index 316d6151a4b..7ee161ad959 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiresourceschema.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apiresourceschema.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - apisv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) var aPIResourceSchemasResource = schema.GroupVersionResource{Group: "apis.kcp.io", Version: "v1alpha1", Resource: "apiresourceschemas"} diff --git a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apis_client.go b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apis_client.go index 622eba8a7dc..18de4830f63 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apis_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/fake/apis_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcpapisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/apis/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + kcpapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) var _ kcpapisv1alpha1.ApisV1alpha1ClusterInterface = (*ApisV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/core_client.go b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/core_client.go index bfd046a7a15..32283dc620c 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/core_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/core_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) type CoreV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/core_client.go b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/core_client.go index 50e0833c268..2c08991cfdf 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/core_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/core_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcpcorev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/core/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + kcpcorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) var _ kcpcorev1alpha1.CoreV1alpha1ClusterInterface = (*CoreV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/logicalcluster.go b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/logicalcluster.go index f1e329ef340..ae0cfa91b91 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/logicalcluster.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/logicalcluster.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) var logicalClustersResource = schema.GroupVersionResource{Group: "core.kcp.io", Version: "v1alpha1", Resource: "logicalclusters"} diff --git a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/shard.go b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/shard.go index 6aea6416d6f..7d10070368c 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/shard.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/fake/shard.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) var shardsResource = schema.GroupVersionResource{Group: "core.kcp.io", Version: "v1alpha1", Resource: "shards"} diff --git a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/logicalcluster.go b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/logicalcluster.go index 56ef30895d8..83bc6427421 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/logicalcluster.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/logicalcluster.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) // LogicalClustersClusterGetter has a method to return a LogicalClusterClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/shard.go b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/shard.go index 62557446e10..7fbdfd11e65 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/shard.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/shard.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) // ShardsClusterGetter has a method to return a ShardClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/location.go b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/location.go index b2009bf2352..56efaba5a3a 100644 --- a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/location.go +++ b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/location.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) var locationsResource = schema.GroupVersionResource{Group: "scheduling.kcp.io", Version: "v1alpha1", Resource: "locations"} diff --git a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/placement.go b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/placement.go index 41cd02baa9e..7403f562625 100644 --- a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/placement.go +++ b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/placement.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) var placementsResource = schema.GroupVersionResource{Group: "scheduling.kcp.io", Version: "v1alpha1", Resource: "placements"} diff --git a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/scheduling_client.go b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/scheduling_client.go index 84af3bb5d40..f9a7e4ea2fa 100644 --- a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/scheduling_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/fake/scheduling_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcpschedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/scheduling/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + kcpschedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) var _ kcpschedulingv1alpha1.SchedulingV1alpha1ClusterInterface = (*SchedulingV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/location.go b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/location.go index f834a5e2ecc..731ec7e7cfa 100644 --- a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/location.go +++ b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/location.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) // LocationsClusterGetter has a method to return a LocationClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/placement.go b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/placement.go index d14e71f459c..1013253f2e1 100644 --- a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/placement.go +++ b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/placement.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - schedulingv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + schedulingv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) // PlacementsClusterGetter has a method to return a PlacementClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/scheduling_client.go b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/scheduling_client.go index a0553e3a052..eb2b2ff773f 100644 --- a/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/scheduling_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/scheduling/v1alpha1/scheduling_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) type SchedulingV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/tenancy_client.go b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/tenancy_client.go index 0cef7d95694..4706aae21d2 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/tenancy_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/tenancy_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcptenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/tenancy/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + kcptenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) var _ kcptenancyv1alpha1.TenancyV1alpha1ClusterInterface = (*TenancyV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspace.go b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspace.go index 5ade2f3a2c9..368f7282216 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspace.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspace.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - tenancyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) var workspacesResource = schema.GroupVersionResource{Group: "tenancy.kcp.io", Version: "v1alpha1", Resource: "workspaces"} diff --git a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspacetype.go b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspacetype.go index 5ee5cfd802d..d0f52f447de 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspacetype.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/fake/workspacetype.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - tenancyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) var workspaceTypesResource = schema.GroupVersionResource{Group: "tenancy.kcp.io", Version: "v1alpha1", Resource: "workspacetypes"} diff --git a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/tenancy_client.go b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/tenancy_client.go index 2074fb3c911..a67b3e1212b 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/tenancy_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/tenancy_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) type TenancyV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspace.go b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspace.go index 2b9de188a0a..2955316538f 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspace.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspace.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - tenancyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) // WorkspacesClusterGetter has a method to return a WorkspaceClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspacetype.go b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspacetype.go index 8e64ccf245b..80cf7750a43 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspacetype.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - tenancyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + tenancyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) // WorkspaceTypesClusterGetter has a method to return a WorkspaceTypeClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partition.go b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partition.go index 16b91164649..6f0ee62e8c7 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partition.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partition.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - topologyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + topologyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) var partitionsResource = schema.GroupVersionResource{Group: "topology.kcp.io", Version: "v1alpha1", Resource: "partitions"} diff --git a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partitionset.go b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partitionset.go index 9f2c3b5a87c..58d4cf5c71c 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partitionset.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/partitionset.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - topologyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + topologyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) var partitionSetsResource = schema.GroupVersionResource{Group: "topology.kcp.io", Version: "v1alpha1", Resource: "partitionsets"} diff --git a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/topology_client.go b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/topology_client.go index ae971aa1adf..a4166af14e5 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/topology_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/fake/topology_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcptopologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/topology/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + kcptopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) var _ kcptopologyv1alpha1.TopologyV1alpha1ClusterInterface = (*TopologyV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partition.go b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partition.go index 80e8dfdb4e2..6a24ddd4584 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partition.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partition.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - topologyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + topologyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) // PartitionsClusterGetter has a method to return a PartitionClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partitionset.go b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partitionset.go index 63acb8ea87e..62646ee8257 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partitionset.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partitionset.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - topologyv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + topologyv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) // PartitionSetsClusterGetter has a method to return a PartitionSetClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/topology_client.go b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/topology_client.go index 866a9f362ab..039b74add8f 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/topology_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/topology_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) type TopologyV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/synctarget.go b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/synctarget.go index c49cc51942b..88a574c02f1 100644 --- a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/synctarget.go +++ b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/synctarget.go @@ -34,8 +34,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/testing" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - workloadv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + workloadv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) var syncTargetsResource = schema.GroupVersionResource{Group: "workload.kcp.io", Version: "v1alpha1", Resource: "synctargets"} diff --git a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/workload_client.go b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/workload_client.go index 7d8344bc745..340a6b0a35a 100644 --- a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/workload_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/fake/workload_client.go @@ -27,8 +27,8 @@ import ( kcptesting "github.com/kcp-dev/client-go/third_party/k8s.io/client-go/testing" "k8s.io/client-go/rest" - kcpworkloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster/typed/workload/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + kcpworkloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) var _ kcpworkloadv1alpha1.WorkloadV1alpha1ClusterInterface = (*WorkloadV1alpha1ClusterClient)(nil) diff --git a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/synctarget.go b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/synctarget.go index 339c45fd1db..db10bded09c 100644 --- a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/synctarget.go +++ b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/synctarget.go @@ -30,8 +30,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/watch" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - workloadv1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + workloadv1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) // SyncTargetsClusterGetter has a method to return a SyncTargetClusterInterface. diff --git a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/workload_client.go b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/workload_client.go index 0a14499282e..182d876ddf7 100644 --- a/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/workload_client.go +++ b/sdk/client/clientset/versioned/cluster/typed/workload/v1alpha1/workload_client.go @@ -29,7 +29,7 @@ import ( "k8s.io/client-go/rest" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) type WorkloadV1alpha1ClusterInterface interface { diff --git a/sdk/client/clientset/versioned/fake/clientset_generated.go b/sdk/client/clientset/versioned/fake/clientset_generated.go index 3f3255bc425..5d6b1d966ae 100644 --- a/sdk/client/clientset/versioned/fake/clientset_generated.go +++ b/sdk/client/clientset/versioned/fake/clientset_generated.go @@ -25,21 +25,21 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" - fakeapiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1/fake" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" - fakeapisv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1/fake" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" - fakecorev1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1/fake" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" - fakeschedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1/fake" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" - faketenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1/fake" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" - faketopologyv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1/fake" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" - fakeworkloadv1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1/fake" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" + fakeapiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" + fakeapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" + fakecorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1/fake" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" + fakeschedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" + faketenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" + faketopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" + fakeworkloadv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/sdk/client/clientset/versioned/fake/register.go b/sdk/client/clientset/versioned/fake/register.go index 8f9f637b379..b18e85ecab5 100644 --- a/sdk/client/clientset/versioned/fake/register.go +++ b/sdk/client/clientset/versioned/fake/register.go @@ -25,13 +25,13 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/sdk/client/clientset/versioned/scheme/register.go b/sdk/client/clientset/versioned/scheme/register.go index 8d9989c14b0..2546941130a 100644 --- a/sdk/client/clientset/versioned/scheme/register.go +++ b/sdk/client/clientset/versioned/scheme/register.go @@ -25,13 +25,13 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresource_client.go b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresource_client.go index 5e4f7c8758f..45964977130 100644 --- a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresource_client.go +++ b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresource_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type ApiresourceV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresourceimport.go b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresourceimport.go index a922f59d4f0..e16e26fd5a0 100644 --- a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresourceimport.go +++ b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/apiresourceimport.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // APIResourceImportsGetter has a method to return a APIResourceImportInterface. diff --git a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresource_client.go b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresource_client.go index a8df1174cfe..39aac0649e3 100644 --- a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresource_client.go +++ b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresource_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apiresource/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apiresource/v1alpha1" ) type FakeApiresourceV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresourceimport.go b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresourceimport.go index 1a5a92894ac..37a455ea495 100644 --- a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresourceimport.go +++ b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_apiresourceimport.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" ) // FakeAPIResourceImports implements APIResourceImportInterface diff --git a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_negotiatedapiresource.go b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_negotiatedapiresource.go index 0487f5d3607..2a4ab258722 100644 --- a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_negotiatedapiresource.go +++ b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/fake/fake_negotiatedapiresource.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" ) // FakeNegotiatedAPIResources implements NegotiatedAPIResourceInterface diff --git a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/negotiatedapiresource.go b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/negotiatedapiresource.go index 53f5bd9cfb3..ab918a89283 100644 --- a/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/negotiatedapiresource.go +++ b/sdk/client/clientset/versioned/typed/apiresource/v1alpha1/negotiatedapiresource.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // NegotiatedAPIResourcesGetter has a method to return a NegotiatedAPIResourceInterface. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go index 3ad932ef229..5d5651b4806 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // APIBindingsGetter has a method to return a APIBindingInterface. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go index abdc032edf0..fca06fa438b 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // APIConversionsGetter has a method to return a APIConversionInterface. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go index c2d6b6b91c4..5ee2069d199 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // APIExportsGetter has a method to return a APIExportInterface. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go index 4f5e219bba6..09e4f166646 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // APIExportEndpointSlicesGetter has a method to return a APIExportEndpointSliceInterface. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go index c36efb02263..1037b66c4d9 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // APIResourceSchemasGetter has a method to return a APIResourceSchemaInterface. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apis_client.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apis_client.go index 14d34af215b..b47d204f681 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apis_client.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apis_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type ApisV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apibinding.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apibinding.go index 8428f63d374..5053e1da6c4 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apibinding.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apibinding.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // FakeAPIBindings implements APIBindingInterface diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiconversion.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiconversion.go index 3858117838c..d0b63375369 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiconversion.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiconversion.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // FakeAPIConversions implements APIConversionInterface diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexport.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexport.go index 10858b62ac8..57802e05d32 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexport.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexport.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // FakeAPIExports implements APIExportInterface diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexportendpointslice.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexportendpointslice.go index a692fa3390c..fab0d172095 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexportendpointslice.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiexportendpointslice.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // FakeAPIExportEndpointSlices implements APIExportEndpointSliceInterface diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiresourceschema.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiresourceschema.go index e09ad2b064f..658a98f0a16 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiresourceschema.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apiresourceschema.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // FakeAPIResourceSchemas implements APIResourceSchemaInterface diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go index c3a574243d6..e13d89a68d4 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apis_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/apis/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) type FakeApisV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/core_client.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/core_client.go index fe0faaa5b60..3a65147305e 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/core_client.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/core_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type CoreV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go index 2ebd861593c..903193f909d 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_core_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) type FakeCoreV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_logicalcluster.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_logicalcluster.go index eb94645482d..e415a5d486b 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_logicalcluster.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_logicalcluster.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) // FakeLogicalClusters implements LogicalClusterInterface diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_shard.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_shard.go index 67588681df9..a6b236cae3b 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_shard.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/fake/fake_shard.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) // FakeShards implements ShardInterface diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go index edf87d3c95f..cb45dc57215 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // LogicalClustersGetter has a method to return a LogicalClusterInterface. diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go index 7f577b252c1..e8598bd09e3 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // ShardsGetter has a method to return a ShardInterface. diff --git a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_location.go b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_location.go index a9b4fc929ec..76b213dce65 100644 --- a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_location.go +++ b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_location.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) // FakeLocations implements LocationInterface diff --git a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_placement.go b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_placement.go index e8c5b9d890e..707b013df8c 100644 --- a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_placement.go +++ b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_placement.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) // FakePlacements implements PlacementInterface diff --git a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go index 9736a9eadad..674a42d2719 100644 --- a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go +++ b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/fake/fake_scheduling_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/scheduling/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/scheduling/v1alpha1" ) type FakeSchedulingV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/location.go b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/location.go index 01c6c6a87a8..fdcedd8e4bb 100644 --- a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/location.go +++ b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/location.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // LocationsGetter has a method to return a LocationInterface. diff --git a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/placement.go b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/placement.go index da9228a7f42..175f59a27aa 100644 --- a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/placement.go +++ b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/placement.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // PlacementsGetter has a method to return a PlacementInterface. diff --git a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go index 3b87b69a3ec..3f99b675e4a 100644 --- a/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go +++ b/sdk/client/clientset/versioned/typed/scheduling/v1alpha1/scheduling_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type SchedulingV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_tenancy_client.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_tenancy_client.go index 70dd6061956..948dfeb8044 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_tenancy_client.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_tenancy_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/tenancy/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) type FakeTenancyV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspace.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspace.go index 5f8975491d0..964700f96e3 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspace.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspace.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // FakeWorkspaces implements WorkspaceInterface diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspacetype.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspacetype.go index 2dc51fdde3b..67886460e37 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspacetype.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/fake/fake_workspacetype.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // FakeWorkspaceTypes implements WorkspaceTypeInterface diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/tenancy_client.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/tenancy_client.go index f459e95d977..c6ebc4e4ec5 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/tenancy_client.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/tenancy_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type TenancyV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go index 01e33619518..46058a6855a 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // WorkspacesGetter has a method to return a WorkspaceInterface. diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go index 108f7dc7b01..09e30543c48 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // WorkspaceTypesGetter has a method to return a WorkspaceTypeInterface. diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partition.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partition.go index 14aa555a305..51e8ea51e13 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partition.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partition.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) // FakePartitions implements PartitionInterface diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partitionset.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partitionset.go index 11244660caf..15960839f90 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partitionset.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_partitionset.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) // FakePartitionSets implements PartitionSetInterface diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_topology_client.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_topology_client.go index 5bbd9ab5aae..d4d2dfd4d9a 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_topology_client.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/fake/fake_topology_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/topology/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) type FakeTopologyV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go index 990dbfc36c6..02f20e21f42 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // PartitionsGetter has a method to return a PartitionInterface. diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go index 8b03a762db7..6a7f5e64daf 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // PartitionSetsGetter has a method to return a PartitionSetInterface. diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/topology_client.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/topology_client.go index e85c6a81ff5..e889c860d07 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/topology_client.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/topology_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type TopologyV1alpha1Interface interface { diff --git a/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_synctarget.go b/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_synctarget.go index b7a5ae409df..1cecef35b09 100644 --- a/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_synctarget.go +++ b/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_synctarget.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // FakeSyncTargets implements SyncTargetInterface diff --git a/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_workload_client.go b/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_workload_client.go index ff2540a89b8..c089c629007 100644 --- a/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_workload_client.go +++ b/sdk/client/clientset/versioned/typed/workload/v1alpha1/fake/fake_workload_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/workload/v1alpha1" + v1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/workload/v1alpha1" ) type FakeWorkloadV1alpha1 struct { diff --git a/sdk/client/clientset/versioned/typed/workload/v1alpha1/synctarget.go b/sdk/client/clientset/versioned/typed/workload/v1alpha1/synctarget.go index 8221c578542..fe5fc66fad7 100644 --- a/sdk/client/clientset/versioned/typed/workload/v1alpha1/synctarget.go +++ b/sdk/client/clientset/versioned/typed/workload/v1alpha1/synctarget.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - scheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) // SyncTargetsGetter has a method to return a SyncTargetInterface. diff --git a/sdk/client/clientset/versioned/typed/workload/v1alpha1/workload_client.go b/sdk/client/clientset/versioned/typed/workload/v1alpha1/workload_client.go index f5ac7ca6094..e3869099879 100644 --- a/sdk/client/clientset/versioned/typed/workload/v1alpha1/workload_client.go +++ b/sdk/client/clientset/versioned/typed/workload/v1alpha1/workload_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type WorkloadV1alpha1Interface interface { diff --git a/sdk/client/informers/externalversions/apiresource/interface.go b/sdk/client/informers/externalversions/apiresource/interface.go index 63337281d44..5ec71ebbfcb 100644 --- a/sdk/client/informers/externalversions/apiresource/interface.go +++ b/sdk/client/informers/externalversions/apiresource/interface.go @@ -22,8 +22,8 @@ limitations under the License. package apiresource import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apiresource/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apiresource/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/apiresource/v1alpha1/apiresourceimport.go b/sdk/client/informers/externalversions/apiresource/v1alpha1/apiresourceimport.go index 635ceba2fd5..819687b9716 100644 --- a/sdk/client/informers/externalversions/apiresource/v1alpha1/apiresourceimport.go +++ b/sdk/client/informers/externalversions/apiresource/v1alpha1/apiresourceimport.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apiresourcev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apiresourcev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apiresource/v1alpha1" ) // APIResourceImportClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apiresource/v1alpha1/interface.go b/sdk/client/informers/externalversions/apiresource/v1alpha1/interface.go index 67a158ecb01..9872df11075 100644 --- a/sdk/client/informers/externalversions/apiresource/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/apiresource/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/apiresource/v1alpha1/negotiatedapiresource.go b/sdk/client/informers/externalversions/apiresource/v1alpha1/negotiatedapiresource.go index 1270c00410e..b053a7531b3 100644 --- a/sdk/client/informers/externalversions/apiresource/v1alpha1/negotiatedapiresource.go +++ b/sdk/client/informers/externalversions/apiresource/v1alpha1/negotiatedapiresource.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apiresourcev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apiresourcev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apiresource/v1alpha1" ) // NegotiatedAPIResourceClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apis/interface.go b/sdk/client/informers/externalversions/apis/interface.go index 38fbc751743..932bdcf526f 100644 --- a/sdk/client/informers/externalversions/apis/interface.go +++ b/sdk/client/informers/externalversions/apis/interface.go @@ -22,8 +22,8 @@ limitations under the License. package apis import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go b/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go index ff85232419f..eb86a83ae04 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) // APIBindingClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go index 4c5fb5fd7b3..7bd469b1680 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) // APIConversionClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go index 0e01dcf58fa..53bbe245c8e 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) // APIExportClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go index 4133f50c224..9c19d8bfd05 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) // APIExportEndpointSliceClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go index f2740c48317..656e8aa4c24 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" ) // APIResourceSchemaClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/interface.go b/sdk/client/informers/externalversions/apis/v1alpha1/interface.go index d7beb6c5574..d93c4a164a2 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/core/interface.go b/sdk/client/informers/externalversions/core/interface.go index fea4cc93818..96980b60273 100644 --- a/sdk/client/informers/externalversions/core/interface.go +++ b/sdk/client/informers/externalversions/core/interface.go @@ -22,8 +22,8 @@ limitations under the License. package core import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/core/v1alpha1/interface.go b/sdk/client/informers/externalversions/core/v1alpha1/interface.go index 08d19dfdf1f..c3281eac3ff 100644 --- a/sdk/client/informers/externalversions/core/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/core/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go b/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go index 11b8e554e65..33c819a370f 100644 --- a/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go +++ b/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) // LogicalClusterClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/core/v1alpha1/shard.go b/sdk/client/informers/externalversions/core/v1alpha1/shard.go index c19aca5875f..250ff9660d0 100644 --- a/sdk/client/informers/externalversions/core/v1alpha1/shard.go +++ b/sdk/client/informers/externalversions/core/v1alpha1/shard.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - corev1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + corev1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/core/v1alpha1" ) // ShardClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/factory.go b/sdk/client/informers/externalversions/factory.go index 8f13ed1705f..cfbfcc73659 100644 --- a/sdk/client/informers/externalversions/factory.go +++ b/sdk/client/informers/externalversions/factory.go @@ -34,16 +34,16 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - apiresourceinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apiresource" - apisinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis" - coreinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/core" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - schedulinginformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling" - tenancyinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy" - topologyinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/topology" - workloadinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + apiresourceinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apiresource" + apisinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis" + coreinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/core" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + schedulinginformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling" + tenancyinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy" + topologyinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/topology" + workloadinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/sdk/client/informers/externalversions/generic.go b/sdk/client/informers/externalversions/generic.go index 10cfc82b42b..1296bc89a6b 100644 --- a/sdk/client/informers/externalversions/generic.go +++ b/sdk/client/informers/externalversions/generic.go @@ -30,13 +30,13 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) type GenericClusterInformer interface { diff --git a/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 80c92b5b734..3de2708b726 100644 --- a/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -30,8 +30,8 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/cache" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) // NewInformerFunc takes clientset.ClusterInterface and time.Duration to return a ScopeableSharedIndexInformer. diff --git a/sdk/client/informers/externalversions/scheduling/interface.go b/sdk/client/informers/externalversions/scheduling/interface.go index 1335f428ab2..31aa4848029 100644 --- a/sdk/client/informers/externalversions/scheduling/interface.go +++ b/sdk/client/informers/externalversions/scheduling/interface.go @@ -22,8 +22,8 @@ limitations under the License. package scheduling import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/scheduling/v1alpha1" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/scheduling/v1alpha1/interface.go b/sdk/client/informers/externalversions/scheduling/v1alpha1/interface.go index d70de5e6745..bb2fed3a0ad 100644 --- a/sdk/client/informers/externalversions/scheduling/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/scheduling/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/scheduling/v1alpha1/location.go b/sdk/client/informers/externalversions/scheduling/v1alpha1/location.go index 63b2fced8de..5be251b4c31 100644 --- a/sdk/client/informers/externalversions/scheduling/v1alpha1/location.go +++ b/sdk/client/informers/externalversions/scheduling/v1alpha1/location.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" ) // LocationClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/scheduling/v1alpha1/placement.go b/sdk/client/informers/externalversions/scheduling/v1alpha1/placement.go index b9b1006b985..87558e76855 100644 --- a/sdk/client/informers/externalversions/scheduling/v1alpha1/placement.go +++ b/sdk/client/informers/externalversions/scheduling/v1alpha1/placement.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - schedulingv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + schedulingv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/scheduling/v1alpha1" ) // PlacementClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/tenancy/interface.go b/sdk/client/informers/externalversions/tenancy/interface.go index 460a6efa6b7..fe93782e9e5 100644 --- a/sdk/client/informers/externalversions/tenancy/interface.go +++ b/sdk/client/informers/externalversions/tenancy/interface.go @@ -22,8 +22,8 @@ limitations under the License. package tenancy import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/tenancy/v1alpha1" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go b/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go index 1ebb9b5fea0..ef00dd0d151 100644 --- a/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go index 6af495c1d59..482ceb9c8b2 100644 --- a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go +++ b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) // WorkspaceClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go index 0d656a10143..e7e58a20c2c 100644 --- a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - tenancyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + tenancyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/tenancy/v1alpha1" ) // WorkspaceTypeClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/topology/interface.go b/sdk/client/informers/externalversions/topology/interface.go index f1f04d9ef8f..a35a7580843 100644 --- a/sdk/client/informers/externalversions/topology/interface.go +++ b/sdk/client/informers/externalversions/topology/interface.go @@ -22,8 +22,8 @@ limitations under the License. package topology import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/topology/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/topology/v1alpha1" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/topology/v1alpha1/interface.go b/sdk/client/informers/externalversions/topology/v1alpha1/interface.go index b3fdf6e2797..d17449ff093 100644 --- a/sdk/client/informers/externalversions/topology/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/topology/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/topology/v1alpha1/partition.go b/sdk/client/informers/externalversions/topology/v1alpha1/partition.go index 7ba81392430..a7d498049b3 100644 --- a/sdk/client/informers/externalversions/topology/v1alpha1/partition.go +++ b/sdk/client/informers/externalversions/topology/v1alpha1/partition.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - topologyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + topologyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/topology/v1alpha1" ) // PartitionClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go b/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go index a370d1d36c1..3a3b17e5cec 100644 --- a/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go +++ b/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - topologyv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + topologyv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/topology/v1alpha1" ) // PartitionSetClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/informers/externalversions/workload/interface.go b/sdk/client/informers/externalversions/workload/interface.go index 3bf0c0a1cf7..5d22c8f2e49 100644 --- a/sdk/client/informers/externalversions/workload/interface.go +++ b/sdk/client/informers/externalversions/workload/interface.go @@ -22,8 +22,8 @@ limitations under the License. package workload import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/workload/v1alpha1/interface.go b/sdk/client/informers/externalversions/workload/v1alpha1/interface.go index af0e51a1d46..6c5cea6df18 100644 --- a/sdk/client/informers/externalversions/workload/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/workload/v1alpha1/interface.go @@ -22,7 +22,7 @@ limitations under the License. package v1alpha1 import ( - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" ) type ClusterInterface interface { diff --git a/sdk/client/informers/externalversions/workload/v1alpha1/synctarget.go b/sdk/client/informers/externalversions/workload/v1alpha1/synctarget.go index c859f38d06e..d2660313967 100644 --- a/sdk/client/informers/externalversions/workload/v1alpha1/synctarget.go +++ b/sdk/client/informers/externalversions/workload/v1alpha1/synctarget.go @@ -34,11 +34,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/tools/cache" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - scopedclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/internalinterfaces" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + scopedclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/internalinterfaces" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) // SyncTargetClusterInformer provides access to a shared informer and lister for diff --git a/sdk/client/listers/apiresource/v1alpha1/apiresourceimport.go b/sdk/client/listers/apiresource/v1alpha1/apiresourceimport.go index 497b141f752..4475296e75c 100644 --- a/sdk/client/listers/apiresource/v1alpha1/apiresourceimport.go +++ b/sdk/client/listers/apiresource/v1alpha1/apiresourceimport.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" ) // APIResourceImportClusterLister can list APIResourceImports across all workspaces, or scope down to a APIResourceImportLister for one workspace. diff --git a/sdk/client/listers/apiresource/v1alpha1/negotiatedapiresource.go b/sdk/client/listers/apiresource/v1alpha1/negotiatedapiresource.go index 4cf98f2c4d1..b40b4ae8911 100644 --- a/sdk/client/listers/apiresource/v1alpha1/negotiatedapiresource.go +++ b/sdk/client/listers/apiresource/v1alpha1/negotiatedapiresource.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" ) // NegotiatedAPIResourceClusterLister can list NegotiatedAPIResources across all workspaces, or scope down to a NegotiatedAPIResourceLister for one workspace. diff --git a/sdk/client/listers/apis/v1alpha1/apibinding.go b/sdk/client/listers/apis/v1alpha1/apibinding.go index 66c205e397d..31a29a077a1 100644 --- a/sdk/client/listers/apis/v1alpha1/apibinding.go +++ b/sdk/client/listers/apis/v1alpha1/apibinding.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // APIBindingClusterLister can list APIBindings across all workspaces, or scope down to a APIBindingLister for one workspace. diff --git a/sdk/client/listers/apis/v1alpha1/apiconversion.go b/sdk/client/listers/apis/v1alpha1/apiconversion.go index 4610455eb36..182f64654b9 100644 --- a/sdk/client/listers/apis/v1alpha1/apiconversion.go +++ b/sdk/client/listers/apis/v1alpha1/apiconversion.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // APIConversionClusterLister can list APIConversions across all workspaces, or scope down to a APIConversionLister for one workspace. diff --git a/sdk/client/listers/apis/v1alpha1/apiexport.go b/sdk/client/listers/apis/v1alpha1/apiexport.go index e31cd80db51..8200e9d0ee3 100644 --- a/sdk/client/listers/apis/v1alpha1/apiexport.go +++ b/sdk/client/listers/apis/v1alpha1/apiexport.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // APIExportClusterLister can list APIExports across all workspaces, or scope down to a APIExportLister for one workspace. diff --git a/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go index 7b38ed51908..4ef6f05850e 100644 --- a/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // APIExportEndpointSliceClusterLister can list APIExportEndpointSlices across all workspaces, or scope down to a APIExportEndpointSliceLister for one workspace. diff --git a/sdk/client/listers/apis/v1alpha1/apiresourceschema.go b/sdk/client/listers/apis/v1alpha1/apiresourceschema.go index 7ed4e775079..4f7226cf77d 100644 --- a/sdk/client/listers/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/listers/apis/v1alpha1/apiresourceschema.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // APIResourceSchemaClusterLister can list APIResourceSchemas across all workspaces, or scope down to a APIResourceSchemaLister for one workspace. diff --git a/sdk/client/listers/core/v1alpha1/logicalcluster.go b/sdk/client/listers/core/v1alpha1/logicalcluster.go index 90a76555fb0..09cf653f867 100644 --- a/sdk/client/listers/core/v1alpha1/logicalcluster.go +++ b/sdk/client/listers/core/v1alpha1/logicalcluster.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) // LogicalClusterClusterLister can list LogicalClusters across all workspaces, or scope down to a LogicalClusterLister for one workspace. diff --git a/sdk/client/listers/core/v1alpha1/shard.go b/sdk/client/listers/core/v1alpha1/shard.go index 44d4f8198f6..657c4359ea7 100644 --- a/sdk/client/listers/core/v1alpha1/shard.go +++ b/sdk/client/listers/core/v1alpha1/shard.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) // ShardClusterLister can list Shards across all workspaces, or scope down to a ShardLister for one workspace. diff --git a/sdk/client/listers/scheduling/v1alpha1/location.go b/sdk/client/listers/scheduling/v1alpha1/location.go index 3e44accde8a..ee469132aa3 100644 --- a/sdk/client/listers/scheduling/v1alpha1/location.go +++ b/sdk/client/listers/scheduling/v1alpha1/location.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) // LocationClusterLister can list Locations across all workspaces, or scope down to a LocationLister for one workspace. diff --git a/sdk/client/listers/scheduling/v1alpha1/placement.go b/sdk/client/listers/scheduling/v1alpha1/placement.go index 53bd7506094..f9f1788a26f 100644 --- a/sdk/client/listers/scheduling/v1alpha1/placement.go +++ b/sdk/client/listers/scheduling/v1alpha1/placement.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" ) // PlacementClusterLister can list Placements across all workspaces, or scope down to a PlacementLister for one workspace. diff --git a/sdk/client/listers/tenancy/v1alpha1/workspace.go b/sdk/client/listers/tenancy/v1alpha1/workspace.go index fc4e21fef4d..ace4808b8e1 100644 --- a/sdk/client/listers/tenancy/v1alpha1/workspace.go +++ b/sdk/client/listers/tenancy/v1alpha1/workspace.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // WorkspaceClusterLister can list Workspaces across all workspaces, or scope down to a WorkspaceLister for one workspace. diff --git a/sdk/client/listers/tenancy/v1alpha1/workspacetype.go b/sdk/client/listers/tenancy/v1alpha1/workspacetype.go index f04d69b7b51..685cbe874bb 100644 --- a/sdk/client/listers/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/listers/tenancy/v1alpha1/workspacetype.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // WorkspaceTypeClusterLister can list WorkspaceTypes across all workspaces, or scope down to a WorkspaceTypeLister for one workspace. diff --git a/sdk/client/listers/topology/v1alpha1/partition.go b/sdk/client/listers/topology/v1alpha1/partition.go index 6b64e30d5ad..0e95b71f301 100644 --- a/sdk/client/listers/topology/v1alpha1/partition.go +++ b/sdk/client/listers/topology/v1alpha1/partition.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) // PartitionClusterLister can list Partitions across all workspaces, or scope down to a PartitionLister for one workspace. diff --git a/sdk/client/listers/topology/v1alpha1/partitionset.go b/sdk/client/listers/topology/v1alpha1/partitionset.go index 713c7604ada..7083d335f30 100644 --- a/sdk/client/listers/topology/v1alpha1/partitionset.go +++ b/sdk/client/listers/topology/v1alpha1/partitionset.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" ) // PartitionSetClusterLister can list PartitionSets across all workspaces, or scope down to a PartitionSetLister for one workspace. diff --git a/sdk/client/listers/workload/v1alpha1/synctarget.go b/sdk/client/listers/workload/v1alpha1/synctarget.go index 812a1a3fa8e..b14d63ff467 100644 --- a/sdk/client/listers/workload/v1alpha1/synctarget.go +++ b/sdk/client/listers/workload/v1alpha1/synctarget.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // SyncTargetClusterLister can list SyncTargets across all workspaces, or scope down to a SyncTargetLister for one workspace. diff --git a/sdk/go.mod b/sdk/go.mod index 001629bd321..fef416e82a2 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/google/go-cmp v0.5.8 github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 - github.com/kcp-dev/kcp/pkg/apis v0.11.0 + github.com/kcp-dev/client-go v0.0.0-20230126185145-aeff170a288b github.com/kcp-dev/logicalcluster/v3 v3.0.1 github.com/onsi/gomega v1.10.1 github.com/stretchr/testify v1.7.1 @@ -13,97 +13,55 @@ require ( k8s.io/apiextensions-apiserver v0.24.3 k8s.io/apimachinery v0.24.3 k8s.io/client-go v0.24.3 - sigs.k8s.io/yaml v1.2.0 + sigs.k8s.io/yaml v1.3.0 ) require ( - github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect + github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/blang/semver/v4 v4.0.0 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/coreos/go-semver v0.3.0 // indirect - github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect - github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect - github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.20.0 // indirect + github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // 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.3 // indirect + github.com/golang/protobuf v1.5.2 // indirect github.com/google/cel-go v0.11.2 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.1.2 // indirect - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect - github.com/imdario/mergo v0.3.5 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/google/uuid v1.3.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect github.com/mitchellh/mapstructure v1.4.1 // 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 + github.com/nxadm/tail v1.4.8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.12.2 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - github.com/spf13/cobra v1.4.0 // indirect github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect github.com/stoewer/go-strcase v1.2.0 // indirect - github.com/stretchr/objx v0.1.1 // indirect - go.etcd.io/etcd/api/v3 v3.5.1 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect - go.etcd.io/etcd/client/v3 v3.5.1 // indirect - go.opentelemetry.io/contrib v0.20.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 // indirect - go.opentelemetry.io/otel v0.20.0 // indirect - go.opentelemetry.io/otel/exporters/otlp v0.20.0 // indirect - go.opentelemetry.io/otel/metric v0.20.0 // indirect - go.opentelemetry.io/otel/sdk v0.20.0 // indirect - go.opentelemetry.io/otel/sdk/export/metric v0.20.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.20.0 // indirect - go.opentelemetry.io/otel/trace v0.20.0 // indirect - go.opentelemetry.io/proto/otlp v0.7.0 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.19.0 // indirect - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect - golang.org/x/net v0.8.0 // indirect - golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/term v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect + golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 // indirect + golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect + golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect - google.golang.org/grpc v1.44.0 // indirect + google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.24.3 // indirect - k8s.io/component-base v0.24.3 // indirect - k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect - k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 // indirect + k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) diff --git a/sdk/go.sum b/sdk/go.sum index 651c187bd98..0004215f7b6 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -48,10 +48,11 @@ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBp github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -60,8 +61,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 h1:yL7+Jz0jTC6yykIK/Wh74gnTJnrGr5AyrNMXuA0gves= -github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed h1:ue9pVfIcP+QMEjfgo/Ez4ZjNZfonGgR6NgjMaJMu1Cg= +github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -72,18 +73,15 @@ github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiU github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -94,7 +92,6 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= @@ -104,11 +101,8 @@ github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u9 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -126,8 +120,6 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= -github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -135,14 +127,12 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -158,11 +148,9 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -173,14 +161,12 @@ github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= -github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= @@ -193,7 +179,6 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/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= @@ -219,17 +204,14 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= github.com/google/cel-go v0.11.2 h1:o16cOggWWtH1a3ZHQ8uWqt8nd255vDrEK1mDE1cFRSQ= github.com/google/cel-go v0.11.2/go.mod h1:drz+knCRsctDZ180KZHwIEEUb9IdK/nxPoyhxi+O1K0= -github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M= -github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw= github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= @@ -243,13 +225,10 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -267,13 +246,11 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5 h1:zIaiqGYDQwa4HVx5wGRTXbx38Pqxjemn4BP98wpzpXo= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -282,10 +259,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -310,9 +285,7 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= @@ -333,14 +306,8 @@ github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0 h1:fb+3CdDlxvnK+o1wm3IcDbD+MJn github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0/go.mod h1:dn1hXHMY9E6JbyOGa0qXt1Dq4akd/jHMZOpFhJoX7q4= github.com/kcp-dev/client-go v0.0.0-20230126185145-aeff170a288b h1:7Raw5C50fye3c7FkltMWI4iAarVI5DQk9fnO6kkWd1s= github.com/kcp-dev/client-go v0.0.0-20230126185145-aeff170a288b/go.mod h1:sj0r6sAHNsfEpA37uLTVGZj9TMQQWjBXk4rbpcIDZ7U= -github.com/kcp-dev/kcp/pkg/apis v0.11.0 h1:K6p+tNHNcvfACCPLcHgY0EMLeaIwR1jS491FyLfXMII= -github.com/kcp-dev/kcp/pkg/apis v0.11.0/go.mod h1:8cUAmfMJcksauz53UtsLYG8Phhx62rvuCnd/5t/Zihk= -github.com/kcp-dev/kcp/pkg/client v0.0.0-20230314142658-46aed503f9a0 h1:WyKZ5iyDc+CoR7zSGCd1SZK+Lhg0E/P3yL2F3bE92Ic= -github.com/kcp-dev/kcp/pkg/client v0.0.0-20230314142658-46aed503f9a0/go.mod h1:RbjVziId9vruNj7tvsM+awj8kmO3EfV//xkYCDX8mPY= github.com/kcp-dev/logicalcluster/v3 v3.0.1 h1:cqo8QhyCrQv6vhT1OaomomzJ9U8xBkMKINKQyZiBizM= github.com/kcp-dev/logicalcluster/v3 v3.0.1/go.mod h1:6rb68Tntup98cRr9+50rvSDxUbfqrC1yQ/T6RiZcSgA= -github.com/kcp-dev/logicalcluster/v3 v3.0.4 h1:q7KngML/QM7sWl8aVzmfZF0TPMnBwYNxsPKfwUvvBvU= -github.com/kcp-dev/logicalcluster/v3 v3.0.4/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -365,8 +332,6 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= -github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -396,20 +361,18 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= -github.com/onsi/ginkgo/v2 v2.9.1 h1:zie5Ly042PD3bsCvsSOPvRnFwyo3rKe64TJlD6nu0mk= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.27.4 h1:Z2AnStgsdSayCMDiCU42qIz+HLqEPcgiOCXjAU/w+8E= -github.com/onsi/gomega v1.27.4/go.mod h1:riYq/GJKh8hhoM01HN6Vmuy93AarCXCBGpvFDK3q3fQ= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -429,33 +392,22 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= -github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= @@ -480,7 +432,6 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -491,10 +442,7 @@ github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -503,9 +451,6 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= 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.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -519,14 +464,11 @@ github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1 h1:v28cktvBq+7vGyJXF8G+rWJmj+1XUmMtqcLnH8hDocM= go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1 h1:XIQcHCFSG53bJETYeRJtIxdLv2EWRGxcfzR8lSnTH4E= go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/client/v3 v3.5.1 h1:oImGuV5LGKjCqXdjkMHCyWa5OO1gYKCnC/1sgdfj1Uk= go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= @@ -538,39 +480,25 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0 h1:sO4WKdPAudZGKPcpZT4MJn6JaDmpyLrMPDGGyA1SttE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0 h1:Q3C9yzW6I9jqEc8sawxzxZmY48fs9u220KXq6d5s3XU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/otel v0.20.0 h1:eaP0Fqu7SXHwvjiqDq83zImeehOHX8doTvU9AwXON8g= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/metric v0.20.0 h1:4kzhXFP+btKm4jwxpjIqjs41A7MakRFUS86bqLHTIw8= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0 h1:JsxtGXd06J8jrnya7fdI/U/MR6yXA5DtbZy+qoHQlr8= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0 h1:c5VRjxCXdQlx1HjzwGdQHzZaVI82b5EbBgOu2ljD92g= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/metric v0.20.0 h1:7ao1wpzHRVKf0OQ7GIxiQJA6X7DLX9o14gmVon7mMK8= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/trace v0.20.0 h1:1DL6EXUdcg95gukhuRRvLDO/4X5THh/5dIV52lqtnbw= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -582,7 +510,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -668,9 +595,8 @@ golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= 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= @@ -684,10 +610,8 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 h1:2o1E+E8TpNLklK9nHiPiK1uzIYrIHt+cQx3ynCwq9V8= -golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401 h1:zwrSfklXn0gxyLRX/aR+q6cgHbV/ItVyzbPlbA+dkAw= +golang.org/x/oauth2 v0.0.0-20220524215830-622c5d57e401/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= 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= @@ -698,7 +622,6 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -764,12 +687,11 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME= +golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= -golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -778,9 +700,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -845,13 +766,12 @@ golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= @@ -927,10 +847,8 @@ google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaE google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 h1:FglFEfyj61zP3c6LgjmVHxYxZWXYul9oiS1EZqD5gLc= -google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= -google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 h1:hrbNEivu7Zn1pxvHk6MBrq9iE22woVILTHqexqBxe6I= -google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58 h1:a221mAAEAzq4Lz6ZWRkcS8ptb2mxoxYSt4N68aRyQHM= +google.golang.org/genproto v0.0.0-20220527130721-00d5c0f3be58/go.mod h1:yKyY4AMRwFiC8yMMNaMi+RkCnjZJt9LoWuvhXjMs+To= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -953,9 +871,7 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.44.0 h1:weqSxi/TMs1SqFRMHCtBgXRs8k3X39QIDEZ0pRcttUg= -google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -983,10 +899,10 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1014,61 +930,31 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= -k8s.io/api v0.25.0-alpha.0 h1:BiYeMLWoLcGGWE46gdnlwluFa23+Hr3I2Qp8U6c2wYY= -k8s.io/api v0.25.0-alpha.0/go.mod h1:sOibYBePcsE/DBjbbi+Z+FCG9lFPR7xuKSR2r6RTCNs= -k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ= -k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU= k8s.io/apiextensions-apiserver v0.24.3 h1:kyx+Tmro1qEsTUr07ZGQOfvTsF61yn+AxnxytBWq8As= k8s.io/apiextensions-apiserver v0.24.3/go.mod h1:cL0xkmUefpYM4f6IuOau+6NMFEIh6/7wXe/O4vPVJ8A= -k8s.io/apiextensions-apiserver v0.25.0-alpha.0 h1:gVXvcmg6j5sKEH/EGMXpwe4OA4tjrHpAKMWqkYX0xcQ= -k8s.io/apiextensions-apiserver v0.25.0-alpha.0/go.mod h1:YwaPr7AdxZ+L/qv9pt+7LdJKy9IAMNY6j7f6khh4vK4= -k8s.io/apiextensions-apiserver v0.26.2 h1:/yTG2B9jGY2Q70iGskMf41qTLhL9XeNN2KhI0uDgwko= -k8s.io/apiextensions-apiserver v0.26.2/go.mod h1:Y7UPgch8nph8mGCuVk0SK83LnS8Esf3n6fUBgew8SH8= k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apimachinery v0.25.0-alpha.0 h1:gAzcXIp+FkB3w8+m34na2qxSScwQWKtryRU8JfkS/NU= -k8s.io/apimachinery v0.25.0-alpha.0/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ= -k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I= -k8s.io/apiserver v0.24.3 h1:J8CKjUaZopT0hSgxjzUyp3T1GK78iixxOuFpEC0MI3k= k8s.io/apiserver v0.24.3/go.mod h1:aXfwtIn4U27B7lYs5f2BKgz6DRbgWy+HJeYReN1jLJ8= -k8s.io/apiserver v0.25.0-alpha.0 h1:xBfhlvO+nR5+8bXa6QWAAUJlKnoeilyfADlsX68nSVI= -k8s.io/apiserver v0.25.0-alpha.0/go.mod h1:3uSXO9FDkLMo4+9e7wAFYPZG9u9k7pu0uDOIldSH4p0= -k8s.io/apiserver v0.26.2 h1:Pk8lmX4G14hYqJd1poHGC08G03nIHVqdJMR0SD3IH3o= -k8s.io/apiserver v0.26.2/go.mod h1:GHcozwXgXsPuOJ28EnQ/jXEM9QeG6HT22YxSNmpYNh8= k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= -k8s.io/client-go v0.25.0-alpha.0 h1:IwIWODi6Uz7QlOU8J2tv8APdDtytoowveKF9IoKpHa4= -k8s.io/client-go v0.25.0-alpha.0/go.mod h1:V7vCXDCdD8Goobi4oQhsSNXtlWfyBJi+LHFaiYWpR5s= -k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI= -k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU= k8s.io/code-generator v0.24.3/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= -k8s.io/code-generator v0.25.0-alpha.0/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= -k8s.io/component-base v0.24.3 h1:u99WjuHYCRJjS1xeLOx72DdRaghuDnuMgueiGMFy1ec= k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= -k8s.io/component-base v0.25.0-alpha.0 h1:3vKkR1bElViOZg8/n+tGPPao4J8wVtgYufpKiVpYVoY= -k8s.io/component-base v0.25.0-alpha.0/go.mod h1:XjXouECWA+3uLTEckIOMeu6P0BjjCNDUaS6a6Ci3EwE= -k8s.io/component-base v0.26.2 h1:IfWgCGUDzrD6wLLgXEstJKYZKAFS2kO+rBRi0p3LqcI= -k8s.io/component-base v0.26.2/go.mod h1:DxbuIe9M3IZPRxPIzhch2m1eT7uFrSBJUBuVCQEBivs= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= -k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20221107191617-1a15be271d1d h1:0Smp/HP1OH4Rvhe+4B8nWGERtlqAGSftbSbbmm45oFs= -k8s.io/utils v0.0.0-20221107191617-1a15be271d1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30 h1:dUk62HQ3ZFhD48Qr8MIXCiKA8wInBQCtuE4QGfFW7yA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= @@ -1077,7 +963,6 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/test/e2e/apibinding/apibinding_deletion_test.go b/test/e2e/apibinding/apibinding_deletion_test.go index a91be2fecd0..075ac0e73dd 100644 --- a/test/e2e/apibinding/apibinding_deletion_test.go +++ b/test/e2e/apibinding/apibinding_deletion_test.go @@ -34,9 +34,9 @@ import ( "k8s.io/client-go/util/retry" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestclientset "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster" diff --git a/test/e2e/apibinding/apibinding_permissionclaims_test.go b/test/e2e/apibinding/apibinding_permissionclaims_test.go index 09bc633eec6..e404e85be00 100644 --- a/test/e2e/apibinding/apibinding_permissionclaims_test.go +++ b/test/e2e/apibinding/apibinding_permissionclaims_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/restmapper" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/apifixtures" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" diff --git a/test/e2e/apibinding/apibinding_protected_test.go b/test/e2e/apibinding/apibinding_protected_test.go index 7b11f3871e0..57c8eb55ee9 100644 --- a/test/e2e/apibinding/apibinding_protected_test.go +++ b/test/e2e/apibinding/apibinding_protected_test.go @@ -32,10 +32,10 @@ import ( "k8s.io/client-go/restmapper" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - "github.com/kcp-dev/kcp/pkg/apis/workload" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + "github.com/kcp-dev/kcp/sdk/apis/workload" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/apibinding/apibinding_test.go b/test/e2e/apibinding/apibinding_test.go index d3e80558998..4664345111a 100644 --- a/test/e2e/apibinding/apibinding_test.go +++ b/test/e2e/apibinding/apibinding_test.go @@ -45,11 +45,11 @@ import ( clientcmdapi "k8s.io/client-go/tools/clientcmd/api" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestclientset "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster" diff --git a/test/e2e/apibinding/apibinding_webhook_test.go b/test/e2e/apibinding/apibinding_webhook_test.go index 3f826457064..1e19d1ad7d6 100644 --- a/test/e2e/apibinding/apibinding_webhook_test.go +++ b/test/e2e/apibinding/apibinding_webhook_test.go @@ -42,8 +42,8 @@ import ( "k8s.io/client-go/restmapper" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" webhookserver "github.com/kcp-dev/kcp/test/e2e/fixtures/webhook" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestclientset "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster" diff --git a/test/e2e/apibinding/maximalpermissionpolicy_authorizer_test.go b/test/e2e/apibinding/maximalpermissionpolicy_authorizer_test.go index 3c9083221a6..9801c778c9b 100644 --- a/test/e2e/apibinding/maximalpermissionpolicy_authorizer_test.go +++ b/test/e2e/apibinding/maximalpermissionpolicy_authorizer_test.go @@ -37,9 +37,9 @@ import ( "sigs.k8s.io/yaml" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestclientset "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster" diff --git a/test/e2e/authorizer/serviceaccounts_test.go b/test/e2e/authorizer/serviceaccounts_test.go index 9783516af3e..278c7a09d09 100644 --- a/test/e2e/authorizer/serviceaccounts_test.go +++ b/test/e2e/authorizer/serviceaccounts_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/utils/pointer" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1/helper" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1/helper" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/authorizer/workspace_test.go b/test/e2e/authorizer/workspace_test.go index 3ed9923bd2f..befe694cff7 100644 --- a/test/e2e/authorizer/workspace_test.go +++ b/test/e2e/authorizer/workspace_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/conformance/crd_partial_metadata_test.go b/test/e2e/conformance/crd_partial_metadata_test.go index 2c23325e30a..f557d772498 100644 --- a/test/e2e/conformance/crd_partial_metadata_test.go +++ b/test/e2e/conformance/crd_partial_metadata_test.go @@ -37,8 +37,8 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/wait" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/conformance/cross_logical_cluster_list_test.go b/test/e2e/conformance/cross_logical_cluster_list_test.go index 916e9a50eeb..dcbc8b95dc5 100644 --- a/test/e2e/conformance/cross_logical_cluster_list_test.go +++ b/test/e2e/conformance/cross_logical_cluster_list_test.go @@ -42,11 +42,11 @@ import ( "k8s.io/client-go/tools/cache" configcrds "github.com/kcp-dev/kcp/config/crds" - "github.com/kcp-dev/kcp/pkg/apis/core" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/informer" metadataclient "github.com/kcp-dev/kcp/pkg/metadata" + "github.com/kcp-dev/kcp/sdk/apis/core" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/apifixtures" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/conversion/conversion_test.go b/test/e2e/conversion/conversion_test.go index 90d5c1f813d..579bd0bd305 100644 --- a/test/e2e/conversion/conversion_test.go +++ b/test/e2e/conversion/conversion_test.go @@ -35,9 +35,9 @@ import ( "k8s.io/client-go/restmapper" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/fixtures/apifixtures/apibinding.go b/test/e2e/fixtures/apifixtures/apibinding.go index 2672dd522ec..f19ddcf8c5d 100644 --- a/test/e2e/fixtures/apifixtures/apibinding.go +++ b/test/e2e/fixtures/apifixtures/apibinding.go @@ -27,9 +27,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/fixtures/apifixtures/sheriffs.go b/test/e2e/fixtures/apifixtures/sheriffs.go index 16cb1e7e1a3..a58645a3f27 100644 --- a/test/e2e/fixtures/apifixtures/sheriffs.go +++ b/test/e2e/fixtures/apifixtures/sheriffs.go @@ -35,8 +35,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/framework/config.go b/test/e2e/framework/config.go index 39e3d8605ed..c516d9abd8b 100644 --- a/test/e2e/framework/config.go +++ b/test/e2e/framework/config.go @@ -32,7 +32,7 @@ import ( cliflag "k8s.io/component-base/cli/flag" "k8s.io/klog/v2" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) func init() { diff --git a/test/e2e/framework/expect.go b/test/e2e/framework/expect.go index 7ed9ea53fba..77027d4e306 100644 --- a/test/e2e/framework/expect.go +++ b/test/e2e/framework/expect.go @@ -31,10 +31,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/tools/cache" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclient "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclient "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) // Expectation closes over a statement of intent, allowing the caller diff --git a/test/e2e/framework/kcp.go b/test/e2e/framework/kcp.go index 83f1665f0c0..bc9fd6da309 100644 --- a/test/e2e/framework/kcp.go +++ b/test/e2e/framework/kcp.go @@ -60,9 +60,9 @@ import ( kcpoptions "github.com/kcp-dev/kcp/cmd/kcp/options" "github.com/kcp-dev/kcp/cmd/sharded-test-server/third_party/library-go/crypto" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/embeddedetcd" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube" "github.com/kcp-dev/kcp/tmc/pkg/server" ) diff --git a/test/e2e/framework/syncer.go b/test/e2e/framework/syncer.go index 7d16bf928f4..bb6a8266089 100644 --- a/test/e2e/framework/syncer.go +++ b/test/e2e/framework/syncer.go @@ -51,17 +51,17 @@ import ( "k8s.io/klog/v2" "sigs.k8s.io/yaml" - apiresourcev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apiresource/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" workloadcliplugin "github.com/kcp-dev/kcp/pkg/cliplugins/workload/plugin" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/syncer" "github.com/kcp-dev/kcp/pkg/syncer/shared" + apiresourcev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apiresource/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" ) type SyncerOption func(t *testing.T, fs *syncerFixture) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 086d41e16ec..4811580dc83 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -60,10 +60,10 @@ import ( "sigs.k8s.io/yaml" "github.com/kcp-dev/kcp/config/helpers" - conditionsv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpscheme "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/scheme" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpscheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) //go:embed *.csv diff --git a/test/e2e/framework/workspaces.go b/test/e2e/framework/workspaces.go index 924a8422e3d..57cce36f874 100644 --- a/test/e2e/framework/workspaces.go +++ b/test/e2e/framework/workspaces.go @@ -32,15 +32,15 @@ import ( "k8s.io/apiserver/pkg/authentication/user" "github.com/kcp-dev/kcp/pkg/admission/workspace" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization" bootstrappolicy "github.com/kcp-dev/kcp/pkg/authorization/bootstrap" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" reconcilerworkspace "github.com/kcp-dev/kcp/pkg/reconciler/tenancy/workspace" "github.com/kcp-dev/kcp/pkg/server" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) type WorkspaceOption interface { diff --git a/test/e2e/garbagecollector/garbagecollector_test.go b/test/e2e/garbagecollector/garbagecollector_test.go index 5994e8eb002..c0be5dd9d9d 100644 --- a/test/e2e/garbagecollector/garbagecollector_test.go +++ b/test/e2e/garbagecollector/garbagecollector_test.go @@ -45,9 +45,9 @@ import ( configcrds "github.com/kcp-dev/kcp/config/crds" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/apifixtures" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestclientset "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster" diff --git a/test/e2e/homeworkspaces/home_workspaces_test.go b/test/e2e/homeworkspaces/home_workspaces_test.go index 6660059391e..5abe493c753 100644 --- a/test/e2e/homeworkspaces/home_workspaces_test.go +++ b/test/e2e/homeworkspaces/home_workspaces_test.go @@ -26,9 +26,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - kcpclusterclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + kcpclusterclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/quota/quota_test.go b/test/e2e/quota/quota_test.go index 6b9635bbd4d..a0f9c410996 100644 --- a/test/e2e/quota/quota_test.go +++ b/test/e2e/quota/quota_test.go @@ -39,10 +39,10 @@ import ( "k8s.io/apimachinery/pkg/util/wait" configcrds "github.com/kcp-dev/kcp/config/crds" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/apifixtures" kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube" "github.com/kcp-dev/kcp/test/e2e/framework" diff --git a/test/e2e/reconciler/apiexport/apiexport_controller_test.go b/test/e2e/reconciler/apiexport/apiexport_controller_test.go index 1af331d3f4e..1d5a54b1648 100644 --- a/test/e2e/reconciler/apiexport/apiexport_controller_test.go +++ b/test/e2e/reconciler/apiexport/apiexport_controller_test.go @@ -26,9 +26,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/apiexportendpointslice/apiexportendpointslice_test.go b/test/e2e/reconciler/apiexportendpointslice/apiexportendpointslice_test.go index e525c110606..beab0d0f059 100644 --- a/test/e2e/reconciler/apiexportendpointslice/apiexportendpointslice_test.go +++ b/test/e2e/reconciler/apiexportendpointslice/apiexportendpointslice_test.go @@ -29,12 +29,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/cache/replication_test.go b/test/e2e/reconciler/cache/replication_test.go index c32f62a9b44..98722f284d1 100644 --- a/test/e2e/reconciler/cache/replication_test.go +++ b/test/e2e/reconciler/cache/replication_test.go @@ -41,13 +41,13 @@ import ( genericapirequest "k8s.io/apiserver/pkg/endpoints/request" "k8s.io/client-go/rest" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" cacheclient "github.com/kcp-dev/kcp/pkg/cache/client" "github.com/kcp-dev/kcp/pkg/cache/client/shard" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/cluster/controller_test.go b/test/e2e/reconciler/cluster/controller_test.go index d3b119b1773..4481f31a017 100644 --- a/test/e2e/reconciler/cluster/controller_test.go +++ b/test/e2e/reconciler/cluster/controller_test.go @@ -36,9 +36,9 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" fixturewildwest "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" diff --git a/test/e2e/reconciler/deployment/deployment_coordinator_test.go b/test/e2e/reconciler/deployment/deployment_coordinator_test.go index bc9730e86de..f2f0894bf16 100644 --- a/test/e2e/reconciler/deployment/deployment_coordinator_test.go +++ b/test/e2e/reconciler/deployment/deployment_coordinator_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" "github.com/kcp-dev/kcp/test/e2e/reconciler/deployment/locations" "github.com/kcp-dev/kcp/test/e2e/reconciler/deployment/workloads" diff --git a/test/e2e/reconciler/locationworkspace/local_apiexport_test.go b/test/e2e/reconciler/locationworkspace/local_apiexport_test.go index 2054f79ed2a..8507eddf57a 100644 --- a/test/e2e/reconciler/locationworkspace/local_apiexport_test.go +++ b/test/e2e/reconciler/locationworkspace/local_apiexport_test.go @@ -36,9 +36,9 @@ import ( "k8s.io/client-go/tools/clientcmd" "sigs.k8s.io/yaml" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/locationworkspace/multiple_apiexports_test.go b/test/e2e/reconciler/locationworkspace/multiple_apiexports_test.go index 6782229c859..e096da18f74 100644 --- a/test/e2e/reconciler/locationworkspace/multiple_apiexports_test.go +++ b/test/e2e/reconciler/locationworkspace/multiple_apiexports_test.go @@ -42,10 +42,10 @@ import ( "github.com/kcp-dev/kcp/config/helpers" kube124 "github.com/kcp-dev/kcp/config/rootcompute/kube-1.24" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/locationworkspace/rootcompute_test.go b/test/e2e/reconciler/locationworkspace/rootcompute_test.go index fb6a27cacd1..e9dd4bbf3ed 100644 --- a/test/e2e/reconciler/locationworkspace/rootcompute_test.go +++ b/test/e2e/reconciler/locationworkspace/rootcompute_test.go @@ -38,8 +38,8 @@ import ( "k8s.io/client-go/restmapper" "k8s.io/client-go/scale" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/locationworkspace/synctarget_test.go b/test/e2e/reconciler/locationworkspace/synctarget_test.go index 8d51a5f6fd3..fea05332d81 100644 --- a/test/e2e/reconciler/locationworkspace/synctarget_test.go +++ b/test/e2e/reconciler/locationworkspace/synctarget_test.go @@ -41,10 +41,10 @@ import ( "github.com/kcp-dev/kcp/config/helpers" kube124 "github.com/kcp-dev/kcp/config/rootcompute/kube-1.24" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/namespace/controller_test.go b/test/e2e/reconciler/namespace/controller_test.go index 131ba7bf274..e464d717643 100644 --- a/test/e2e/reconciler/namespace/controller_test.go +++ b/test/e2e/reconciler/namespace/controller_test.go @@ -44,13 +44,13 @@ import ( "k8s.io/client-go/util/retry" configcrds "github.com/kcp-dev/kcp/config/crds" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - clientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" workloadnamespace "github.com/kcp-dev/kcp/pkg/reconciler/workload/namespace" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + clientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/partitionset/partitionset_test.go b/test/e2e/reconciler/partitionset/partitionset_test.go index 9e03ec64629..c1742ebeafc 100644 --- a/test/e2e/reconciler/partitionset/partitionset_test.go +++ b/test/e2e/reconciler/partitionset/partitionset_test.go @@ -31,11 +31,11 @@ import ( "k8s.io/apimachinery/pkg/util/validation" "k8s.io/apimachinery/pkg/util/wait" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - topologyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/topology/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/scheduling/api_compatibility_test.go b/test/e2e/reconciler/scheduling/api_compatibility_test.go index 319f111caac..1d4d030951c 100644 --- a/test/e2e/reconciler/scheduling/api_compatibility_test.go +++ b/test/e2e/reconciler/scheduling/api_compatibility_test.go @@ -27,10 +27,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/scheduling/controller_test.go b/test/e2e/reconciler/scheduling/controller_test.go index 5bc32b70236..33fb678e59d 100644 --- a/test/e2e/reconciler/scheduling/controller_test.go +++ b/test/e2e/reconciler/scheduling/controller_test.go @@ -32,11 +32,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/yaml" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/scheduling/multi_placements_test.go b/test/e2e/reconciler/scheduling/multi_placements_test.go index 3eb3f7805b6..408428ce77c 100644 --- a/test/e2e/reconciler/scheduling/multi_placements_test.go +++ b/test/e2e/reconciler/scheduling/multi_placements_test.go @@ -31,9 +31,9 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/scheduling/placement_scheduler_test.go b/test/e2e/reconciler/scheduling/placement_scheduler_test.go index 91c7f3b1b49..26b3bc0c76f 100644 --- a/test/e2e/reconciler/scheduling/placement_scheduler_test.go +++ b/test/e2e/reconciler/scheduling/placement_scheduler_test.go @@ -32,10 +32,10 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/scheduling/upsynced_scheduling_test.go b/test/e2e/reconciler/scheduling/upsynced_scheduling_test.go index f5ed40f86e1..023224dedae 100644 --- a/test/e2e/reconciler/scheduling/upsynced_scheduling_test.go +++ b/test/e2e/reconciler/scheduling/upsynced_scheduling_test.go @@ -31,9 +31,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/shard/controller_test.go b/test/e2e/reconciler/shard/controller_test.go index 9bd6aa1df38..78b9c6ddf66 100644 --- a/test/e2e/reconciler/shard/controller_test.go +++ b/test/e2e/reconciler/shard/controller_test.go @@ -25,9 +25,9 @@ import ( "k8s.io/client-go/kubernetes" - "github.com/kcp-dev/kcp/pkg/apis/core" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" - corev1alpha1client "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/typed/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" + corev1alpha1client "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/workspace/apibinding_initializer_test.go b/test/e2e/reconciler/workspace/apibinding_initializer_test.go index 645154bf57e..d56618830ff 100644 --- a/test/e2e/reconciler/workspace/apibinding_initializer_test.go +++ b/test/e2e/reconciler/workspace/apibinding_initializer_test.go @@ -28,9 +28,9 @@ import ( "k8s.io/client-go/restmapper" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/workspace/controller_test.go b/test/e2e/reconciler/workspace/controller_test.go index 20bca1d252e..3c3073a3872 100644 --- a/test/e2e/reconciler/workspace/controller_test.go +++ b/test/e2e/reconciler/workspace/controller_test.go @@ -28,12 +28,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - utilconditions "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned" - kcpclusterclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + utilconditions "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned" + kcpclusterclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/reconciler/workspacedeletion/controller_test.go b/test/e2e/reconciler/workspacedeletion/controller_test.go index a44e496ffe0..078a28a2a3c 100644 --- a/test/e2e/reconciler/workspacedeletion/controller_test.go +++ b/test/e2e/reconciler/workspacedeletion/controller_test.go @@ -33,11 +33,11 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/yaml" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/syncer/syncer_test.go b/test/e2e/syncer/syncer_test.go index 8bd1ccad3f6..631ad098e6f 100644 --- a/test/e2e/syncer/syncer_test.go +++ b/test/e2e/syncer/syncer_test.go @@ -44,9 +44,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/utils/pointer" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/syncer/tunnels_test.go b/test/e2e/syncer/tunnels_test.go index 51e8ca8b897..c4465099a33 100644 --- a/test/e2e/syncer/tunnels_test.go +++ b/test/e2e/syncer/tunnels_test.go @@ -37,9 +37,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/syncer/shared" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/virtual/apiexport/authorizer_test.go b/test/e2e/virtual/apiexport/authorizer_test.go index 1d700350b44..c1eb9c60cfb 100644 --- a/test/e2e/virtual/apiexport/authorizer_test.go +++ b/test/e2e/virtual/apiexport/authorizer_test.go @@ -48,15 +48,15 @@ import ( "k8s.io/client-go/restmapper" "github.com/kcp-dev/kcp/config/helpers" - "github.com/kcp-dev/kcp/pkg/apis/apis" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/core" - "github.com/kcp-dev/kcp/pkg/apis/scheduling" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/apis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/core" + "github.com/kcp-dev/kcp/sdk/apis/scheduling" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/virtual/apiexport/binding_test.go b/test/e2e/virtual/apiexport/binding_test.go index 86ebdbcfcd0..4b2771970eb 100644 --- a/test/e2e/virtual/apiexport/binding_test.go +++ b/test/e2e/virtual/apiexport/binding_test.go @@ -31,7 +31,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/virtual/apiexport/virtualworkspace_test.go b/test/e2e/virtual/apiexport/virtualworkspace_test.go index 3da699d1954..3baf8c8b0ea 100644 --- a/test/e2e/virtual/apiexport/virtualworkspace_test.go +++ b/test/e2e/virtual/apiexport/virtualworkspace_test.go @@ -54,11 +54,11 @@ import ( "sigs.k8s.io/yaml" "github.com/kcp-dev/kcp/config/helpers" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" apiexportbuiltin "github.com/kcp-dev/kcp/pkg/virtual/apiexport/schemas/builtin" "github.com/kcp-dev/kcp/pkg/virtual/framework/internalapis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/apifixtures" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" diff --git a/test/e2e/virtual/initializingworkspaces/virtualworkspace_test.go b/test/e2e/virtual/initializingworkspaces/virtualworkspace_test.go index 54a96eb2e69..e4366d56729 100644 --- a/test/e2e/virtual/initializingworkspaces/virtualworkspace_test.go +++ b/test/e2e/virtual/initializingworkspaces/virtualworkspace_test.go @@ -45,12 +45,12 @@ import ( "k8s.io/apiserver/pkg/endpoints/discovery" "k8s.io/client-go/rest" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/test/e2e/virtual/syncer/virtualworkspace_test.go b/test/e2e/virtual/syncer/virtualworkspace_test.go index 4a242bc4006..ce88b7af1d5 100644 --- a/test/e2e/virtual/syncer/virtualworkspace_test.go +++ b/test/e2e/virtual/syncer/virtualworkspace_test.go @@ -43,10 +43,10 @@ import ( "k8s.io/client-go/rest" "github.com/kcp-dev/kcp/config/rootcompute" - schedulingv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/scheduling/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/syncer/shared" + schedulingv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/scheduling/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" kubefixtures "github.com/kcp-dev/kcp/test/e2e/fixtures/kube" fixturewildwest "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest" diff --git a/test/e2e/watchcache/watchcache_enabled_test.go b/test/e2e/watchcache/watchcache_enabled_test.go index 4c5d4a13735..b1d0f8de0ff 100644 --- a/test/e2e/watchcache/watchcache_enabled_test.go +++ b/test/e2e/watchcache/watchcache_enabled_test.go @@ -37,7 +37,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/fixtures/apifixtures" "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" diff --git a/test/e2e/workspacetype/controller_test.go b/test/e2e/workspacetype/controller_test.go index 8bacdb800c4..be0e1cea0a1 100644 --- a/test/e2e/workspacetype/controller_test.go +++ b/test/e2e/workspacetype/controller_test.go @@ -33,12 +33,12 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/util/retry" - "github.com/kcp-dev/kcp/pkg/apis/core" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/tenancy/initialization" - tenancyv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/pkg/apis/third_party/conditions/util/conditions" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" + "github.com/kcp-dev/kcp/sdk/apis/core" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/tenancy/initialization" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/util/conditions" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/test/e2e/framework" ) diff --git a/tmc/pkg/coordination/helpers.go b/tmc/pkg/coordination/helpers.go index fac137a7b3a..5388c5072ff 100644 --- a/tmc/pkg/coordination/helpers.go +++ b/tmc/pkg/coordination/helpers.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" syncercontext "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/context" "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/transformations" ) diff --git a/tmc/pkg/server/controllers.go b/tmc/pkg/server/controllers.go index d8bc078e455..70679531e80 100644 --- a/tmc/pkg/server/controllers.go +++ b/tmc/pkg/server/controllers.go @@ -29,7 +29,6 @@ import ( "k8s.io/client-go/rest" "k8s.io/klog/v2" - kcpclientset "github.com/kcp-dev/kcp/pkg/client/clientset/versioned/cluster" "github.com/kcp-dev/kcp/pkg/reconciler/apis/apiresource" schedulinglocationstatus "github.com/kcp-dev/kcp/pkg/reconciler/scheduling/location" schedulingplacement "github.com/kcp-dev/kcp/pkg/reconciler/scheduling/placement" @@ -41,6 +40,7 @@ import ( workloadresource "github.com/kcp-dev/kcp/pkg/reconciler/workload/resource" synctargetcontroller "github.com/kcp-dev/kcp/pkg/reconciler/workload/synctarget" "github.com/kcp-dev/kcp/pkg/reconciler/workload/synctargetexports" + kcpclientset "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/cluster" ) func postStartHookName(controllerName string) string { diff --git a/tmc/pkg/server/server.go b/tmc/pkg/server/server.go index db8336e7b9e..8eb6ba4bc5a 100644 --- a/tmc/pkg/server/server.go +++ b/tmc/pkg/server/server.go @@ -26,9 +26,9 @@ import ( "k8s.io/klog/v2" configrootcompute "github.com/kcp-dev/kcp/config/rootcompute" - corev1alpha1 "github.com/kcp-dev/kcp/pkg/apis/core/v1alpha1" kcpfeatures "github.com/kcp-dev/kcp/pkg/features" coreserver "github.com/kcp-dev/kcp/pkg/server" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" ) type Server struct { diff --git a/tmc/pkg/virtual/options/options.go b/tmc/pkg/virtual/options/options.go index 451fc1fa80c..f3c3586a5ea 100644 --- a/tmc/pkg/virtual/options/options.go +++ b/tmc/pkg/virtual/options/options.go @@ -21,9 +21,9 @@ import ( "k8s.io/client-go/rest" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" "github.com/kcp-dev/kcp/pkg/virtual/options" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" synceroptions "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/options" ) diff --git a/tmc/pkg/virtual/syncer/builder/build.go b/tmc/pkg/virtual/syncer/builder/build.go index 94d3918745e..50862f9dc3b 100644 --- a/tmc/pkg/virtual/syncer/builder/build.go +++ b/tmc/pkg/virtual/syncer/builder/build.go @@ -25,11 +25,11 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/tools/cache" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/controllers/apireconciler" "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/transformations" "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/upsyncer" diff --git a/tmc/pkg/virtual/syncer/builder/template.go b/tmc/pkg/virtual/syncer/builder/template.go index 399a253d147..c5fd86fec59 100644 --- a/tmc/pkg/virtual/syncer/builder/template.go +++ b/tmc/pkg/virtual/syncer/builder/template.go @@ -35,10 +35,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/authorization/delegated" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/virtual/framework" virtualworkspacesdynamic "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" @@ -46,6 +43,9 @@ import ( dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" "github.com/kcp-dev/kcp/pkg/virtual/framework/forwardingregistry" "github.com/kcp-dev/kcp/pkg/virtual/framework/transforming" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" syncercontext "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/context" "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/controllers/apireconciler" ) diff --git a/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go b/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go index 88ffc8e5acd..9f6c27468dc 100644 --- a/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go +++ b/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go @@ -35,16 +35,16 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - apisv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/apis/v1alpha1" - workloadv1alpha1informers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions/workload/v1alpha1" - apisv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/apis/v1alpha1" - workloadv1alpha1listers "github.com/kcp-dev/kcp/pkg/client/listers/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + apisv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/apis/v1alpha1" + workloadv1alpha1informers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions/workload/v1alpha1" + apisv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/apis/v1alpha1" + workloadv1alpha1listers "github.com/kcp-dev/kcp/sdk/client/listers/workload/v1alpha1" ) const ( diff --git a/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_indexes.go b/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_indexes.go index 64344a3b9c1..e1297aeb4ef 100644 --- a/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_indexes.go +++ b/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_indexes.go @@ -19,10 +19,10 @@ package apireconciler import ( "github.com/kcp-dev/logicalcluster/v3" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" - "github.com/kcp-dev/kcp/pkg/client" reconcilerapiexport "github.com/kcp-dev/kcp/pkg/reconciler/workload/apiexport" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/client" ) // IndexAPIExportsByAPIResourceSchemas is an index function that maps an APIExport to its spec.latestResourceSchemas. diff --git a/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go b/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go index 4402a976afc..8b271826ea0 100644 --- a/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go +++ b/tmc/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go @@ -28,12 +28,12 @@ import ( "k8s.io/apimachinery/pkg/util/errors" "k8s.io/klog/v2" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" - workloadv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" "github.com/kcp-dev/kcp/pkg/indexers" "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + workloadv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" syncerbuiltin "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/schemas/builtin" ) diff --git a/tmc/pkg/virtual/syncer/options/options.go b/tmc/pkg/virtual/syncer/options/options.go index ede4fbccdcd..a01a2d94685 100644 --- a/tmc/pkg/virtual/syncer/options/options.go +++ b/tmc/pkg/virtual/syncer/options/options.go @@ -23,8 +23,8 @@ import ( "k8s.io/client-go/rest" - kcpinformers "github.com/kcp-dev/kcp/pkg/client/informers/externalversions" "github.com/kcp-dev/kcp/pkg/virtual/framework/rootapiserver" + kcpinformers "github.com/kcp-dev/kcp/sdk/client/informers/externalversions" "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/builder" ) diff --git a/tmc/pkg/virtual/syncer/schemas/builtin/builtin.go b/tmc/pkg/virtual/syncer/schemas/builtin/builtin.go index 3e3b185111b..cbabeea4e12 100644 --- a/tmc/pkg/virtual/syncer/schemas/builtin/builtin.go +++ b/tmc/pkg/virtual/syncer/schemas/builtin/builtin.go @@ -26,8 +26,8 @@ import ( "k8s.io/kubernetes/pkg/apis/core/install/genericcontrolplane" generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" - apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" "github.com/kcp-dev/kcp/pkg/virtual/framework/internalapis" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // syncerSchemas contains a list of internal APIs that should be exposed for the diff --git a/tmc/pkg/virtual/syncer/transformations/defaultsummarizing.go b/tmc/pkg/virtual/syncer/transformations/defaultsummarizing.go index 6ac04383148..c9757f9f948 100644 --- a/tmc/pkg/virtual/syncer/transformations/defaultsummarizing.go +++ b/tmc/pkg/virtual/syncer/transformations/defaultsummarizing.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var _ SummarizingRules = (*DefaultSummarizingRules)(nil) diff --git a/tmc/pkg/virtual/syncer/transformations/helpers.go b/tmc/pkg/virtual/syncer/transformations/helpers.go index 37077b108d3..8d63bc5ba6e 100644 --- a/tmc/pkg/virtual/syncer/transformations/helpers.go +++ b/tmc/pkg/virtual/syncer/transformations/helpers.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) // getSyncerViewFields builds a map whose keys are the summarizing field paths, diff --git a/tmc/pkg/virtual/syncer/transformations/specdiff.go b/tmc/pkg/virtual/syncer/transformations/specdiff.go index 8161508990e..20e1eabac7c 100644 --- a/tmc/pkg/virtual/syncer/transformations/specdiff.go +++ b/tmc/pkg/virtual/syncer/transformations/specdiff.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/workload/helpers" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" + "github.com/kcp-dev/kcp/sdk/apis/workload/helpers" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" ) var _ Transformation = (*SpecDiffTransformation)(nil) diff --git a/tmc/pkg/virtual/syncer/transformations/transformer.go b/tmc/pkg/virtual/syncer/transformations/transformer.go index 0b837809b8d..1d016a73a4d 100644 --- a/tmc/pkg/virtual/syncer/transformations/transformer.go +++ b/tmc/pkg/virtual/syncer/transformations/transformer.go @@ -34,12 +34,12 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/klog/v2" - "github.com/kcp-dev/kcp/pkg/apis/workload/helpers" - "github.com/kcp-dev/kcp/pkg/apis/workload/v1alpha1" . "github.com/kcp-dev/kcp/pkg/logging" "github.com/kcp-dev/kcp/pkg/syncer/shared" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" "github.com/kcp-dev/kcp/pkg/virtual/framework/transforming" + "github.com/kcp-dev/kcp/sdk/apis/workload/helpers" + "github.com/kcp-dev/kcp/sdk/apis/workload/v1alpha1" . "github.com/kcp-dev/kcp/tmc/pkg/logging" syncercontext "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/context" ) diff --git a/tmc/pkg/virtual/syncer/transformations/transformer_test.go b/tmc/pkg/virtual/syncer/transformations/transformer_test.go index dd30604fec4..aec6df68052 100644 --- a/tmc/pkg/virtual/syncer/transformations/transformer_test.go +++ b/tmc/pkg/virtual/syncer/transformations/transformer_test.go @@ -40,10 +40,10 @@ import ( "k8s.io/client-go/dynamic/fake" clienttesting "k8s.io/client-go/testing" - "github.com/kcp-dev/kcp/pkg/apis/workload/helpers" - "github.com/kcp-dev/kcp/pkg/client" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" "github.com/kcp-dev/kcp/pkg/virtual/framework/transforming" + "github.com/kcp-dev/kcp/sdk/apis/workload/helpers" + "github.com/kcp-dev/kcp/sdk/client" syncercontext "github.com/kcp-dev/kcp/tmc/pkg/virtual/syncer/context" ) diff --git a/tmc/pkg/virtual/syncer/transformations/types.go b/tmc/pkg/virtual/syncer/transformations/types.go index 2751ac67c9f..ec71508086d 100644 --- a/tmc/pkg/virtual/syncer/transformations/types.go +++ b/tmc/pkg/virtual/syncer/transformations/types.go @@ -21,7 +21,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - "github.com/kcp-dev/kcp/pkg/apis/workload/helpers" + "github.com/kcp-dev/kcp/sdk/apis/workload/helpers" ) // Transformation defines the action of transforming an resource when exposing it