diff --git a/.github/workflows/docs-gen-and-push.yaml b/.github/workflows/docs-gen-and-push.yaml index 7eb29fb9f2c..156706cb458 100644 --- a/.github/workflows/docs-gen-and-push.yaml +++ b/.github/workflows/docs-gen-and-push.yaml @@ -34,7 +34,7 @@ jobs: - uses: actions/setup-go@v5 with: - go-version: v1.22.10 + go-version: v1.23.4 cache: true - uses: actions/setup-python@v5 diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index be7a3036d06..b8208c78944 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -22,7 +22,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v5 with: - go-version: v1.22.10 + go-version: v1.23.4 - name: Delete non-semver tags run: 'git tag -d $(git tag -l | grep -v "^v")' - name: Set LDFLAGS diff --git a/.prow.yaml b/.prow.yaml index 802dcb9f1a5..75b58051427 100644 --- a/.prow.yaml +++ b/.prow.yaml @@ -7,7 +7,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - make - verify-boilerplate @@ -27,7 +27,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - make - verify-codegen @@ -44,7 +44,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - make - lint @@ -83,7 +83,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - make - test @@ -104,7 +104,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - ./hack/run-with-prometheus.sh - make @@ -134,7 +134,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - ./hack/run-with-prometheus.sh - make @@ -166,7 +166,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - ./hack/run-with-prometheus.sh - make @@ -194,7 +194,7 @@ presubmits: preset-goproxy: "true" spec: containers: - - image: ghcr.io/kcp-dev/infra/build:1.22.10-1 + - image: ghcr.io/kcp-dev/infra/build:1.23.4-1 command: - ./hack/run-with-prometheus.sh - make diff --git a/Dockerfile b/Dockerfile index a2341a40b58..3279b88db2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # Build the binary -FROM --platform=${BUILDPLATFORM} docker.io/golang:1.22.10 AS builder +FROM --platform=${BUILDPLATFORM} docker.io/golang:1.23.4 AS builder WORKDIR /workspace # Install dependencies. diff --git a/Makefile b/Makefile index afb51a421e6..c2d33137041 100644 --- a/Makefile +++ b/Makefile @@ -72,7 +72,7 @@ LOGCHECK_BIN := logcheck LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER) export LOGCHECK # so hack scripts can use it -CODE_GENERATOR_VER := v2.3.0 +CODE_GENERATOR_VER := v2.4.0 CODE_GENERATOR_BIN := code-generator CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER) export CODE_GENERATOR # so hack scripts can use it diff --git a/cli/go.mod b/cli/go.mod index 4b8fd9e9b43..d287eaf4097 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,52 +1,51 @@ module github.com/kcp-dev/kcp/cli -go 1.22.0 +go 1.23.0 require ( github.com/google/go-cmp v0.6.0 - github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e + github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861 github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000 github.com/kcp-dev/logicalcluster/v3 v3.0.5 github.com/spf13/cobra v1.8.1 - github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace - github.com/stretchr/testify v1.9.0 + github.com/spf13/pflag v1.0.6 + github.com/stretchr/testify v1.10.0 github.com/xlab/treeprint v1.2.0 - k8s.io/apiextensions-apiserver v0.31.0 - k8s.io/apimachinery v0.31.0 - k8s.io/cli-runtime v0.31.0 - k8s.io/client-go v0.31.0 - k8s.io/component-base v0.31.0 + k8s.io/apiextensions-apiserver v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/cli-runtime v0.32.0 + k8s.io/client-go v0.32.0 + k8s.io/component-base v0.32.0 k8s.io/klog/v2 v2.130.1 ) require ( - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-errors/errors v1.4.2 // indirect github.com/go-logr/logr v1.4.2 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/btree v1.0.1 // indirect - github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/gnostic-models v0.6.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect - github.com/imdario/mergo v0.3.12 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb // indirect + github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 // indirect github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect - github.com/mailru/easyjson v0.7.7 // indirect + github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-runewidth v0.0.12 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -54,32 +53,32 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/muesli/reflow v0.3.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/gomega v1.33.1 // indirect + github.com/onsi/gomega v1.35.1 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/rivo/uniseg v0.2.0 // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect github.com/x448/float16 v0.8.4 // indirect - go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect - golang.org/x/time v0.3.0 // indirect - google.golang.org/protobuf v1.34.2 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/oauth2 v0.26.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/term v0.29.0 // indirect + golang.org/x/text v0.22.0 // indirect + golang.org/x/time v0.10.0 // indirect + golang.org/x/tools v0.30.0 // indirect + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.31.0 // indirect - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kustomize/api v0.17.2 // indirect - sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/api v0.32.0 // indirect + k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect + k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect + sigs.k8s.io/kustomize/api v0.18.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/cli/go.sum b/cli/go.sum index 69fa2021a44..5d10e4936f5 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,36 +1,28 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= +cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= -github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= -github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= +github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= +github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= 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/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/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/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= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= 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/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= @@ -39,82 +31,62 @@ github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxI github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.20.1 h1:nDx9r8S3L4pE61eDdt8igGj8rf5kjYR3ILxWIpWNi84= -github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40= +github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= +github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= +github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb h1:W11F/dp6NdUnHeB0SrpyWLiifRosu1qaMJvdFGGLXc0= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb/go.mod h1:mEDD1K5BVUXJ4CP6wcJ0vZUf+7tbFMjkCFzBKsUNj18= -github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e h1:9wOMy1qKXpefpW28vccGEX3o/IaoDu3PZSqDeaz1p8k= -github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e/go.mod h1:GZTo7YtdO7PJ6VwWjKUiby5WjNh7YQZieDqNvbSHd0U= +github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 h1:6MeV6CBJhNxF3DhkdwhcqeyEc8Al2MGeKFNA0O95icc= +github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA= +github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861 h1:Wzb0BaJPK3vMU7HSkGGprs7fJSB90o2d8coj2S2xP0Q= +github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861/go.mod h1:RRScyGU72S5wVJDBWxcANmxgx723N/Eb4XqEF4655wI= github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU= github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= @@ -130,10 +102,10 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -141,138 +113,99 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -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/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/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/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= -go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -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-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/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/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= +golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4= +golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -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= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 h1:L9JNMl/plZH9wmzQUHleO/ZZDSN+9Gh41wPczNy+5Fk= +google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 h1:2duwAxN2+k0xLNpjnHTXoMUgnv6VPSp5fiqTuwSxjmI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -280,42 +213,36 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= -k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= -k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= -k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= -k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= -k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk= -k8s.io/cli-runtime v0.31.0 h1:V2Q1gj1u3/WfhD475HBQrIYsoryg/LrhhK4RwpN+DhA= -k8s.io/cli-runtime v0.31.0/go.mod h1:vg3H94wsubuvWfSmStDbekvbla5vFGC+zLWqcf+bGDw= -k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= -k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= -k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= -k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= +k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= +k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs= +k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag= +k8s.io/cli-runtime v0.32.0 h1:dP+OZqs7zHPpGQMCGAhectbHU2SNCuZtIimRKTv2T1c= +k8s.io/cli-runtime v0.32.0/go.mod h1:Mai8ht2+esoDRK5hr861KRy6z0zHsSTYttNVJXgP3YQ= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU= +k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kustomize/api v0.17.2 h1:E7/Fjk7V5fboiuijoZHgs4aHuexi5Y2loXlVOAVAG5g= -sigs.k8s.io/kustomize/api v0.17.2/go.mod h1:UWTz9Ct+MvoeQsHcJ5e+vziRRkwimm3HytpZgIYqye0= -sigs.k8s.io/kustomize/kyaml v0.17.1 h1:TnxYQxFXzbmNG6gOINgGWQt09GghzgTP6mIurOgrLCQ= -sigs.k8s.io/kustomize/kyaml v0.17.1/go.mod h1:9V0mCjIEYjlXuCdYsSXvyoy2BTsLESH7TlGV81S282U= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo= +sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U= +sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E= +sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/cmd/kcp/kcp.go b/cmd/kcp/kcp.go index e3eeb6b1d96..d6857ea5b14 100644 --- a/cmd/kcp/kcp.go +++ b/cmd/kcp/kcp.go @@ -113,7 +113,9 @@ func main() { return err } - completedKcpOptions, err := kcpOptions.Complete() + ctx := genericapiserver.SetupSignalContext() + + completedKcpOptions, err := kcpOptions.Complete(ctx) if err != nil { return err } @@ -125,8 +127,6 @@ func main() { logger := klog.FromContext(cmd.Context()) logger.Info("running with selected batteries", "batteries", strings.Join(completedKcpOptions.Server.Extra.BatteriesIncluded, ",")) - ctx := genericapiserver.SetupSignalContext() - serverConfig, err := server.NewConfig(ctx, completedKcpOptions.Server) if err != nil { return err diff --git a/cmd/kcp/options/options.go b/cmd/kcp/options/options.go index aa10cbd1721..abdf5d57047 100644 --- a/cmd/kcp/options/options.go +++ b/cmd/kcp/options/options.go @@ -17,6 +17,7 @@ limitations under the License. package options import ( + "context" "io" cliflag "k8s.io/component-base/cli/flag" @@ -63,13 +64,13 @@ func (o *Options) AddFlags(fss *cliflag.NamedFlagSets) { o.Server.AddFlags(fss) } -func (o *Options) Complete() (*CompletedOptions, error) { +func (o *Options) Complete(ctx context.Context) (*CompletedOptions, error) { generic, err := o.Generic.Complete() if err != nil { return nil, err } - server, err := o.Server.Complete(generic.RootDirectory) + server, err := o.Server.Complete(ctx, generic.RootDirectory) if err != nil { return nil, err } diff --git a/config/crds/admissionregistration.k8s.io_validatingadmissionpolicies.yaml b/config/crds/admissionregistration.k8s.io_validatingadmissionpolicies.yaml index bbc529c63ea..89abafa2c56 100755 --- a/config/crds/admissionregistration.k8s.io_validatingadmissionpolicies.yaml +++ b/config/crds/admissionregistration.k8s.io_validatingadmissionpolicies.yaml @@ -18,415 +18,6 @@ spec: singular: validatingadmissionpolicy scope: Cluster versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: ValidatingAdmissionPolicy describes the definition of an admission - validation policy that accepts or rejects an object without changing it. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: Specification of the desired behavior of the ValidatingAdmissionPolicy. - properties: - failurePolicy: - description: FailurePolicy defines how to handle failures for the - admission policy. Failures can occur from invalid or mis-configured - policy definitions or bindings. A policy is invalid if spec.paramKind - refers to a non-existent Kind. A binding is invalid if spec.paramRef.name - refers to a non-existent resource. Allowed values are Ignore or - Fail. Defaults to Fail. - type: string - matchConstraints: - description: MatchConstraints specifies what resources this policy - is designed to validate. The AdmissionPolicy cares about a request - if it matches _all_ Constraints. However, in order to prevent clusters - from being put into an unstable state that cannot be recovered from - via the API ValidatingAdmissionPolicy cannot match ValidatingAdmissionPolicy - and ValidatingAdmissionPolicyBinding. Required. - properties: - excludeResourceRules: - description: ExcludeResourceRules describes what operations on - what resources/subresources the ValidatingAdmissionPolicy should - not care about. The exclude rules take precedence over include - rules (if a resource matches both, it is excluded) - items: - description: NamedRuleWithOperations is a tuple of Operations - and Resources with ResourceNames. - properties: - apiGroups: - description: APIGroups is the API groups the resources belong - to. '*' is all groups. If '*' is present, the length of - the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - apiVersions: - description: APIVersions is the API versions the resources - belong to. '*' is all versions. If '*' is present, the - length of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - operations: - description: Operations is the operations the admission - hook cares about - CREATE, UPDATE, DELETE, CONNECT or - * for all of those operations and any future admission - operations that are added. If '*' is present, the length - of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resourceNames: - description: ResourceNames is an optional white list of - names that the rule applies to. An empty set means that - everything is allowed. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resources: - description: |- - Resources is a list of resources this rule applies to. - - For example: 'pods' means pods. 'pods/log' means the log subresource of pods. '*' means all resources, but not subresources. 'pods/*' means all subresources of pods. '*/scale' means all scale subresources. '*/*' means all resources and their subresources. - - If wildcard is present, the validation rule will ensure resources do not overlap with each other. - - Depending on the enclosing object, subresources might not be allowed. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - scope: - description: scope specifies the scope of this rule. Valid - values are "Cluster", "Namespaced", and "*" "Cluster" - means that only cluster-scoped resources will match this - rule. Namespace API objects are cluster-scoped. "Namespaced" - means that only namespaced resources will match this rule. - "*" means that there are no scope restrictions. Subresources - match the scope of their parent resource. Default is "*". - type: string - type: object - type: array - x-kubernetes-list-type: atomic - matchPolicy: - description: |- - matchPolicy defines how the "MatchResources" list is used to match incoming requests. Allowed values are "Exact" or "Equivalent". - - - Exact: match a request only if it exactly matches a specified rule. For example, if deployments can be modified via apps/v1, apps/v1beta1, and extensions/v1beta1, but "rules" only included `apiGroups:["apps"], apiVersions:["v1"], resources: ["deployments"]`, a request to apps/v1beta1 or extensions/v1beta1 would not be sent to the ValidatingAdmissionPolicy. - - - Equivalent: match a request if modifies a resource listed in rules, even via another API group or version. For example, if deployments can be modified via apps/v1, apps/v1beta1, and extensions/v1beta1, and "rules" only included `apiGroups:["apps"], apiVersions:["v1"], resources: ["deployments"]`, a request to apps/v1beta1 or extensions/v1beta1 would be converted to apps/v1 and sent to the ValidatingAdmissionPolicy. - - Defaults to "Equivalent" - type: string - namespaceSelector: - description: |- - NamespaceSelector decides whether to run the admission control policy on an object based on whether the namespace for that object matches the selector. If the object itself is a namespace, the matching is performed on object.metadata.labels. If the object is another cluster scoped resource, it never skips the policy. - - For example, to run the webhook on any objects whose namespace is not associated with "runlevel" of "0" or "1"; you will set the selector as follows: "namespaceSelector": { - "matchExpressions": [ - { - "key": "runlevel", - "operator": "NotIn", - "values": [ - "0", - "1" - ] - } - ] - } - - If instead you want to only run the policy on any objects whose namespace is associated with the "environment" of "prod" or "staging"; you will set the selector as follows: "namespaceSelector": { - "matchExpressions": [ - { - "key": "environment", - "operator": "In", - "values": [ - "prod", - "staging" - ] - } - ] - } - - See https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ for more examples of label selectors. - - Default to the empty LabelSelector, which matches everything. - properties: - matchExpressions: - description: matchExpressions is a list of label selector - requirements. The requirements are ANDed. - items: - description: A label selector requirement is a selector - that contains values, a key, and an operator that relates - the key and values. - properties: - key: - description: key is the label key that the selector - applies to. - type: string - operator: - description: operator represents a key's relationship - to a set of values. Valid operators are In, NotIn, - Exists and DoesNotExist. - type: string - values: - description: values is an array of string values. If - the operator is In or NotIn, the values array must - be non-empty. If the operator is Exists or DoesNotExist, - the values array must be empty. This array is replaced - during a strategic merge patch. - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - description: matchLabels is a map of {key,value} pairs. A - single {key,value} in the matchLabels map is equivalent - to an element of matchExpressions, whose key field is "key", - the operator is "In", and the values array contains only - "value". The requirements are ANDed. - type: object - type: object - objectSelector: - description: ObjectSelector decides whether to run the validation - based on if the object has matching labels. objectSelector is - evaluated against both the oldObject and newObject that would - be sent to the cel validation, and is considered to match if - either object matches the selector. A null object (oldObject - in the case of create, or newObject in the case of delete) or - an object that cannot have labels (like a DeploymentRollback - or a PodProxyOptions object) is not considered to match. Use - the object selector only if the webhook is opt-in, because end - users may skip the admission webhook by setting the labels. - Default to the empty LabelSelector, which matches everything. - properties: - matchExpressions: - description: matchExpressions is a list of label selector - requirements. The requirements are ANDed. - items: - description: A label selector requirement is a selector - that contains values, a key, and an operator that relates - the key and values. - properties: - key: - description: key is the label key that the selector - applies to. - type: string - operator: - description: operator represents a key's relationship - to a set of values. Valid operators are In, NotIn, - Exists and DoesNotExist. - type: string - values: - description: values is an array of string values. If - the operator is In or NotIn, the values array must - be non-empty. If the operator is Exists or DoesNotExist, - the values array must be empty. This array is replaced - during a strategic merge patch. - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - description: matchLabels is a map of {key,value} pairs. A - single {key,value} in the matchLabels map is equivalent - to an element of matchExpressions, whose key field is "key", - the operator is "In", and the values array contains only - "value". The requirements are ANDed. - type: object - type: object - resourceRules: - description: ResourceRules describes what operations on what resources/subresources - the ValidatingAdmissionPolicy matches. The policy cares about - an operation if it matches _any_ Rule. - items: - description: NamedRuleWithOperations is a tuple of Operations - and Resources with ResourceNames. - properties: - apiGroups: - description: APIGroups is the API groups the resources belong - to. '*' is all groups. If '*' is present, the length of - the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - apiVersions: - description: APIVersions is the API versions the resources - belong to. '*' is all versions. If '*' is present, the - length of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - operations: - description: Operations is the operations the admission - hook cares about - CREATE, UPDATE, DELETE, CONNECT or - * for all of those operations and any future admission - operations that are added. If '*' is present, the length - of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resourceNames: - description: ResourceNames is an optional white list of - names that the rule applies to. An empty set means that - everything is allowed. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resources: - description: |- - Resources is a list of resources this rule applies to. - - For example: 'pods' means pods. 'pods/log' means the log subresource of pods. '*' means all resources, but not subresources. 'pods/*' means all subresources of pods. '*/scale' means all scale subresources. '*/*' means all resources and their subresources. - - If wildcard is present, the validation rule will ensure resources do not overlap with each other. - - Depending on the enclosing object, subresources might not be allowed. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - scope: - description: scope specifies the scope of this rule. Valid - values are "Cluster", "Namespaced", and "*" "Cluster" - means that only cluster-scoped resources will match this - rule. Namespace API objects are cluster-scoped. "Namespaced" - means that only namespaced resources will match this rule. - "*" means that there are no scope restrictions. Subresources - match the scope of their parent resource. Default is "*". - type: string - type: object - type: array - x-kubernetes-list-type: atomic - type: object - paramKind: - description: ParamKind specifies the kind of resources used to parameterize - this policy. If absent, there are no parameters for this policy - and the param CEL variable will not be provided to validation expressions. - If ParamKind refers to a non-existent kind, this policy definition - is mis-configured and the FailurePolicy is applied. If paramKind - is specified but paramRef is unset in ValidatingAdmissionPolicyBinding, - the params variable will be null. - properties: - apiVersion: - description: APIVersion is the API group version the resources - belong to. In format of "group/version". Required. - type: string - kind: - description: Kind is the API kind the resources belong to. Required. - type: string - type: object - validations: - description: Validations contain CEL expressions which is used to - apply the validation. A minimum of one validation is required for - a policy definition. Required. - items: - description: Validation specifies the CEL expression which is used - to apply the validation. - properties: - expression: - description: "Expression represents the expression which will - be evaluated by CEL. ref: https://github.com/google/cel-spec - CEL expressions have access to the contents of the Admission - request/response, organized into CEL variables as well as - some other useful variables:\n\n'object' - The object from - the incoming request. The value is null for DELETE requests. - 'oldObject' - The existing object. The value is null for CREATE - requests. 'request' - Attributes of the admission request([ref](/pkg/apis/admission/types.go#AdmissionRequest)). - 'params' - Parameter resource referred to by the policy binding - being evaluated. Only populated if the policy has a ParamKind.\n\nThe - `apiVersion`, `kind`, `metadata.name` and `metadata.generateName` - are always accessible from the root of the object. No other - metadata properties are accessible.\n\nOnly property names - of the form `[a-zA-Z_.-/][a-zA-Z0-9_.-/]*` are accessible. - Accessible property names are escaped according to the following - rules when accessed in the expression: - '__' escapes to '__underscores__' - - '.' escapes to '__dot__' - '-' escapes to '__dash__' - '/' - escapes to '__slash__' - Property names that exactly match - a CEL RESERVED keyword escape to '__{keyword}__'. The keywords - are:\n\t \"true\", \"false\", \"null\", \"in\", \"as\", \"break\", - \"const\", \"continue\", \"else\", \"for\", \"function\", - \"if\",\n\t \"import\", \"let\", \"loop\", \"package\", \"namespace\", - \"return\".\nExamples:\n - Expression accessing a property - named \"namespace\": {\"Expression\": \"object.__namespace__ - > 0\"}\n - Expression accessing a property named \"x-prop\": - {\"Expression\": \"object.x__dash__prop > 0\"}\n - Expression - accessing a property named \"redact__d\": {\"Expression\": - \"object.redact__underscores__d > 0\"}\n\nEquality on arrays - with list type of 'set' or 'map' ignores element order, i.e. - [1, 2] == [2, 1]. Concatenation on arrays with x-kubernetes-list-type - use the semantics of the list type:\n - 'set': `X + Y` performs - a union where the array positions of all elements in `X` are - preserved and\n non-intersecting elements in `Y` are appended, - retaining their partial order.\n - 'map': `X + Y` performs - a merge where the array positions of all keys in `X` are preserved - but the values\n are overwritten by values in `Y` when - the key sets of `X` and `Y` intersect. Elements in `Y` with\n - \ non-intersecting keys are appended, retaining their partial - order.\nRequired." - type: string - message: - description: 'Message represents the message displayed when - validation fails. The message is required if the Expression - contains line breaks. The message must not contain line breaks. - If unset, the message is "failed rule: {Rule}". e.g. "must - be a URL with the host matching spec.host" If the Expression - contains line breaks. Message is required. The message must - not contain line breaks. If unset, the message is "failed - Expression: {Expression}".' - type: string - reason: - description: 'Reason represents a machine-readable description - of why this validation failed. If this is the first validation - in the list to fail, this reason, as well as the corresponding - HTTP response code, are used in the HTTP response to the client. - The currently supported reasons are: "Unauthorized", "Forbidden", - "Invalid", "RequestEntityTooLarge". If not set, StatusReasonInvalid - is used in the response to the client.' - type: string - required: - - expression - type: object - type: array - x-kubernetes-list-type: atomic - required: - - validations - type: object - type: object - served: true - storage: false - subresources: {} - name: v1 schema: openAPIV3Schema: @@ -1079,5 +670,4 @@ status: plural: "" conditions: null storedVersions: - - v1alpha1 - v1 diff --git a/config/crds/admissionregistration.k8s.io_validatingadmissionpolicybindings.yaml b/config/crds/admissionregistration.k8s.io_validatingadmissionpolicybindings.yaml index c262006e738..f1c1fba5a13 100755 --- a/config/crds/admissionregistration.k8s.io_validatingadmissionpolicybindings.yaml +++ b/config/crds/admissionregistration.k8s.io_validatingadmissionpolicybindings.yaml @@ -18,341 +18,6 @@ spec: singular: validatingadmissionpolicybinding scope: Cluster versions: - - name: v1alpha1 - schema: - openAPIV3Schema: - description: ValidatingAdmissionPolicyBinding binds the ValidatingAdmissionPolicy - with paramerized resources. ValidatingAdmissionPolicyBinding and parameter - CRDs together define how cluster administrators configure policies for clusters. - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: Specification of the desired behavior of the ValidatingAdmissionPolicyBinding. - properties: - matchResources: - description: MatchResources declares what resources match this binding - and will be validated by it. Note that this is intersected with - the policy's matchConstraints, so only requests that are matched - by the policy can be selected by this. If this is unset, all resources - matched by the policy are validated by this binding When resourceRules - is unset, it does not constrain resource matching. If a resource - is matched by the other fields of this object, it will be validated. - Note that this is differs from ValidatingAdmissionPolicy matchConstraints, - where resourceRules are required. - properties: - excludeResourceRules: - description: ExcludeResourceRules describes what operations on - what resources/subresources the ValidatingAdmissionPolicy should - not care about. The exclude rules take precedence over include - rules (if a resource matches both, it is excluded) - items: - description: NamedRuleWithOperations is a tuple of Operations - and Resources with ResourceNames. - properties: - apiGroups: - description: APIGroups is the API groups the resources belong - to. '*' is all groups. If '*' is present, the length of - the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - apiVersions: - description: APIVersions is the API versions the resources - belong to. '*' is all versions. If '*' is present, the - length of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - operations: - description: Operations is the operations the admission - hook cares about - CREATE, UPDATE, DELETE, CONNECT or - * for all of those operations and any future admission - operations that are added. If '*' is present, the length - of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resourceNames: - description: ResourceNames is an optional white list of - names that the rule applies to. An empty set means that - everything is allowed. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resources: - description: |- - Resources is a list of resources this rule applies to. - - For example: 'pods' means pods. 'pods/log' means the log subresource of pods. '*' means all resources, but not subresources. 'pods/*' means all subresources of pods. '*/scale' means all scale subresources. '*/*' means all resources and their subresources. - - If wildcard is present, the validation rule will ensure resources do not overlap with each other. - - Depending on the enclosing object, subresources might not be allowed. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - scope: - description: scope specifies the scope of this rule. Valid - values are "Cluster", "Namespaced", and "*" "Cluster" - means that only cluster-scoped resources will match this - rule. Namespace API objects are cluster-scoped. "Namespaced" - means that only namespaced resources will match this rule. - "*" means that there are no scope restrictions. Subresources - match the scope of their parent resource. Default is "*". - type: string - type: object - type: array - x-kubernetes-list-type: atomic - matchPolicy: - description: |- - matchPolicy defines how the "MatchResources" list is used to match incoming requests. Allowed values are "Exact" or "Equivalent". - - - Exact: match a request only if it exactly matches a specified rule. For example, if deployments can be modified via apps/v1, apps/v1beta1, and extensions/v1beta1, but "rules" only included `apiGroups:["apps"], apiVersions:["v1"], resources: ["deployments"]`, a request to apps/v1beta1 or extensions/v1beta1 would not be sent to the ValidatingAdmissionPolicy. - - - Equivalent: match a request if modifies a resource listed in rules, even via another API group or version. For example, if deployments can be modified via apps/v1, apps/v1beta1, and extensions/v1beta1, and "rules" only included `apiGroups:["apps"], apiVersions:["v1"], resources: ["deployments"]`, a request to apps/v1beta1 or extensions/v1beta1 would be converted to apps/v1 and sent to the ValidatingAdmissionPolicy. - - Defaults to "Equivalent" - type: string - namespaceSelector: - description: |- - NamespaceSelector decides whether to run the admission control policy on an object based on whether the namespace for that object matches the selector. If the object itself is a namespace, the matching is performed on object.metadata.labels. If the object is another cluster scoped resource, it never skips the policy. - - For example, to run the webhook on any objects whose namespace is not associated with "runlevel" of "0" or "1"; you will set the selector as follows: "namespaceSelector": { - "matchExpressions": [ - { - "key": "runlevel", - "operator": "NotIn", - "values": [ - "0", - "1" - ] - } - ] - } - - If instead you want to only run the policy on any objects whose namespace is associated with the "environment" of "prod" or "staging"; you will set the selector as follows: "namespaceSelector": { - "matchExpressions": [ - { - "key": "environment", - "operator": "In", - "values": [ - "prod", - "staging" - ] - } - ] - } - - See https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ for more examples of label selectors. - - Default to the empty LabelSelector, which matches everything. - properties: - matchExpressions: - description: matchExpressions is a list of label selector - requirements. The requirements are ANDed. - items: - description: A label selector requirement is a selector - that contains values, a key, and an operator that relates - the key and values. - properties: - key: - description: key is the label key that the selector - applies to. - type: string - operator: - description: operator represents a key's relationship - to a set of values. Valid operators are In, NotIn, - Exists and DoesNotExist. - type: string - values: - description: values is an array of string values. If - the operator is In or NotIn, the values array must - be non-empty. If the operator is Exists or DoesNotExist, - the values array must be empty. This array is replaced - during a strategic merge patch. - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - description: matchLabels is a map of {key,value} pairs. A - single {key,value} in the matchLabels map is equivalent - to an element of matchExpressions, whose key field is "key", - the operator is "In", and the values array contains only - "value". The requirements are ANDed. - type: object - type: object - objectSelector: - description: ObjectSelector decides whether to run the validation - based on if the object has matching labels. objectSelector is - evaluated against both the oldObject and newObject that would - be sent to the cel validation, and is considered to match if - either object matches the selector. A null object (oldObject - in the case of create, or newObject in the case of delete) or - an object that cannot have labels (like a DeploymentRollback - or a PodProxyOptions object) is not considered to match. Use - the object selector only if the webhook is opt-in, because end - users may skip the admission webhook by setting the labels. - Default to the empty LabelSelector, which matches everything. - properties: - matchExpressions: - description: matchExpressions is a list of label selector - requirements. The requirements are ANDed. - items: - description: A label selector requirement is a selector - that contains values, a key, and an operator that relates - the key and values. - properties: - key: - description: key is the label key that the selector - applies to. - type: string - operator: - description: operator represents a key's relationship - to a set of values. Valid operators are In, NotIn, - Exists and DoesNotExist. - type: string - values: - description: values is an array of string values. If - the operator is In or NotIn, the values array must - be non-empty. If the operator is Exists or DoesNotExist, - the values array must be empty. This array is replaced - during a strategic merge patch. - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - description: matchLabels is a map of {key,value} pairs. A - single {key,value} in the matchLabels map is equivalent - to an element of matchExpressions, whose key field is "key", - the operator is "In", and the values array contains only - "value". The requirements are ANDed. - type: object - type: object - resourceRules: - description: ResourceRules describes what operations on what resources/subresources - the ValidatingAdmissionPolicy matches. The policy cares about - an operation if it matches _any_ Rule. - items: - description: NamedRuleWithOperations is a tuple of Operations - and Resources with ResourceNames. - properties: - apiGroups: - description: APIGroups is the API groups the resources belong - to. '*' is all groups. If '*' is present, the length of - the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - apiVersions: - description: APIVersions is the API versions the resources - belong to. '*' is all versions. If '*' is present, the - length of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - operations: - description: Operations is the operations the admission - hook cares about - CREATE, UPDATE, DELETE, CONNECT or - * for all of those operations and any future admission - operations that are added. If '*' is present, the length - of the slice must be one. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resourceNames: - description: ResourceNames is an optional white list of - names that the rule applies to. An empty set means that - everything is allowed. - items: - type: string - type: array - x-kubernetes-list-type: atomic - resources: - description: |- - Resources is a list of resources this rule applies to. - - For example: 'pods' means pods. 'pods/log' means the log subresource of pods. '*' means all resources, but not subresources. 'pods/*' means all subresources of pods. '*/scale' means all scale subresources. '*/*' means all resources and their subresources. - - If wildcard is present, the validation rule will ensure resources do not overlap with each other. - - Depending on the enclosing object, subresources might not be allowed. Required. - items: - type: string - type: array - x-kubernetes-list-type: atomic - scope: - description: scope specifies the scope of this rule. Valid - values are "Cluster", "Namespaced", and "*" "Cluster" - means that only cluster-scoped resources will match this - rule. Namespace API objects are cluster-scoped. "Namespaced" - means that only namespaced resources will match this rule. - "*" means that there are no scope restrictions. Subresources - match the scope of their parent resource. Default is "*". - type: string - type: object - type: array - x-kubernetes-list-type: atomic - type: object - paramRef: - description: ParamRef specifies the parameter resource used to configure - the admission control policy. It should point to a resource of the - type specified in ParamKind of the bound ValidatingAdmissionPolicy. - If the policy specifies a ParamKind and the resource referred to - by ParamRef does not exist, this binding is considered mis-configured - and the FailurePolicy of the ValidatingAdmissionPolicy applied. - properties: - name: - description: Name of the resource being referenced. - type: string - namespace: - description: Namespace of the referenced resource. Should be empty - for the cluster-scoped resources - type: string - type: object - policyName: - description: PolicyName references a ValidatingAdmissionPolicy name - which the ValidatingAdmissionPolicyBinding binds to. If the referenced - resource does not exist, this binding is considered invalid and - will be ignored Required. - type: string - type: object - type: object - served: true - storage: false - subresources: {} - name: v1 schema: openAPIV3Schema: @@ -802,5 +467,4 @@ status: plural: "" conditions: null storedVersions: - - v1alpha1 - v1 diff --git a/docs/content/contributing/index.md b/docs/content/contributing/index.md index 020e1172ab4..9dad84ae693 100644 --- a/docs/content/contributing/index.md +++ b/docs/content/contributing/index.md @@ -17,7 +17,7 @@ contribution. See the [DCO](https://github.com/kcp-dev/kcp/tree/main/DCO) file f ### Prerequisites 1. Clone this repository. -2. [Install Go](https://golang.org/doc/install) (currently 1.22). +2. [Install Go](https://golang.org/doc/install) (currently 1.23). 3. Install [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl). Please note that the go language version numbers in these files must exactly agree: go/go.mod file, kcp/.ci-operator.yaml, kcp/Dockerfile, and in all the kcp/.github/workflows yaml files that specify go-version. In kcp/.ci-operator.yaml the go version is indicated by the "tag" attribute. In kcp/Dockerfile it is indicated by the "golang" attribute. In go.mod it is indicated by the "go" directive." In the .github/workflows yaml files it is indicated by "go-version" diff --git a/go.mod b/go.mod index 2f7a8adfed4..9f0cb2e80e1 100644 --- a/go.mod +++ b/go.mod @@ -1,54 +1,55 @@ module github.com/kcp-dev/kcp -go 1.22.0 +go 1.23.0 require ( github.com/abiosoft/lineprefix v0.1.4 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca - github.com/emicklei/go-restful/v3 v3.11.0 + github.com/emicklei/go-restful/v3 v3.12.1 github.com/evanphx/json-patch v5.6.0+incompatible github.com/fatih/color v1.15.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/google/uuid v1.6.0 - github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb - github.com/kcp-dev/client-go v0.0.0-20240912145314-f5949d81732a + github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 + github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861 github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000 github.com/kcp-dev/logicalcluster/v3 v3.0.5 github.com/martinlindhe/base36 v1.1.1 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.5 github.com/spf13/cobra v1.8.1 - github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace - github.com/stretchr/testify v1.9.0 - go.etcd.io/etcd/client/pkg/v3 v3.5.14 - go.etcd.io/etcd/server/v3 v3.5.13 + github.com/spf13/pflag v1.0.6 + github.com/stretchr/testify v1.10.0 + go.etcd.io/etcd/client/pkg/v3 v3.5.18 + go.etcd.io/etcd/server/v3 v3.5.16 go.uber.org/multierr v1.11.0 - go.uber.org/zap v1.26.0 - golang.org/x/sys v0.28.0 + go.uber.org/zap v1.27.0 + golang.org/x/sys v0.30.0 gopkg.in/square/go-jose.v2 v2.6.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.31.0 - k8s.io/apiextensions-apiserver v0.31.0 - k8s.io/apimachinery v0.31.0 - k8s.io/apiserver v0.31.0 - k8s.io/client-go v0.31.0 - k8s.io/code-generator v0.31.0 - k8s.io/component-base v0.31.0 + k8s.io/api v0.32.0 + k8s.io/apiextensions-apiserver v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/apiserver v0.32.0 + k8s.io/client-go v0.32.0 + k8s.io/code-generator v0.32.0 + k8s.io/component-base v0.32.0 k8s.io/klog/v2 v2.130.1 - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 - k8s.io/kubernetes v1.31.0 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 + k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 + k8s.io/kubernetes v1.32.0 + k8s.io/utils v0.0.0-20241210054802-24370beab758 + sigs.k8s.io/structured-merge-diff/v4 v4.5.0 sigs.k8s.io/yaml v1.4.0 ) require ( - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + cel.dev/expr v0.19.1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/antlr4-go/antlr/v4 v4.13.0 // indirect + github.com/antlr4-go/antlr/v4 v4.13.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -57,56 +58,54 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect - github.com/distribution/reference v0.5.0 // indirect + github.com/distribution/reference v0.6.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/zapr v1.3.0 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect - github.com/godbus/dbus/v5 v5.1.0 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.5.0 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/btree v1.0.1 // indirect - github.com/google/cel-go v0.20.1 // indirect - github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/cel-go v0.22.1 // indirect + github.com/google/gnostic-models v0.6.9 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/gorilla/websocket v1.5.0 // indirect + github.com/gorilla/websocket v1.5.3 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect - github.com/imdario/mergo v0.3.12 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/jonboulle/clockwork v0.4.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/klauspost/compress v1.17.11 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-runewidth v0.0.12 // indirect - github.com/moby/spdystream v0.4.0 // indirect - github.com/moby/sys/mountinfo v0.7.1 // indirect + github.com/moby/spdystream v0.5.0 // indirect + github.com/moby/sys/mountinfo v0.7.2 // indirect + github.com/moby/sys/userns v0.1.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/muesli/reflow v0.3.0 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/onsi/gomega v1.33.1 // indirect + github.com/onsi/gomega v1.35.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/runc v1.1.13 // indirect - github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 // indirect - github.com/opencontainers/selinux v1.11.0 // indirect + github.com/opencontainers/selinux v1.11.1 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/robfig/cron/v3 v3.0.1 // indirect @@ -115,89 +114,91 @@ require ( github.com/stoewer/go-strcase v1.3.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 // indirect github.com/x448/float16 v0.8.4 // indirect - github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect - go.etcd.io/bbolt v1.3.9 // indirect - go.etcd.io/etcd/api/v3 v3.5.14 // indirect - go.etcd.io/etcd/client/v2 v2.305.13 // indirect - go.etcd.io/etcd/client/v3 v3.5.14 // indirect - go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect - go.etcd.io/etcd/raft/v3 v3.5.13 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect - golang.org/x/crypto v0.31.0 // indirect - golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect - golang.org/x/time v0.3.0 // indirect - golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect - google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.65.0 // indirect - google.golang.org/protobuf v1.34.2 // indirect + github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect + go.etcd.io/bbolt v1.3.11 // indirect + go.etcd.io/etcd/api/v3 v3.5.18 // indirect + go.etcd.io/etcd/client/v2 v2.305.16 // indirect + go.etcd.io/etcd/client/v3 v3.5.18 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.16 // indirect + go.etcd.io/etcd/raft/v3 v3.5.16 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/sdk v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect + go.opentelemetry.io/proto/otlp v1.5.0 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect + golang.org/x/mod v0.23.0 // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/oauth2 v0.26.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/term v0.29.0 // indirect + golang.org/x/text v0.22.0 // indirect + golang.org/x/time v0.10.0 // indirect + golang.org/x/tools v0.30.0 // indirect + google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/cloud-provider v0.0.0 // indirect k8s.io/cluster-bootstrap v0.0.0 // indirect k8s.io/component-helpers v0.0.0 // indirect k8s.io/controller-manager v0.0.0 // indirect k8s.io/dynamic-resource-allocation v0.0.0 // indirect - k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect - k8s.io/kms v0.0.0 // indirect + k8s.io/externaljwt v0.0.0 // indirect + k8s.io/gengo/v2 v2.0.0-20250106234829-0359904fc2a6 // indirect + k8s.io/kms v0.32.0 // indirect k8s.io/kube-aggregator v0.0.0 // indirect k8s.io/kube-controller-manager v0.0.0 // indirect k8s.io/kubelet v0.0.0 // indirect k8s.io/mount-utils v0.0.0 // indirect k8s.io/pod-security-admission v0.0.0 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect ) replace ( github.com/kcp-dev/kcp/sdk => ./sdk - k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250125214723-819c32dd4b3d - k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250125214723-819c32dd4b3d - k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250125214723-819c32dd4b3d - k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250125214723-819c32dd4b3d - k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250125214723-819c32dd4b3d - k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250125214723-819c32dd4b3d - k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250125214723-819c32dd4b3d - k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250125214723-819c32dd4b3d - k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250125214723-819c32dd4b3d - k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250125214723-819c32dd4b3d - k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250125214723-819c32dd4b3d - k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250125214723-819c32dd4b3d - k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250125214723-819c32dd4b3d - k8s.io/cri-client => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250125214723-819c32dd4b3d - k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250125214723-819c32dd4b3d - k8s.io/dynamic-resource-allocation => github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250125214723-819c32dd4b3d - k8s.io/endpointslice => github.com/kcp-dev/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kms => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250125214723-819c32dd4b3d - k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20250125214723-819c32dd4b3d - k8s.io/legacy-cloud-providers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250125214723-819c32dd4b3d - k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250125214723-819c32dd4b3d - k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250125214723-819c32dd4b3d - k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250125214723-819c32dd4b3d - k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250125214723-819c32dd4b3d - k8s.io/sample-cli-plugin => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250125214723-819c32dd4b3d - k8s.io/sample-controller => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250125214723-819c32dd4b3d + k8s.io/api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250212172239-c6ebc5941362 + k8s.io/apiextensions-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250212172239-c6ebc5941362 + k8s.io/apimachinery => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250212172239-c6ebc5941362 + k8s.io/apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250212172239-c6ebc5941362 + k8s.io/cli-runtime => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20250212172239-c6ebc5941362 + k8s.io/client-go => github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250212172239-c6ebc5941362 + k8s.io/cloud-provider => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250212172239-c6ebc5941362 + k8s.io/cluster-bootstrap => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250212172239-c6ebc5941362 + k8s.io/code-generator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250212172239-c6ebc5941362 + k8s.io/component-base => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250212172239-c6ebc5941362 + k8s.io/component-helpers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250212172239-c6ebc5941362 + k8s.io/controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250212172239-c6ebc5941362 + k8s.io/cri-api => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250212172239-c6ebc5941362 + k8s.io/cri-client => github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250212172239-c6ebc5941362 + k8s.io/csi-translation-lib => github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250212172239-c6ebc5941362 + k8s.io/dynamic-resource-allocation => github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250212172239-c6ebc5941362 + k8s.io/endpointslice => github.com/kcp-dev/kubernetes/staging/src/k8s.io/endpointslice v0.0.0-20250212172239-c6ebc5941362 + k8s.io/externaljwt => github.com/kcp-dev/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kms => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kube-aggregator => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kube-controller-manager => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kube-proxy => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kube-scheduler => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kubectl => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kubelet => github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250212172239-c6ebc5941362 + k8s.io/kubernetes => github.com/kcp-dev/kubernetes v0.0.0-20250212172239-c6ebc5941362 + k8s.io/legacy-cloud-providers => github.com/kcp-dev/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20250212172239-c6ebc5941362 + k8s.io/metrics => github.com/kcp-dev/kubernetes/staging/src/k8s.io/metrics v0.0.0-20250212172239-c6ebc5941362 + k8s.io/mount-utils => github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250212172239-c6ebc5941362 + k8s.io/pod-security-admission => github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250212172239-c6ebc5941362 + k8s.io/sample-apiserver => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20250212172239-c6ebc5941362 + k8s.io/sample-cli-plugin => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20250212172239-c6ebc5941362 + k8s.io/sample-controller => github.com/kcp-dev/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20250212172239-c6ebc5941362 ) diff --git a/go.sum b/go.sum index 78e5746d6be..d829716a013 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,21 @@ +cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= +cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= -github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= -github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/abiosoft/lineprefix v0.1.4 h1:fXu3jc+B2EaS98mTpEL5OH9EKv3scHRb7/gsvlqAD1A= github.com/abiosoft/lineprefix v0.1.4/go.mod h1:Myq9hfXs8e2OmHFvajp3pHxxThZL645XK+BrEQNvNSs= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= -github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= +github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= +github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= @@ -38,21 +40,20 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= -github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca h1:7oodhZp9MZW0DBkrZXyUsJWKQFy35SVxjZ8K4vHXnk8= github.com/egymgmbh/go-prefix-writer v0.0.0-20180609083313-7326ea162eca/go.mod h1:UhMFM+dnOcm1f0Pve8uqRaxAhEYki+/CuA2BTDp2T04= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/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= @@ -64,8 +65,8 @@ github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -78,38 +79,33 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= -github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -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/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.20.1 h1:nDx9r8S3L4pE61eDdt8igGj8rf5kjYR3ILxWIpWNi84= -github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40= +github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= +github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= +github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -118,95 +114,96 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= -github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= 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.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb h1:W11F/dp6NdUnHeB0SrpyWLiifRosu1qaMJvdFGGLXc0= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb/go.mod h1:mEDD1K5BVUXJ4CP6wcJ0vZUf+7tbFMjkCFzBKsUNj18= -github.com/kcp-dev/client-go v0.0.0-20240912145314-f5949d81732a h1:O9SNM3MqMlwoEAPSWxk/yw4JU211KpVsAFjTXWQcMEk= -github.com/kcp-dev/client-go v0.0.0-20240912145314-f5949d81732a/go.mod h1:h5jC8rEbkyGUgV86+sgtMMcl950ooGzk+iLrQnbCR6o= -github.com/kcp-dev/kubernetes v0.0.0-20250125214723-819c32dd4b3d h1:KDPr/lXil+3tub9niKP7oa1R0AUVu4RJDwNBMTHfCtY= -github.com/kcp-dev/kubernetes v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:oRHZZzd7fEOSk0mY8fxM++8QPpafz47cbtQUxWENogQ= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250125214723-819c32dd4b3d h1:L3ePEgpTvwQnohVCsf8317ys0aIo1Z30K8bMvsoUeD4= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:6X07YVZkpyT/6XVz4cwyYM2oYH3A3k2QR54H7JXMD90= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250125214723-819c32dd4b3d h1:4FgA92zj2b/FYQOUesaLuuuN3Ph4T8EHnQa29HNcW1g= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:8EZw4zqlExmz7lUTE/P7V0vdAyfiYL84i4ZUHY6qyrk= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250125214723-819c32dd4b3d h1:u0OLo/u5kQ+QEHmPfwFdbJ7cSZs04Qc3DOBh+V/TsA0= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:5F0wbie5xX1jDEg5sk5dr+KF8rwFkYtZFHDhSF/UsG4= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250125214723-819c32dd4b3d h1:Gt2nH/dwSp/za1dEHb88pHMIyvGSMHfwWXABwRaYIyg= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:EC5je+P5ix2QCV4zbwxlY8Zk5MJe4e1eKXxjCMd/7Eo= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250125214723-819c32dd4b3d h1:o3jUkC6dDsvUusG07S+3OFXBdSfQk6ycEsNUH6FDBfw= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:l7HaB8VBHdNA72/wtAohDsemuLiVNdW6hx9lNB5J088= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250125214723-819c32dd4b3d h1:sJaTGB95+lagfbAs64KXVak5oXncrsSSCArHjiF1iKY= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:Z1By/ZJf4qFPOirsblzPEI/p61GMTqgsLITfY2hffQo= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250125214723-819c32dd4b3d h1:mWLE0dym0BBhOIC6RSQxxNXd9DcsoxhTeDxkC8IulbQ= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:A1M/anf3QTVOO3C4oma0zIeBekzHJtgO3Ght7QLBOV8= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250125214723-819c32dd4b3d h1:O6ltK16Pv256HBkT5xjNO6GLEXZPApDodQJoidtVNV0= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:FeckrMB5SHLGBJWSRr79xheTG7il5LcGhzdx/v88Jus= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250125214723-819c32dd4b3d h1:QIlevvp9pOzY0WwhsXK1hVQxkRg5+umeb5lv2lQk1aw= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:pgdjhgz6QeKjIVxzIYq4JFZ7VBJRutg/n5W9OKX33qA= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250125214723-819c32dd4b3d h1:QGPNZ0bNBzQWJce/cNNalaUQCvqe9LdQ0ejsDKnHRII= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:Mx6U6lQkq013rHloS+AAq00nd0b3kkI8cuIu+o2SA7g= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250125214723-819c32dd4b3d h1:bDmOQmsP1Vv5PZHS8StV0LuHfyBgPPIAtdYCVA0aPHo= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:Dc3aSKcPoKmbdnOXAHq/V4Bavxxht9+1bTU8R5ap9yM= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250125214723-819c32dd4b3d h1:5iWsDj5IZzP9gLYz/dBSMnfEPsjA15iSYrErGWrwm3o= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:e2pTb6psrP2AtdW24SxJaesf2402rQ0YjNa7qYssoi0= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250125214723-819c32dd4b3d h1:NHaifVKiWmoxzsPFDc2mz/eOJIDPBh/yePDAIGEUU8w= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:iz2L6DSY4Ur/Bc/gwXkKZlTnkd/97jgITpRAnuZE2jU= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250125214723-819c32dd4b3d h1:r0Nyw8R0Ea8oLLIMHIDN+ehSbjAKQhK8UbDsKXlDKNk= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:9M1LHui5W3M9sY3jRBxHpPt30VQ+GdJLgWyGH27/DaI= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250125214723-819c32dd4b3d h1:dd9qBlJV9kuks0yeky2a0sIEzKd7vI6k/EjSYskyH1A= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:85Fs9bUmpkY/tUQh6zXjvI5BbN7EfiQYQGj07Zf9Dg0= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250125214723-819c32dd4b3d h1:AD0E8bW1JgVKEUJDpgXFJ3T2q9YixftDmuxivIVrhek= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:gClzb5q8LLAagWlaL9S/rt8IcU3iY6gRARKN09DY4o8= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250125214723-819c32dd4b3d h1:w4+3Ys7tayvEIFEPUeys9AFbeow13C1KKtu68GrRHPY= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:npcdPN5G2BMexN5GsPN/xjRN57Ars6h7O7wpjjLJuck= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250125214723-819c32dd4b3d h1:NFhs90+rQOrqUn4yfsF5DeT8gSLGyo8PKE7ZrZa7GAs= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:vMjQhLaEOvaFZvq0RLwFPFF2i660WpvyRAYzBLtXByI= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250125214723-819c32dd4b3d h1:H3PM2BTkvdwr8cP5e3NmldvjQfbzpS9gpP+IhN7JLXg= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:W3k9YOX2gYkx8IbOyQ9mTgWjJHqIZ6/2fBVKLQOiW/E= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250125214723-819c32dd4b3d h1:XgYvvMJExRYxoGWAQzjgOp9Ccl8lqF9k+aMu0LN+uRE= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:p5r0u2M9KzooTgHDz4zRsUt02y4Yx7/5uPwgr0nSGqg= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250125214723-819c32dd4b3d h1:CWtWCza0WGY/gFdPxY1Pd/xGFgSBhI+HW1v2vr6p7j4= -github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250125214723-819c32dd4b3d/go.mod h1:kgTU85Q97g45QWn61Zi55b8iDTap0ZcsXxRSlUMt8o4= +github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 h1:6MeV6CBJhNxF3DhkdwhcqeyEc8Al2MGeKFNA0O95icc= +github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA= +github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861 h1:Wzb0BaJPK3vMU7HSkGGprs7fJSB90o2d8coj2S2xP0Q= +github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861/go.mod h1:RRScyGU72S5wVJDBWxcANmxgx723N/Eb4XqEF4655wI= +github.com/kcp-dev/kubernetes v0.0.0-20250212172239-c6ebc5941362 h1:MrWBtNUqV8bE/wlGmJYrJm9xkOu80bW+4vM2pml0AB8= +github.com/kcp-dev/kubernetes v0.0.0-20250212172239-c6ebc5941362/go.mod h1:4iI/ArKp3Hvssz1ti3/4s0farouOJSH9JcQcl2hGwEE= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250212172239-c6ebc5941362 h1:X1zbGfdJAU00vMPa3PoUr8bNClPF14rD1D1D3xZInsc= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/api v0.0.0-20250212172239-c6ebc5941362/go.mod h1:+8B8J1o/Yksxqvdg4xG/kAN11VSy5I36pl3xmIpMIWQ= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250212172239-c6ebc5941362 h1:Kzr4qvNPaccVzWpdZLt8lMXB7aC0E/dF0HLm/F8BzH4= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20250212172239-c6ebc5941362/go.mod h1:taXqFPSyv7GWmj2xNwTz/gphZM7xMN7l9RuTtANBgBE= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250212172239-c6ebc5941362 h1:WU/Ensuaor8lA3FqA8BtMT11VEIQqi0vXqacYdNtKs0= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20250212172239-c6ebc5941362/go.mod h1:u5+KVyeyOJyf/RbfhpFagC2lDB0MGSBL/kCbvPUcygg= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250212172239-c6ebc5941362 h1:VmBdLIpHPPDPLab5/N3dfXunTabSrcFTC5tESTQXRYg= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20250212172239-c6ebc5941362/go.mod h1:FBzR5fnooGVqPY6KGVBJbRgNAGfmrZRBUyi1K8Qtbqc= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250212172239-c6ebc5941362 h1:jTgVCJUhYgbuzfZ2NLLws7lCxZLbKM23GypPcD7cJrE= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/client-go v0.0.0-20250212172239-c6ebc5941362/go.mod h1:saHEuozu8gjmxtgquNpwEetuPtnLORX4rXhx74uZrb4= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250212172239-c6ebc5941362 h1:R4w1cacSru72lBkfzR5IDQOpMipWKBrqdNrbnLl5OWU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20250212172239-c6ebc5941362/go.mod h1:OZOwRnEz2N+uujGGwmfwNcTwkduE3n25hLxt2U6WjuI= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250212172239-c6ebc5941362 h1:ze+zdR/bdLiVJvZfB5zAW8/KbWryRARlygyeLWqfxjw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20250212172239-c6ebc5941362/go.mod h1:2WCdRDD/6feypDOVX5VS+wQwGdA+WMyvWYqHzgWWM+I= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250212172239-c6ebc5941362 h1:/RYuaVWxXsCMHAvyQhUk4uGfy2cY97dY/04JTQKkw/Y= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20250212172239-c6ebc5941362/go.mod h1:2B45dO5zY71JMS8/L7YqOPq+fTPMTSE7lEIiudwMD3w= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250212172239-c6ebc5941362 h1:RnEAGMtX4mi+PSqwcN95f+wtVsLz+XHF89Z04cCEJUY= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-base v0.0.0-20250212172239-c6ebc5941362/go.mod h1:D7swTzl983jmjaZkBsCsJ45z5sh9dBDudJxMHdAHqjQ= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250212172239-c6ebc5941362 h1:LN6xdkqokSYDx3UNRCtOp7upIyiQLCCS4QNd0wgWv+A= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20250212172239-c6ebc5941362/go.mod h1:dW8Jfk7uzSUOpMW9SvqNipsaBQBVsQ0m5JAIhdE9h8M= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250212172239-c6ebc5941362 h1:XssEsgisV705ElfHYvfzVJgwXXtmF6ARGVatJocOajo= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20250212172239-c6ebc5941362/go.mod h1:YBF7mXPO+wzQXb0mWj3Fg0D5ehKyKlx2ge4kzgYMtOk= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250212172239-c6ebc5941362 h1:Pxann5cyIrNHzbZcwGBezZWgkHpWZc48U7hRHFTuuP8= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20250212172239-c6ebc5941362/go.mod h1:Ms/R8dDEvX7MeUSMLNdkQVFNVN/yD9xORuQNUaUuAtM= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250212172239-c6ebc5941362 h1:wVVGX0TgMc41+frPQf0Iwm5PU6FbzpVhVLw4gmONTic= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/cri-client v0.0.0-20250212172239-c6ebc5941362/go.mod h1:0zAq8pv/X+CA4wmkm54wkvw24XAcoJsJJekRpKDy9iA= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250212172239-c6ebc5941362 h1:zI20E6jo36js0HIArkxJIB08KioaIDdabOZQHU4wNrM= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20250212172239-c6ebc5941362/go.mod h1:nMZWpFZjJz1TKOtcnq+IAb53UIYNyQgbzgOoIj+ATcw= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250212172239-c6ebc5941362 h1:lUDd9h+hZxzQtqiGdKHrQUeHwkw13Bg13a63H9Nls4A= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20250212172239-c6ebc5941362/go.mod h1:BOCMi6yK5S43HgXsDXh5rzckBU0kS+kgKHfbWMYsjFc= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250212172239-c6ebc5941362 h1:WDQSNxKzN7v7ehmGL5i6+4mk93/qpYwKWJUmROAPIyc= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/externaljwt v0.0.0-20250212172239-c6ebc5941362/go.mod h1:Zys1c/N1m2NcvIwfiTSQtIi5xkOA3YCyUqiMNdpWN5g= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250212172239-c6ebc5941362 h1:6eV79gZfSuV6vG0JSKKE6qp3R2EWTOMTiuAKMZ+7mTU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kms v0.0.0-20250212172239-c6ebc5941362/go.mod h1:wTUVjTeOi6f2n7XeiDaaeWE8xKVSV9gfwAKIgcC/oMg= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250212172239-c6ebc5941362 h1:i/rw9CncxQPbiO1C0GCKTPaLywgh/+6Lw2iEkh/eKOQ= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20250212172239-c6ebc5941362/go.mod h1:BHe7DUdnK7CS9/9PFYhBlBzMRLJVsqh5YQZcpJC9ayI= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250212172239-c6ebc5941362 h1:GG5ji22fCxBtl8BCSK8LaVEi3VTST3guAt9HdZwZWsg= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20250212172239-c6ebc5941362/go.mod h1:BAOgGgQqSvlFngycWaxYH3C94G9Lx4sfhkI6sFqljHU= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250212172239-c6ebc5941362 h1:FSwEoeWXly6m6SEXpD2OPZNECx44ji1chSfpBmm8P+Q= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20250212172239-c6ebc5941362/go.mod h1:pGfmzpia5MJlYm6E/xpPEHX4U2OzbVq2GuZFsOMXmj0= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250212172239-c6ebc5941362 h1:IzQrlLjBsNXMFJNRI4k27/sGu/GUmoN04sOcwzHJYvI= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20250212172239-c6ebc5941362/go.mod h1:d4LrDsJ58T5ZJBuAnmq1Y40TGm0WypNHzpy3XtaBfZs= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250212172239-c6ebc5941362 h1:7tQ57A2o4fluscFoolucMdeN+Z4p0Lr/gOIoHyfwP1o= +github.com/kcp-dev/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20250212172239-c6ebc5941362/go.mod h1:2sHAmyX8OMDXQ74nyvcfhkLO//2dt8xO2Gl/4ZskEGM= github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU= github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/martinlindhe/base36 v1.1.1 h1:1F1MZ5MGghBXDZ2KJ3QfxmiydlWOGB8HCEtkap5NkVg= github.com/martinlindhe/base36 v1.1.1/go.mod h1:vMS8PaZ5e/jV9LwFKlm0YLnXl/hpOihiBxKkIoc3g08= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -218,10 +215,12 @@ github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPn github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -github.com/moby/spdystream v0.4.0 h1:Vy79D6mHeJJjiPdFEL2yku1kl0chZpJfZcPpb16BRl8= -github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= -github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g= -github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= +github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg= +github.com/moby/sys/mountinfo v0.7.2/go.mod h1:1YOa8w8Ih7uW0wALDUgT1dTTSBrZ+HiBLGws92L2RU4= +github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= +github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -235,18 +234,14 @@ 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/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/runc v1.1.13 h1:98S2srgG9vw0zWcDpFMn5TRrh8kLxa/5OFUstuUhmRs= -github.com/opencontainers/runc v1.1.13/go.mod h1:R016aXacfp/gwQBYw2FDGa9m+n6atbLWrYY8hNMT/sA= -github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78 h1:R5M2qXZiK/mWPMT4VldCOiSL9HIAMuxQZWdG0CSM5+4= -github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= -github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= +github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8= +github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -256,13 +251,13 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc= github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= @@ -271,8 +266,8 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -283,8 +278,8 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -299,50 +294,54 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk= +github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= -go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= -go.etcd.io/etcd/api/v3 v3.5.14 h1:vHObSCxyB9zlF60w7qzAdTcGaglbJOpSj1Xj9+WGxq0= -go.etcd.io/etcd/api/v3 v3.5.14/go.mod h1:BmtWcRlQvwa1h3G2jvKYwIQy4PkHlDej5t7uLMUdJUU= -go.etcd.io/etcd/client/pkg/v3 v3.5.14 h1:SaNH6Y+rVEdxfpA2Jr5wkEvN6Zykme5+YnbCkxvuWxQ= -go.etcd.io/etcd/client/pkg/v3 v3.5.14/go.mod h1:8uMgAokyG1czCtIdsq+AGyYQMvpIKnSvPjFMunkgeZI= -go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8= -go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg= -go.etcd.io/etcd/client/v3 v3.5.14 h1:CWfRs4FDaDoSz81giL7zPpZH2Z35tbOrAJkkjMqOupg= -go.etcd.io/etcd/client/v3 v3.5.14/go.mod h1:k3XfdV/VIHy/97rqWjoUzrj9tk7GgJGH9J8L4dNXmAk= -go.etcd.io/etcd/pkg/v3 v3.5.13 h1:st9bDWNsKkBNpP4PR1MvM/9NqUPfvYZx/YXegsYEH8M= -go.etcd.io/etcd/pkg/v3 v3.5.13/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= -go.etcd.io/etcd/raft/v3 v3.5.13 h1:7r/NKAOups1YnKcfro2RvGGo2PTuizF/xh26Z2CTAzA= -go.etcd.io/etcd/raft/v3 v3.5.13/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= -go.etcd.io/etcd/server/v3 v3.5.13 h1:V6KG+yMfMSqWt+lGnhFpP5z5dRUj1BDRJ5k1fQ9DFok= -go.etcd.io/etcd/server/v3 v3.5.13/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= +go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/etcd/api/v3 v3.5.18 h1:Q4oDAKnmwqTo5lafvB+afbgCDF7E35E4EYV2g+FNGhs= +go.etcd.io/etcd/api/v3 v3.5.18/go.mod h1:uY03Ob2H50077J7Qq0DeehjM/A9S8PhVfbQ1mSaMopU= +go.etcd.io/etcd/client/pkg/v3 v3.5.18 h1:mZPOYw4h8rTk7TeJ5+3udUkfVGBqc+GCjOJYd68QgNM= +go.etcd.io/etcd/client/pkg/v3 v3.5.18/go.mod h1:BxVf2o5wXG9ZJV+/Cu7QNUiJYk4A29sAhoI5tIRsCu4= +go.etcd.io/etcd/client/v2 v2.305.16 h1:kQrn9o5czVNaukf2A2At43cE9ZtWauOtf9vRZuiKXow= +go.etcd.io/etcd/client/v2 v2.305.16/go.mod h1:h9YxWCzcdvZENbfzBTFCnoNumr2ax3F19sKMqHFmXHE= +go.etcd.io/etcd/client/v3 v3.5.18 h1:nvvYmNHGumkDjZhTHgVU36A9pykGa2K4lAJ0yY7hcXA= +go.etcd.io/etcd/client/v3 v3.5.18/go.mod h1:kmemwOsPU9broExyhYsBxX4spCTDX3yLgPMWtpBXG6E= +go.etcd.io/etcd/pkg/v3 v3.5.16 h1:cnavs5WSPWeK4TYwPYfmcr3Joz9BH+TZ6qoUtz6/+mc= +go.etcd.io/etcd/pkg/v3 v3.5.16/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= +go.etcd.io/etcd/raft/v3 v3.5.16 h1:zBXA3ZUpYs1AwiLGPafYAKKl/CORn/uaxYDwlNwndAk= +go.etcd.io/etcd/raft/v3 v3.5.16/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +go.etcd.io/etcd/server/v3 v3.5.16 h1:d0/SAdJ3vVsZvF8IFVb1k8zqMZ+heGcNfft71ul9GWE= +go.etcd.io/etcd/server/v3 v3.5.16/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0 h1:rgMkmiGfix9vFJDcDi1PK8WEQP4FLQwLDfhp5ZLpFeE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.59.0/go.mod h1:ijPqXp5P6IRRByFVVg9DY8P5HkxkHE5ARIa+86aXPf4= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= @@ -350,23 +349,23 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= +golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= 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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -379,20 +378,20 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= +golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -406,21 +405,20 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4= +golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -429,8 +427,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= 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= @@ -441,22 +439,22 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9/go.mod h1:mqHbVIp48Muh7Ywss/AD6I5kNVKZMmAa/QEW58Gxp2s= +google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 h1:L9JNMl/plZH9wmzQUHleO/ZZDSN+9Gh41wPczNy+5Fk= +google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 h1:2duwAxN2+k0xLNpjnHTXoMUgnv6VPSp5fiqTuwSxjmI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -470,28 +468,24 @@ gopkg.in/square/go-jose.v2 v2.6.0 h1:NGk74WTnPKBNUhNzQX7PYcTLUjoq7mzKk2OKbvwk2iI gopkg.in/square/go-jose.v2 v2.6.0/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 h1:NGrVE502P0s0/1hudf8zjgwki1X/TByhmAoILTarmzo= -k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70/go.mod h1:VH3AT8AaQOqiGjMF9p0/IM1Dj+82ZwjfxUP1IxaHE+8= +k8s.io/gengo/v2 v2.0.0-20250106234829-0359904fc2a6 h1:SdzkGIk4b5LFkVO36PuO0Bx4tpBDJDpNN0F1/v8JM5c= +k8s.io/gengo/v2 v2.0.0-20250106234829-0359904fc2a6/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/pkg/admission/plugins.go b/pkg/admission/plugins.go index 728a935d83a..f45cf9a60d1 100644 --- a/pkg/admission/plugins.go +++ b/pkg/admission/plugins.go @@ -20,6 +20,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle" + mutatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/mutating" validatingadmissionpolicy "k8s.io/apiserver/pkg/admission/plugin/policy/validating" "k8s.io/apiserver/pkg/admission/plugin/resourcequota" mutatingwebhook "k8s.io/apiserver/pkg/admission/plugin/webhook/mutating" @@ -91,6 +92,7 @@ var AllOrderedPlugins = beforeWebhooks(kubeapiserveroptions.AllOrderedPlugins, permissionclaims.PluginName, pathannotation.PluginName, kubequota.PluginName, + mutatingadmissionpolicy.PluginName, ) func beforeWebhooks(recommended []string, plugins ...string) []string { @@ -186,6 +188,7 @@ var defaultOnKubePluginsInKube = sets.New[string]( certsubjectrestriction.PluginName, // CertificateSubjectRestriction defaultingressclass.PluginName, // DefaultIngressClass podsecurity.PluginName, // PodSecurity + mutatingadmissionpolicy.PluginName, // MutatingAdmissionPolicy ) // DefaultOffAdmissionPlugins get admission plugins off by default for kcp. diff --git a/pkg/admission/validatingadmissionpolicy/validating_admission_policy.go b/pkg/admission/validatingadmissionpolicy/validating_admission_policy.go index 61e97ccb9a5..9bce13d7e59 100644 --- a/pkg/admission/validatingadmissionpolicy/validating_admission_policy.go +++ b/pkg/admission/validatingadmissionpolicy/validating_admission_policy.go @@ -38,7 +38,6 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" "k8s.io/client-go/restmapper" - "k8s.io/component-base/featuregate" "k8s.io/klog/v2" "github.com/kcp-dev/kcp/pkg/admission/initializers" @@ -74,7 +73,6 @@ type KubeValidatingAdmissionPolicy struct { localKubeSharedInformerFactory kcpkubernetesinformers.SharedInformerFactory globalKubeSharedInformerFactory kcpkubernetesinformers.SharedInformerFactory serverDone <-chan struct{} - featureGates featuregate.FeatureGate authorizer authorizer.Authorizer lock sync.RWMutex @@ -88,7 +86,6 @@ var _ = initializers.WantsKubeClusterClient(&KubeValidatingAdmissionPolicy{}) var _ = initializers.WantsKubeInformers(&KubeValidatingAdmissionPolicy{}) var _ = initializers.WantsServerShutdownChannel(&KubeValidatingAdmissionPolicy{}) var _ = initializers.WantsDynamicClusterClient(&KubeValidatingAdmissionPolicy{}) -var _ = initializer.WantsFeatures(&KubeValidatingAdmissionPolicy{}) var _ = initializer.WantsAuthorizer(&KubeValidatingAdmissionPolicy{}) var _ = admission.InitializationValidator(&KubeValidatingAdmissionPolicy{}) @@ -113,10 +110,6 @@ func (k *KubeValidatingAdmissionPolicy) SetDynamicClusterClient(c kcpdynamic.Clu k.dynamicClusterClient = c } -func (k *KubeValidatingAdmissionPolicy) InspectFeatureGates(featureGates featuregate.FeatureGate) { - k.featureGates = featureGates -} - func (k *KubeValidatingAdmissionPolicy) SetAuthorizer(authz authorizer.Authorizer) { k.authorizer = authz } @@ -190,7 +183,6 @@ func (k *KubeValidatingAdmissionPolicy) getOrCreateDelegate(clusterName logicalc plugin.SetDynamicClient(k.dynamicClusterClient.Cluster(clusterName.Path())) plugin.SetDrainedNotification(ctx.Done()) - plugin.InspectFeatureGates(k.featureGates) plugin.SetAuthorizer(k.authorizer) plugin.SetClusterName(clusterName) plugin.SetSourceFactory(func(_ informers.SharedInformerFactory, client kubernetes.Interface, dynamicClient dynamic.Interface, restMapper meta.RESTMapper, clusterName logicalcluster.Name) generic.Source[validating.PolicyHook] { diff --git a/pkg/features/kcp_features.go b/pkg/features/kcp_features.go index ff6abdae75c..45d0fcfb779 100644 --- a/pkg/features/kcp_features.go +++ b/pkg/features/kcp_features.go @@ -24,6 +24,7 @@ import ( "github.com/spf13/pflag" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apimachinery/pkg/util/version" genericfeatures "k8s.io/apiserver/pkg/features" utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/component-base/featuregate" @@ -47,12 +48,12 @@ const ( var DefaultFeatureGate = utilfeature.DefaultFeatureGate func init() { - utilruntime.Must(utilfeature.DefaultMutableFeatureGate.Add(defaultGenericControlPlaneFeatureGates)) + utilruntime.Must(utilfeature.DefaultMutableFeatureGate.AddVersioned(defaultVersionedGenericControlPlaneFeatureGates)) } func KnownFeatures() []string { - features := make([]string, 0, len(defaultGenericControlPlaneFeatureGates)) - for k := range defaultGenericControlPlaneFeatureGates { + features := make([]string, 0, len(defaultVersionedGenericControlPlaneFeatureGates)) + for k := range defaultVersionedGenericControlPlaneFeatureGates { features = append(features, string(k)) } return features @@ -69,11 +70,30 @@ type kcpFeatureGate struct { featuregate.MutableFeatureGate } +func featureSpecAtEmulationVersion(v featuregate.VersionedSpecs, emulationVersion *version.Version) *featuregate.FeatureSpec { + i := len(v) - 1 + for ; i >= 0; i-- { + if v[i].Version.GreaterThan(emulationVersion) { + continue + } + return &v[i] + } + return &featuregate.FeatureSpec{ + Default: false, + PreRelease: featuregate.PreAlpha, + Version: version.MajorMinor(0, 0), + } +} + func (f *kcpFeatureGate) String() string { pairs := []string{} - for k, v := range defaultGenericControlPlaneFeatureGates { - pairs = append(pairs, fmt.Sprintf("%s=%t", k, v.Default)) + emulatedVersion := utilfeature.DefaultMutableFeatureGate.EmulationVersion() + + for featureName, versionedSpecs := range defaultVersionedGenericControlPlaneFeatureGates { + spec := featureSpecAtEmulationVersion(versionedSpecs, emulatedVersion) + pairs = append(pairs, fmt.Sprintf("%s=%t", featureName, spec.Default)) } + sort.Strings(pairs) return strings.Join(pairs, ",") } @@ -84,15 +104,37 @@ func (f *kcpFeatureGate) Type() string { // defaultGenericControlPlaneFeatureGates consists of all known Kubernetes-specific feature keys // in the generic control plane code. To add a new feature, define a key for it above and add it -// here. The features will be available throughout Kubernetes binaries. -var defaultGenericControlPlaneFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{ - WorkspaceMounts: {Default: false, PreRelease: featuregate.Alpha}, +// here. The Version field should be set to whatever is specified in +// https://github.com/kubernetes/kubernetes/blob/master/pkg/features/versioned_kube_features.go. +// For features that are kcp-specific, the Version should be set to whatever go.mod k8s.io +// dependencies version we're currently using. +var defaultVersionedGenericControlPlaneFeatureGates = map[featuregate.Feature]featuregate.VersionedSpecs{ + WorkspaceMounts: { + {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Alpha}, + }, + // inherited features from generic apiserver, relisted here to get a conflict if it is changed // unintentionally on either side: - genericfeatures.APIResponseCompression: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.OpenAPIEnums: {Default: true, PreRelease: featuregate.Beta}, - genericfeatures.ServerSideFieldValidation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, - logsapi.LoggingBetaOptions: {Default: true, PreRelease: featuregate.Beta}, - logsapi.ContextualLogging: {Default: true, PreRelease: featuregate.Alpha}, + genericfeatures.APIResponseCompression: { + {Version: version.MustParse("1.8"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.16"), Default: true, PreRelease: featuregate.Beta}, + }, + + genericfeatures.OpenAPIEnums: { + {Version: version.MustParse("1.23"), Default: false, PreRelease: featuregate.Alpha}, + {Version: version.MustParse("1.24"), Default: true, PreRelease: featuregate.Beta}, + }, + + logsapi.LoggingBetaOptions: { + {Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Beta}, + }, + + logsapi.ContextualLogging: { + {Version: version.MustParse("1.26"), Default: true, PreRelease: featuregate.Alpha}, + }, + + genericfeatures.MutatingAdmissionPolicy: { + {Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha}, + }, } diff --git a/pkg/informer/informer.go b/pkg/informer/informer.go index fa11e864073..5079f0bb58e 100644 --- a/pkg/informer/informer.go +++ b/pkg/informer/informer.go @@ -833,28 +833,76 @@ type crdGVRSource struct { } // Hard-code built in types that support list+watch. +// Please keep the formatting as-is instead of single-line `: ,` style, +// to avoid sweeping edits by gofmt. var builtInInformableTypes map[schema.GroupVersionResource]GVRPartialMetadata = map[schema.GroupVersionResource]GVRPartialMetadata{ - gvrFor("", "v1", "configmaps"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "ConfigMap", "configmap"), - gvrFor("", "v1", "events"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "Event", "event"), - gvrFor("", "v1", "namespaces"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "Namespace", "namespace"), - gvrFor("", "v1", "resourcequotas"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "ResourceQuota", "resourcequota"), - gvrFor("", "v1", "secrets"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "Secret", "secret"), - gvrFor("", "v1", "serviceaccounts"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "ServiceAccount", "serviceaccount"), - gvrFor("certificates.k8s.io", "v1", "certificatesigningrequests"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "CertificateSigningRequest", "certificatesigningrequest"), - gvrFor("coordination.k8s.io", "v1", "leases"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "Lease", "lease"), - gvrFor("rbac.authorization.k8s.io", "v1", "clusterroles"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ClusterRole", "clusterrole"), - gvrFor("rbac.authorization.k8s.io", "v1", "clusterrolebindings"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ClusterRoleBinding", "clusterrolebinding"), - gvrFor("rbac.authorization.k8s.io", "v1", "roles"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "Role", "role"), - gvrFor("rbac.authorization.k8s.io", "v1", "rolebindings"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "RoleBinding", "rolebinding"), - gvrFor("events.k8s.io", "v1", "events"): withGVRPartialMetadata(apiextensionsv1.NamespaceScoped, "Event", "event"), - gvrFor("admissionregistration.k8s.io", "v1", "mutatingwebhookconfigurations"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "MutatingWebhookConfiguration", "mutatingwebhookconfiguration"), - gvrFor("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ValidatingAdmissionPolicy", "validatingadmissionpolicy"), - gvrFor("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ValidatingAdmissionPolicyBinding", "validatingadmissionpolicybinding"), - gvrFor("admissionregistration.k8s.io", "v1", "validatingwebhookconfigurations"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ValidatingWebhookConfiguration", "validatingwebhookconfiguration"), - gvrFor("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ValidatingAdmissionPolicy", "validatingadmissionpolicy"), - gvrFor("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "ValidatingAdmissionPolicyBinding", "validatingadmissionpolicybinding"), - gvrFor("apiextensions.k8s.io", "v1", "customresourcedefinitions"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "CustomResourceDefinition", "customresourcedefinition"), - gvrFor("core.kcp.io", "v1alpha1", "logicalclusters"): withGVRPartialMetadata(apiextensionsv1.ClusterScoped, "LogicalCluster", "logicalcluster"), + gvrFor("", "v1", "configmaps"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "ConfigMap", "configmap", + ), + gvrFor("", "v1", "events"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "Event", "event", + ), + gvrFor("", "v1", "namespaces"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "Namespace", "namespace", + ), + gvrFor("", "v1", "resourcequotas"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "ResourceQuota", "resourcequota", + ), + gvrFor("", "v1", "secrets"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "Secret", "secret", + ), + gvrFor("", "v1", "serviceaccounts"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "ServiceAccount", "serviceaccount", + ), + gvrFor("certificates.k8s.io", "v1", "certificatesigningrequests"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "CertificateSigningRequest", "certificatesigningrequest", + ), + gvrFor("coordination.k8s.io", "v1", "leases"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "Lease", "lease", + ), + gvrFor("rbac.authorization.k8s.io", "v1", "clusterroles"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "ClusterRole", "clusterrole", + ), + gvrFor("rbac.authorization.k8s.io", "v1", "clusterrolebindings"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "ClusterRoleBinding", "clusterrolebinding", + ), + gvrFor("rbac.authorization.k8s.io", "v1", "roles"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "Role", "role", + ), + gvrFor("rbac.authorization.k8s.io", "v1", "rolebindings"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "RoleBinding", "rolebinding", + ), + gvrFor("events.k8s.io", "v1", "events"): withGVRPartialMetadata( + apiextensionsv1.NamespaceScoped, "Event", "event", + ), + gvrFor("admissionregistration.k8s.io", "v1", "mutatingwebhookconfigurations"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "MutatingWebhookConfiguration", "mutatingwebhookconfiguration", + ), + gvrFor("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "ValidatingAdmissionPolicy", "validatingadmissionpolicy", + ), + gvrFor("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "ValidatingAdmissionPolicyBinding", "validatingadmissionpolicybinding", + ), + gvrFor("admissionregistration.k8s.io", "v1", "validatingwebhookconfigurations"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "ValidatingWebhookConfiguration", "validatingwebhookconfiguration", + ), + gvrFor("apiextensions.k8s.io", "v1", "customresourcedefinitions"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "CustomResourceDefinition", "customresourcedefinition", + ), + gvrFor("core.kcp.io", "v1alpha1", "logicalclusters"): withGVRPartialMetadata( + apiextensionsv1.ClusterScoped, "LogicalCluster", "logicalcluster", + ), + gvrFor("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicies"): withGVRPartialMetadata( + // TODO(gman0): move behind "k8s.io/apiserver/pkg/features".MutatingAdmissionPolicy + // feature gate once admissionregistration.k8s.io/v1alpha1 is not enabled when we do our v1.33 rebase. + apiextensionsv1.ClusterScoped, "MutatingAdmissionPolicy", "mutatingadmissionpolicy", + ), + gvrFor("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicybindings"): withGVRPartialMetadata( + // TODO(gman0): move behind "k8s.io/apiserver/pkg/features".MutatingAdmissionPolicy + // feature gate once admissionregistration.k8s.io/v1alpha1 is not enabled when we do our v1.33 rebase. + apiextensionsv1.ClusterScoped, "MutatingAdmissionPolicyBinding", "mutatingadmissionpolicybinding", + ), } func (s *crdGVRSource) GVRs() map[schema.GroupVersionResource]GVRPartialMetadata { diff --git a/pkg/informer/informer_test.go b/pkg/informer/informer_test.go index 576547bb58e..46faa86c1bc 100644 --- a/pkg/informer/informer_test.go +++ b/pkg/informer/informer_test.go @@ -85,6 +85,11 @@ func TestBuiltInInformableTypes(t *testing.T) { {Group: "authorization.k8s.io", Version: "v1", Kind: "SubjectAccessReview"}: {}, {Group: "apiextensions.k8s.io", Version: "v1", Kind: "ConversionReview"}: {}, {Group: "core.kcp.io", Version: "v1alpha1", Kind: "Shard"}: {}, + + // TODO(gman0): remove VAP in v1alpha1 when we do v1.33 rebase, + // as its v1alpha1 code will be removed by then (see k/k#129207). + {Group: "admissionregistration.k8s.io", Version: "v1alpha1", Kind: "ValidatingAdmissionPolicy"}: {}, + {Group: "admissionregistration.k8s.io", Version: "v1alpha1", Kind: "ValidatingAdmissionPolicyBinding"}: {}, } gvsToIgnore := map[schema.GroupVersion]struct{}{ @@ -100,6 +105,7 @@ func TestBuiltInInformableTypes(t *testing.T) { {Group: "certificates.k8s.io", Version: "v1beta1"}: {}, {Group: "coordination.k8s.io", Version: "v1beta1"}: {}, {Group: "coordination.k8s.io", Version: "v1alpha1"}: {}, + {Group: "coordination.k8s.io", Version: "v1alpha2"}: {}, {Group: "events.k8s.io", Version: "v1beta1"}: {}, {Group: "rbac.authorization.k8s.io", Version: "v1alpha1"}: {}, {Group: "rbac.authorization.k8s.io", Version: "v1beta1"}: {}, diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go index d8dc9f7be05..efdac7bb915 100644 --- a/pkg/openapi/zz_generated.openapi.go +++ b/pkg/openapi/zz_generated.openapi.go @@ -1111,7 +1111,7 @@ func schema_sdk_apis_apis_v1alpha1_APIResourceSchemaSpec(ref common.ReferenceCal }, "nameValidation": { SchemaProps: spec.SchemaProps{ - Description: "nameValidation can be used to configure name validation for bound APIs. Allowed values are `DNS1123Subdomain` and `PathSegmentName`. - DNS1123Subdomain: a lowercase RFC 1123 subdomain must consist of lower case\n alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character.\n Regex used is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\n- PathSegmentName: validates the name can be safely encoded as a path segment.\n The name may not be '.' or '..' and the name may not contain '/' or '%'.\n\nDefaults to `DNS1123Subdomain`, matching the behaviour of CRDs.", + Description: "nameValidation can be used to configure name validation for bound APIs. Allowed values are `DNS1123Subdomain` and `PathSegmentName`. - DNS1123Subdomain: a lowercase RFC 1123 subdomain must consist of lower case\n alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character.\n Regex used is '[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*'\n- PathSegmentName: validates the name can be safely encoded as a path segment.\n The name may not be '.' or '..' and the name may not contain '/' or '%'.\n\nDefaults to `DNS1123Subdomain`, matching the behaviour of CRDs.", Type: []string{"string"}, Format: "", }, @@ -3907,6 +3907,13 @@ func schema_pkg_apis_meta_v1_DeleteOptions(ref common.ReferenceCallback) common. }, }, }, + "ignoreStoreReadErrorWithClusterBreakingPotential": { + SchemaProps: spec.SchemaProps{ + Description: "if set to true, it will trigger an unsafe deletion of the resource in case the normal deletion flow fails with a corrupt object error. A resource is considered corrupt if it can not be retrieved from the underlying storage successfully because of a) its data can not be transformed e.g. decryption failure, or b) it fails to decode into an object. NOTE: unsafe deletion ignores finalizer constraints, skips precondition checks, and removes the object from the storage. WARNING: This may potentially break the cluster if the workload associated with the resource being unsafe-deleted relies on normal deletion flow. Use only if you REALLY know what you are doing. The default value is false, and the user must opt in to enable it", + Type: []string{"boolean"}, + Format: "", + }, + }, }, }, }, diff --git a/pkg/reconciler/garbagecollector/garbagecollector_controller.go b/pkg/reconciler/garbagecollector/garbagecollector_controller.go index 5af0ea9075c..429a91b187b 100644 --- a/pkg/reconciler/garbagecollector/garbagecollector_controller.go +++ b/pkg/reconciler/garbagecollector/garbagecollector_controller.go @@ -300,7 +300,12 @@ func (c *Controller) startGarbageCollectorForLogicalCluster(ctx context.Context, //nolint:errcheck garbageCollector.ResyncMonitors(ctx, c.dynamicDiscoverySharedInformerFactory) - go garbageCollector.Run(ctx, c.workersPerLogicalCluster) + // Initial sync timeout is set to 30s - as it was hardcoded in + // e8b1d7dc24713db99808028e0d02bacf6d48e01f in k/k. Should it timeout, + // the GC will continue running regardless, expecting the monitors to be + // synced eventually. In any case, the ResyncMonitors call above should + // have done that anyway. + go garbageCollector.Run(ctx, c.workersPerLogicalCluster, time.Second*30) }() return nil diff --git a/pkg/server/config.go b/pkg/server/config.go index 27f0d6aab1e..ee0681e2f7a 100644 --- a/pkg/server/config.go +++ b/pkg/server/config.go @@ -44,11 +44,11 @@ import ( "k8s.io/apiserver/pkg/quota/v1/generic" genericapiserver "k8s.io/apiserver/pkg/server" serverstorage "k8s.io/apiserver/pkg/server/storage" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/apiserver/pkg/util/webhook" "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/clientcmd" + utilversion "k8s.io/component-base/version" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/controlplane" controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver" diff --git a/pkg/server/options/flags.go b/pkg/server/options/flags.go index 79393666d16..564538ed34e 100644 --- a/pkg/server/options/flags.go +++ b/pkg/server/options/flags.go @@ -79,6 +79,7 @@ var ( "requestheader-extra-headers-prefix", // List of request header prefixes to inspect. X-Remote-Extra- is suggested. "requestheader-group-headers", // List of request headers to inspect for groups. X-Remote-Group is suggested. "requestheader-username-headers", // List of request headers to inspect for usernames. X-Remote-User is common. + "requestheader-uid-headers", // List of request headers to inspect for UIDs. X-Remote-Uid is suggested. Requires the RemoteRequestHeaderUID feature to be enabled. "token-auth-file", // If set, the file that will be used to secure the secure port of the API server via token authentication. // Kubernetes ServiceAccount Authentication flags @@ -89,6 +90,7 @@ var ( "service-account-lookup", // If true, validate ServiceAccount tokens exist in etcd as part of authentication. "service-account-max-token-expiration", // The maximum validity duration of a token created by the service account token issuer. If an otherwise valid TokenRequest with a validity duration larger than this value is requested, a token will be issued with a validity duration of this value. "service-account-signing-key-file", // Path to the file that contains the current private key of the service account token issuer. The issuer will sign issued ID tokens with this private key. + "service-account-signing-endpoint", // Path to socket where a external JWT signer is listening. This flag is mutually exclusive with --service-account-signing-key-file and --service-account-key-file. Requires enabling feature gate (ExternalServiceAccountTokenSigner) // logs flags "logging-format", // Sets the log format. Permitted formats: "text", "json". diff --git a/pkg/server/options/options.go b/pkg/server/options/options.go index cfc522c0a57..d06fe920f6d 100644 --- a/pkg/server/options/options.go +++ b/pkg/server/options/options.go @@ -17,6 +17,7 @@ limitations under the License. package options import ( + "context" "fmt" "net" "path/filepath" @@ -130,6 +131,11 @@ func NewOptions(rootDir string) *Options { // turn on the watch cache o.GenericControlPlane.Etcd.EnableWatchCache = true + // TODO(gman0): remove this admissionregistration.k8s.io/v1alpha1 override once + // we reach Kubernetes v1.33. VAP will be removed from that API version then: + // https://github.com/kubernetes/kubernetes/pull/129207 + // ValidatingAdmissionPolicy is GA, in admissionregistration.k8s.io/v1. + // // Turn on admissionregistration for validating admission policy if err := o.GenericControlPlane.APIEnablement.RuntimeConfig.Set("admissionregistration.k8s.io/v1alpha1=true"); err != nil { panic(fmt.Errorf("error setting APIEnablement: %w", err)) @@ -241,7 +247,7 @@ func (o *CompletedOptions) Validate() []error { return errs } -func (o *Options) Complete(rootDir string) (*CompletedOptions, error) { +func (o *Options) Complete(ctx context.Context, rootDir string) (*CompletedOptions, error) { if servers := o.GenericControlPlane.Etcd.StorageConfig.Transport.ServerList; len(servers) == 1 && servers[0] == "embedded" { o.EmbeddedEtcd.Enabled = true } @@ -312,11 +318,14 @@ func (o *Options) Complete(rootDir string) (*CompletedOptions, error) { o.GenericControlPlane.ServiceAccountSigningKeyFile = o.Controllers.SAController.ServiceAccountKeyFile } - completedGenericOptions, err := o.GenericControlPlane.Complete(nil, nil) + genericControlPlaneFss := cliflag.NamedFlagSets{} + completedGenericOptions, err := o.GenericControlPlane.Complete(ctx, genericControlPlaneFss, nil, nil) if err != nil { return nil, err } + o.GenericControlPlane.AddFlags(&genericControlPlaneFss) + if o.Extra.ExperimentalBindFreePort { // Override Required here. It influences o.GenericControlPlane.Validate to pass without a set port, // but other than that only has cosmetic effects e.g. on the flag description. Hence, we do it here diff --git a/pkg/virtual/apiexport/schemas/builtin/builtin.go b/pkg/virtual/apiexport/schemas/builtin/builtin.go index 7d1ef2a1bca..59564377e2c 100644 --- a/pkg/virtual/apiexport/schemas/builtin/builtin.go +++ b/pkg/virtual/apiexport/schemas/builtin/builtin.go @@ -240,17 +240,6 @@ var BuiltInAPIs = []internalapis.InternalAPI{ Instance: &eventsv1.Event{}, ResourceScope: apiextensionsv1.NamespaceScoped, }, - { - Names: apiextensionsv1.CustomResourceDefinitionNames{ - Plural: "validatingadmissionpolicies", - Singular: "validatingadmissionpolicy", - Kind: "ValidatingAdmissionPolicy", - }, - GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}, - Instance: &admissionregistrationv1alpha1.ValidatingAdmissionPolicy{}, - ResourceScope: apiextensionsv1.ClusterScoped, - HasStatus: true, - }, { Names: apiextensionsv1.CustomResourceDefinitionNames{ Plural: "validatingadmissionpolicies", @@ -268,18 +257,30 @@ var BuiltInAPIs = []internalapis.InternalAPI{ Singular: "validatingadmissionpolicybinding", Kind: "ValidatingAdmissionPolicyBinding", }, + GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1"}, + Instance: &admissionregistrationv1.ValidatingAdmissionPolicyBinding{}, + ResourceScope: apiextensionsv1.ClusterScoped, + }, + { // TODO(gman0): move behind "k8s.io/apiserver/pkg/features".MutatingAdmissionPolicy + // feature gate once admissionregistration.k8s.io/v1alpha1 is served, when we do our v1.33 rebase. + Names: apiextensionsv1.CustomResourceDefinitionNames{ + Plural: "mutatingadmissionpolicies", + Singular: "mutatingadmissionpolicy", + Kind: "MutatingAdmissionPolicy", + }, GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}, - Instance: &admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding{}, + Instance: &admissionregistrationv1alpha1.MutatingAdmissionPolicy{}, ResourceScope: apiextensionsv1.ClusterScoped, }, - { + { // TODO(gman0): move behind "k8s.io/apiserver/pkg/features".MutatingAdmissionPolicy + // feature gate once admissionregistration.k8s.io/v1alpha1 is not served, when we do our v1.33 rebase. Names: apiextensionsv1.CustomResourceDefinitionNames{ - Plural: "validatingadmissionpolicybindings", - Singular: "validatingadmissionpolicybinding", - Kind: "ValidatingAdmissionPolicyBinding", + Plural: "mutatingadmissionpolicybindings", + Singular: "mutatingadmissionpolicybinding", + Kind: "MutatingAdmissionPolicyBinding", }, - GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1"}, - Instance: &admissionregistrationv1.ValidatingAdmissionPolicyBinding{}, + GroupVersion: schema.GroupVersion{Group: "admissionregistration.k8s.io", Version: "v1alpha1"}, + Instance: &admissionregistrationv1alpha1.MutatingAdmissionPolicyBinding{}, ResourceScope: apiextensionsv1.ClusterScoped, }, { diff --git a/pkg/virtual/framework/dynamic/apiserver/handler.go b/pkg/virtual/framework/dynamic/apiserver/handler.go index b5034926246..05bcd477b1a 100644 --- a/pkg/virtual/framework/dynamic/apiserver/handler.go +++ b/pkg/virtual/framework/dynamic/apiserver/handler.go @@ -32,12 +32,10 @@ import ( "k8s.io/apiserver/pkg/endpoints/handlers/responsewriters" "k8s.io/apiserver/pkg/endpoints/metrics" apirequest "k8s.io/apiserver/pkg/endpoints/request" - "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/registry/rest" kubernetesscheme "k8s.io/client-go/kubernetes/scheme" "k8s.io/kube-openapi/pkg/validation/spec" - 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" @@ -178,6 +176,7 @@ func (r *resourceHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { supportedTypes := []string{ string(types.JSONPatchType), string(types.MergePatchType), + string(types.ApplyPatchType), } // HACK: Support resources of the client-go scheme the way existing clients expect it: @@ -202,10 +201,6 @@ func (r *resourceHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) { } } - if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) { - supportedTypes = append(supportedTypes, string(types.ApplyPatchType)) - } - var handlerFunc http.HandlerFunc subresources := apiResourceVersion.Subresources switch { diff --git a/pkg/virtual/framework/dynamic/apiserver/serving_info.go b/pkg/virtual/framework/dynamic/apiserver/serving_info.go index 2e29eb954b7..124295642b5 100644 --- a/pkg/virtual/framework/dynamic/apiserver/serving_info.go +++ b/pkg/virtual/framework/dynamic/apiserver/serving_info.go @@ -40,14 +40,12 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apiserver/pkg/endpoints/handlers" "k8s.io/apiserver/pkg/endpoints/openapi" - "k8s.io/apiserver/pkg/features" "k8s.io/apiserver/pkg/registry/rest" genericapiserver "k8s.io/apiserver/pkg/server" utilopenapi "k8s.io/apiserver/pkg/util/openapi" "k8s.io/klog/v2" "k8s.io/kube-openapi/pkg/validation/spec" - 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" ) @@ -245,23 +243,21 @@ func CreateServingInfoFor(genericConfig genericapiserver.CompletedConfig, apiRes OpenapiModels: modelsByGKV, } - if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) { - if withResetFields, canGetResetFields := storage.(rest.ResetFieldsStrategy); canGetResetFields { - resetFields := withResetFields.GetResetFields() - reqScope := *requestScope - reqScope, err = apiextensionsapiserver.ScopeWithFieldManager( - typeConverter, - reqScope, - resetFields, - "", - ) - if err != nil { - return nil, err - } - requestScope = &reqScope - } else { - return nil, fmt.Errorf("storage for resource %q should define GetResetFields", gvk.String()) + if withResetFields, canGetResetFields := storage.(rest.ResetFieldsStrategy); canGetResetFields { + resetFields := withResetFields.GetResetFields() + reqScope := *requestScope + reqScope, err = apiextensionsapiserver.ScopeWithFieldManager( + typeConverter, + reqScope, + resetFields, + "", + ) + if err != nil { + return nil, err } + requestScope = &reqScope + } else { + return nil, fmt.Errorf("storage for resource %q should define GetResetFields", gvk.String()) } var statusScope handlers.RequestScope @@ -275,21 +271,19 @@ func CreateServingInfoFor(genericConfig genericapiserver.CompletedConfig, apiRes ClusterScoped: clusterScoped, } - if kcpfeatures.DefaultFeatureGate.Enabled(features.ServerSideApply) { - if withResetFields, canGetResetFields := statusStorage.(rest.ResetFieldsStrategy); canGetResetFields { - resetFields := withResetFields.GetResetFields() - statusScope, err = apiextensionsapiserver.ScopeWithFieldManager( - typeConverter, - statusScope, - resetFields, - "status", - ) - if err != nil { - return nil, err - } - } else { - return nil, fmt.Errorf("storage for resource %q status should define GetResetFields", gvk.String()) + if withResetFields, canGetResetFields := statusStorage.(rest.ResetFieldsStrategy); canGetResetFields { + resetFields := withResetFields.GetResetFields() + statusScope, err = apiextensionsapiserver.ScopeWithFieldManager( + typeConverter, + statusScope, + resetFields, + "status", + ) + if err != nil { + return nil, err } + } else { + return nil, fmt.Errorf("storage for resource %q status should define GetResetFields", gvk.String()) } } diff --git a/pkg/virtual/framework/internalapis/fixtures/namespaces.yaml b/pkg/virtual/framework/internalapis/fixtures/namespaces.yaml index 24988fb4056..7cfeb8da11f 100644 --- a/pkg/virtual/framework/internalapis/fixtures/namespaces.yaml +++ b/pkg/virtual/framework/internalapis/fixtures/namespaces.yaml @@ -48,11 +48,17 @@ spec: description: NamespaceCondition contains details about state of namespace. properties: lastTransitionTime: + description: Last time the condition transitioned from one status + to another. format: date-time type: string message: + description: Human-readable message indicating details about last + transition. type: string reason: + description: Unique, one-word, CamelCase reason for the condition's + last transition. type: string status: description: Status of the condition, one of True, False, Unknown. diff --git a/pkg/virtual/framework/rootapiserver/config.go b/pkg/virtual/framework/rootapiserver/config.go index 53b845466ac..41600d8103d 100644 --- a/pkg/virtual/framework/rootapiserver/config.go +++ b/pkg/virtual/framework/rootapiserver/config.go @@ -18,8 +18,8 @@ package rootapiserver import ( genericapiserver "k8s.io/apiserver/pkg/server" - utilversion "k8s.io/apiserver/pkg/util/version" "k8s.io/client-go/rest" + utilversion "k8s.io/component-base/version" "github.com/kcp-dev/kcp/pkg/virtual/framework" ) diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/acceptablepermissionclaim.go b/sdk/client/applyconfiguration/apis/v1alpha1/acceptablepermissionclaim.go index d926332b307..7b80c835021 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/acceptablepermissionclaim.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/acceptablepermissionclaim.go @@ -39,7 +39,7 @@ func AcceptablePermissionClaim() *AcceptablePermissionClaimApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. func (b *AcceptablePermissionClaimApplyConfiguration) WithGroup(value string) *AcceptablePermissionClaimApplyConfiguration { - b.Group = &value + b.GroupResourceApplyConfiguration.Group = &value return b } @@ -47,7 +47,7 @@ func (b *AcceptablePermissionClaimApplyConfiguration) WithGroup(value string) *A // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Resource field is set to the value of the last call. func (b *AcceptablePermissionClaimApplyConfiguration) WithResource(value string) *AcceptablePermissionClaimApplyConfiguration { - b.Resource = &value + b.GroupResourceApplyConfiguration.Resource = &value return b } @@ -55,7 +55,7 @@ func (b *AcceptablePermissionClaimApplyConfiguration) WithResource(value string) // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the All field is set to the value of the last call. func (b *AcceptablePermissionClaimApplyConfiguration) WithAll(value bool) *AcceptablePermissionClaimApplyConfiguration { - b.All = &value + b.PermissionClaimApplyConfiguration.All = &value return b } @@ -67,7 +67,7 @@ func (b *AcceptablePermissionClaimApplyConfiguration) WithResourceSelector(value if values[i] == nil { panic("nil value passed to WithResourceSelector") } - b.ResourceSelector = append(b.ResourceSelector, *values[i]) + b.PermissionClaimApplyConfiguration.ResourceSelector = append(b.PermissionClaimApplyConfiguration.ResourceSelector, *values[i]) } return b } @@ -76,7 +76,7 @@ func (b *AcceptablePermissionClaimApplyConfiguration) WithResourceSelector(value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the IdentityHash field is set to the value of the last call. func (b *AcceptablePermissionClaimApplyConfiguration) WithIdentityHash(value string) *AcceptablePermissionClaimApplyConfiguration { - b.IdentityHash = &value + b.PermissionClaimApplyConfiguration.IdentityHash = &value return b } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apibinding.go b/sdk/client/applyconfiguration/apis/v1alpha1/apibinding.go index f56e5dd0cb0..40394ec97dc 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apibinding.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apibinding.go @@ -48,7 +48,7 @@ func APIBinding(name string) *APIBindingApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithKind(value string) *APIBindingApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *APIBindingApplyConfiguration) WithKind(value string) *APIBindingApplyCo // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithAPIVersion(value string) *APIBindingApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *APIBindingApplyConfiguration) WithAPIVersion(value string) *APIBindingA // If called multiple times, the Name field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithName(value string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *APIBindingApplyConfiguration) WithName(value string) *APIBindingApplyCo // If called multiple times, the GenerateName field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithGenerateName(value string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *APIBindingApplyConfiguration) WithGenerateName(value string) *APIBindin // If called multiple times, the Namespace field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithNamespace(value string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *APIBindingApplyConfiguration) WithNamespace(value string) *APIBindingAp // If called multiple times, the UID field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithUID(value types.UID) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *APIBindingApplyConfiguration) WithUID(value types.UID) *APIBindingApply // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithResourceVersion(value string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *APIBindingApplyConfiguration) WithResourceVersion(value string) *APIBin // If called multiple times, the Generation field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithGeneration(value int64) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *APIBindingApplyConfiguration) WithGeneration(value int64) *APIBindingAp // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithCreationTimestamp(value metav1.Time) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *APIBindingApplyConfiguration) WithCreationTimestamp(value metav1.Time) // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *APIBindingApplyConfiguration) WithDeletionTimestamp(value metav1.Time) // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *APIBindingApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *APIBindingApplyConfiguration) WithDeletionGracePeriodSeconds(value int6 // overwriting an existing map entries in Labels field with the same key. func (b *APIBindingApplyConfiguration) WithLabels(entries map[string]string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *APIBindingApplyConfiguration) WithLabels(entries map[string]string) *AP // overwriting an existing map entries in Annotations field with the same key. func (b *APIBindingApplyConfiguration) WithAnnotations(entries map[string]string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *APIBindingApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRe if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *APIBindingApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRe func (b *APIBindingApplyConfiguration) WithFinalizers(values ...string) *APIBindingApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *APIBindingApplyConfiguration) WithStatus(value *APIBindingStatusApplyCo // GetName retrieves the value of the Name field in the declarative configuration. func (b *APIBindingApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apiconversion.go b/sdk/client/applyconfiguration/apis/v1alpha1/apiconversion.go index 97f8d743144..45c1281060e 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apiconversion.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apiconversion.go @@ -47,7 +47,7 @@ func APIConversion(name string) *APIConversionApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithKind(value string) *APIConversionApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *APIConversionApplyConfiguration) WithKind(value string) *APIConversionA // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithAPIVersion(value string) *APIConversionApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -64,7 +64,7 @@ func (b *APIConversionApplyConfiguration) WithAPIVersion(value string) *APIConve // If called multiple times, the Name field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithName(value string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -73,7 +73,7 @@ func (b *APIConversionApplyConfiguration) WithName(value string) *APIConversionA // If called multiple times, the GenerateName field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithGenerateName(value string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -82,7 +82,7 @@ func (b *APIConversionApplyConfiguration) WithGenerateName(value string) *APICon // If called multiple times, the Namespace field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithNamespace(value string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -91,7 +91,7 @@ func (b *APIConversionApplyConfiguration) WithNamespace(value string) *APIConver // If called multiple times, the UID field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithUID(value types.UID) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -100,7 +100,7 @@ func (b *APIConversionApplyConfiguration) WithUID(value types.UID) *APIConversio // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithResourceVersion(value string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -109,7 +109,7 @@ func (b *APIConversionApplyConfiguration) WithResourceVersion(value string) *API // If called multiple times, the Generation field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithGeneration(value int64) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -118,7 +118,7 @@ func (b *APIConversionApplyConfiguration) WithGeneration(value int64) *APIConver // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithCreationTimestamp(value metav1.Time) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -127,7 +127,7 @@ func (b *APIConversionApplyConfiguration) WithCreationTimestamp(value metav1.Tim // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -136,7 +136,7 @@ func (b *APIConversionApplyConfiguration) WithDeletionTimestamp(value metav1.Tim // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *APIConversionApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -146,11 +146,11 @@ func (b *APIConversionApplyConfiguration) WithDeletionGracePeriodSeconds(value i // overwriting an existing map entries in Labels field with the same key. func (b *APIConversionApplyConfiguration) WithLabels(entries map[string]string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -161,11 +161,11 @@ func (b *APIConversionApplyConfiguration) WithLabels(entries map[string]string) // overwriting an existing map entries in Annotations field with the same key. func (b *APIConversionApplyConfiguration) WithAnnotations(entries map[string]string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -179,7 +179,7 @@ func (b *APIConversionApplyConfiguration) WithOwnerReferences(values ...*v1.Owne if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -190,7 +190,7 @@ func (b *APIConversionApplyConfiguration) WithOwnerReferences(values ...*v1.Owne func (b *APIConversionApplyConfiguration) WithFinalizers(values ...string) *APIConversionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -212,5 +212,5 @@ func (b *APIConversionApplyConfiguration) WithSpec(value *APIConversionSpecApply // GetName retrieves the value of the Name field in the declarative configuration. func (b *APIConversionApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apiexport.go b/sdk/client/applyconfiguration/apis/v1alpha1/apiexport.go index 3f56d993f77..c1edfd9c5d2 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apiexport.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apiexport.go @@ -48,7 +48,7 @@ func APIExport(name string) *APIExportApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithKind(value string) *APIExportApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *APIExportApplyConfiguration) WithKind(value string) *APIExportApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithAPIVersion(value string) *APIExportApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *APIExportApplyConfiguration) WithAPIVersion(value string) *APIExportApp // If called multiple times, the Name field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithName(value string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *APIExportApplyConfiguration) WithName(value string) *APIExportApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithGenerateName(value string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *APIExportApplyConfiguration) WithGenerateName(value string) *APIExportA // If called multiple times, the Namespace field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithNamespace(value string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *APIExportApplyConfiguration) WithNamespace(value string) *APIExportAppl // If called multiple times, the UID field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithUID(value types.UID) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *APIExportApplyConfiguration) WithUID(value types.UID) *APIExportApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithResourceVersion(value string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *APIExportApplyConfiguration) WithResourceVersion(value string) *APIExpo // If called multiple times, the Generation field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithGeneration(value int64) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *APIExportApplyConfiguration) WithGeneration(value int64) *APIExportAppl // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithCreationTimestamp(value metav1.Time) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *APIExportApplyConfiguration) WithCreationTimestamp(value metav1.Time) * // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *APIExportApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *APIExportApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *APIExportApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *APIExportApplyConfiguration) WithLabels(entries map[string]string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *APIExportApplyConfiguration) WithLabels(entries map[string]string) *API // overwriting an existing map entries in Annotations field with the same key. func (b *APIExportApplyConfiguration) WithAnnotations(entries map[string]string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *APIExportApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *APIExportApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *APIExportApplyConfiguration) WithFinalizers(values ...string) *APIExportApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *APIExportApplyConfiguration) WithStatus(value *APIExportStatusApplyConf // GetName retrieves the value of the Name field in the declarative configuration. func (b *APIExportApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslice.go index 9cc6744c4db..9c1f8a7c1de 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslice.go @@ -48,7 +48,7 @@ func APIExportEndpointSlice(name string) *APIExportEndpointSliceApplyConfigurati // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithKind(value string) *APIExportEndpointSliceApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithKind(value string) *APIEx // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithAPIVersion(value string) *APIExportEndpointSliceApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithAPIVersion(value string) // If called multiple times, the Name field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithName(value string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithName(value string) *APIEx // If called multiple times, the GenerateName field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithGenerateName(value string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithGenerateName(value string // If called multiple times, the Namespace field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithNamespace(value string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithNamespace(value string) * // If called multiple times, the UID field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithUID(value types.UID) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithUID(value types.UID) *API // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithResourceVersion(value string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithResourceVersion(value str // If called multiple times, the Generation field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithGeneration(value int64) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithGeneration(value int64) * // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithCreationTimestamp(value metav1.Time) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithCreationTimestamp(value m // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithDeletionTimestamp(value m // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *APIExportEndpointSliceApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithDeletionGracePeriodSecond // overwriting an existing map entries in Labels field with the same key. func (b *APIExportEndpointSliceApplyConfiguration) WithLabels(entries map[string]string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithLabels(entries map[string // overwriting an existing map entries in Annotations field with the same key. func (b *APIExportEndpointSliceApplyConfiguration) WithAnnotations(entries map[string]string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithOwnerReferences(values .. if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithOwnerReferences(values .. func (b *APIExportEndpointSliceApplyConfiguration) WithFinalizers(values ...string) *APIExportEndpointSliceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *APIExportEndpointSliceApplyConfiguration) WithStatus(value *APIExportEn // GetName retrieves the value of the Name field in the declarative configuration. func (b *APIExportEndpointSliceApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslicestatus.go b/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslicestatus.go index a6b7d4f0f34..b7a7d7f7c52 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslicestatus.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apiexportendpointslicestatus.go @@ -19,13 +19,13 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // APIExportEndpointSliceStatusApplyConfiguration represents a declarative configuration of the APIExportEndpointSliceStatus type for use // with apply. type APIExportEndpointSliceStatusApplyConfiguration struct { - Conditions *v1alpha1.Conditions `json:"conditions,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` APIExportEndpoints []APIExportEndpointApplyConfiguration `json:"endpoints,omitempty"` } @@ -38,7 +38,7 @@ func APIExportEndpointSliceStatus() *APIExportEndpointSliceStatusApplyConfigurat // WithConditions sets the Conditions field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Conditions field is set to the value of the last call. -func (b *APIExportEndpointSliceStatusApplyConfiguration) WithConditions(value v1alpha1.Conditions) *APIExportEndpointSliceStatusApplyConfiguration { +func (b *APIExportEndpointSliceStatusApplyConfiguration) WithConditions(value conditionsv1alpha1.Conditions) *APIExportEndpointSliceStatusApplyConfiguration { b.Conditions = &value return b } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apiexportstatus.go b/sdk/client/applyconfiguration/apis/v1alpha1/apiexportstatus.go index 309670d8878..fa361ee803f 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apiexportstatus.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apiexportstatus.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // APIExportStatusApplyConfiguration represents a declarative configuration of the APIExportStatus type for use // with apply. type APIExportStatusApplyConfiguration struct { IdentityHash *string `json:"identityHash,omitempty"` - Conditions *v1alpha1.Conditions `json:"conditions,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` VirtualWorkspaces []VirtualWorkspaceApplyConfiguration `json:"virtualWorkspaces,omitempty"` } @@ -47,7 +47,7 @@ func (b *APIExportStatusApplyConfiguration) WithIdentityHash(value string) *APIE // WithConditions sets the Conditions field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Conditions field is set to the value of the last call. -func (b *APIExportStatusApplyConfiguration) WithConditions(value v1alpha1.Conditions) *APIExportStatusApplyConfiguration { +func (b *APIExportStatusApplyConfiguration) WithConditions(value conditionsv1alpha1.Conditions) *APIExportStatusApplyConfiguration { b.Conditions = &value return b } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/apiresourceschema.go b/sdk/client/applyconfiguration/apis/v1alpha1/apiresourceschema.go index 2a3db17fd5b..1a310be21b4 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/apiresourceschema.go @@ -47,7 +47,7 @@ func APIResourceSchema(name string) *APIResourceSchemaApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithKind(value string) *APIResourceSchemaApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithKind(value string) *APIResourc // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithAPIVersion(value string) *APIResourceSchemaApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -64,7 +64,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithAPIVersion(value string) *APIR // If called multiple times, the Name field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithName(value string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -73,7 +73,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithName(value string) *APIResourc // If called multiple times, the GenerateName field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithGenerateName(value string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -82,7 +82,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithGenerateName(value string) *AP // If called multiple times, the Namespace field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithNamespace(value string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -91,7 +91,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithNamespace(value string) *APIRe // If called multiple times, the UID field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithUID(value types.UID) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -100,7 +100,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithUID(value types.UID) *APIResou // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithResourceVersion(value string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -109,7 +109,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithResourceVersion(value string) // If called multiple times, the Generation field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithGeneration(value int64) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -118,7 +118,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithGeneration(value int64) *APIRe // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithCreationTimestamp(value metav1.Time) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -127,7 +127,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithCreationTimestamp(value metav1 // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -136,7 +136,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithDeletionTimestamp(value metav1 // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *APIResourceSchemaApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -146,11 +146,11 @@ func (b *APIResourceSchemaApplyConfiguration) WithDeletionGracePeriodSeconds(val // overwriting an existing map entries in Labels field with the same key. func (b *APIResourceSchemaApplyConfiguration) WithLabels(entries map[string]string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -161,11 +161,11 @@ func (b *APIResourceSchemaApplyConfiguration) WithLabels(entries map[string]stri // overwriting an existing map entries in Annotations field with the same key. func (b *APIResourceSchemaApplyConfiguration) WithAnnotations(entries map[string]string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -179,7 +179,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithOwnerReferences(values ...*v1. if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -190,7 +190,7 @@ func (b *APIResourceSchemaApplyConfiguration) WithOwnerReferences(values ...*v1. func (b *APIResourceSchemaApplyConfiguration) WithFinalizers(values ...string) *APIResourceSchemaApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -212,5 +212,5 @@ func (b *APIResourceSchemaApplyConfiguration) WithSpec(value *APIResourceSchemaS // GetName retrieves the value of the Name field in the declarative configuration. func (b *APIResourceSchemaApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/customresourceconversion.go b/sdk/client/applyconfiguration/apis/v1alpha1/customresourceconversion.go index 284cd411fdb..fee86185439 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/customresourceconversion.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/customresourceconversion.go @@ -19,13 +19,13 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // CustomResourceConversionApplyConfiguration represents a declarative configuration of the CustomResourceConversion type for use // with apply. type CustomResourceConversionApplyConfiguration struct { - Strategy *v1alpha1.ConversionStrategyType `json:"strategy,omitempty"` + Strategy *apisv1alpha1.ConversionStrategyType `json:"strategy,omitempty"` Webhook *WebhookConversionApplyConfiguration `json:"webhook,omitempty"` } @@ -38,7 +38,7 @@ func CustomResourceConversion() *CustomResourceConversionApplyConfiguration { // WithStrategy sets the Strategy field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Strategy field is set to the value of the last call. -func (b *CustomResourceConversionApplyConfiguration) WithStrategy(value v1alpha1.ConversionStrategyType) *CustomResourceConversionApplyConfiguration { +func (b *CustomResourceConversionApplyConfiguration) WithStrategy(value apisv1alpha1.ConversionStrategyType) *CustomResourceConversionApplyConfiguration { b.Strategy = &value return b } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/maximalpermissionpolicy.go b/sdk/client/applyconfiguration/apis/v1alpha1/maximalpermissionpolicy.go index 0c9232db439..7da1194690b 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/maximalpermissionpolicy.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/maximalpermissionpolicy.go @@ -19,13 +19,13 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" ) // MaximalPermissionPolicyApplyConfiguration represents a declarative configuration of the MaximalPermissionPolicy type for use // with apply. type MaximalPermissionPolicyApplyConfiguration struct { - Local *v1alpha1.LocalAPIExportPolicy `json:"local,omitempty"` + Local *apisv1alpha1.LocalAPIExportPolicy `json:"local,omitempty"` } // MaximalPermissionPolicyApplyConfiguration constructs a declarative configuration of the MaximalPermissionPolicy type for use with @@ -37,7 +37,7 @@ func MaximalPermissionPolicy() *MaximalPermissionPolicyApplyConfiguration { // WithLocal sets the Local field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Local field is set to the value of the last call. -func (b *MaximalPermissionPolicyApplyConfiguration) WithLocal(value v1alpha1.LocalAPIExportPolicy) *MaximalPermissionPolicyApplyConfiguration { +func (b *MaximalPermissionPolicyApplyConfiguration) WithLocal(value apisv1alpha1.LocalAPIExportPolicy) *MaximalPermissionPolicyApplyConfiguration { b.Local = &value return b } diff --git a/sdk/client/applyconfiguration/apis/v1alpha1/permissionclaim.go b/sdk/client/applyconfiguration/apis/v1alpha1/permissionclaim.go index e9c887c9322..71267ff505f 100644 --- a/sdk/client/applyconfiguration/apis/v1alpha1/permissionclaim.go +++ b/sdk/client/applyconfiguration/apis/v1alpha1/permissionclaim.go @@ -37,7 +37,7 @@ func PermissionClaim() *PermissionClaimApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Group field is set to the value of the last call. func (b *PermissionClaimApplyConfiguration) WithGroup(value string) *PermissionClaimApplyConfiguration { - b.Group = &value + b.GroupResourceApplyConfiguration.Group = &value return b } @@ -45,7 +45,7 @@ func (b *PermissionClaimApplyConfiguration) WithGroup(value string) *PermissionC // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Resource field is set to the value of the last call. func (b *PermissionClaimApplyConfiguration) WithResource(value string) *PermissionClaimApplyConfiguration { - b.Resource = &value + b.GroupResourceApplyConfiguration.Resource = &value return b } diff --git a/sdk/client/applyconfiguration/conditions/v1alpha1/condition.go b/sdk/client/applyconfiguration/conditions/v1alpha1/condition.go index c9d6b7b8b4e..acef7391507 100644 --- a/sdk/client/applyconfiguration/conditions/v1alpha1/condition.go +++ b/sdk/client/applyconfiguration/conditions/v1alpha1/condition.go @@ -22,18 +22,18 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // ConditionApplyConfiguration represents a declarative configuration of the Condition type for use // with apply. type ConditionApplyConfiguration struct { - Type *v1alpha1.ConditionType `json:"type,omitempty"` - Status *v1.ConditionStatus `json:"status,omitempty"` - Severity *v1alpha1.ConditionSeverity `json:"severity,omitempty"` - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + Type *conditionsv1alpha1.ConditionType `json:"type,omitempty"` + Status *v1.ConditionStatus `json:"status,omitempty"` + Severity *conditionsv1alpha1.ConditionSeverity `json:"severity,omitempty"` + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + Reason *string `json:"reason,omitempty"` + Message *string `json:"message,omitempty"` } // ConditionApplyConfiguration constructs a declarative configuration of the Condition type for use with @@ -45,7 +45,7 @@ func Condition() *ConditionApplyConfiguration { // WithType sets the Type field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Type field is set to the value of the last call. -func (b *ConditionApplyConfiguration) WithType(value v1alpha1.ConditionType) *ConditionApplyConfiguration { +func (b *ConditionApplyConfiguration) WithType(value conditionsv1alpha1.ConditionType) *ConditionApplyConfiguration { b.Type = &value return b } @@ -61,7 +61,7 @@ func (b *ConditionApplyConfiguration) WithStatus(value v1.ConditionStatus) *Cond // WithSeverity sets the Severity field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Severity field is set to the value of the last call. -func (b *ConditionApplyConfiguration) WithSeverity(value v1alpha1.ConditionSeverity) *ConditionApplyConfiguration { +func (b *ConditionApplyConfiguration) WithSeverity(value conditionsv1alpha1.ConditionSeverity) *ConditionApplyConfiguration { b.Severity = &value return b } diff --git a/sdk/client/applyconfiguration/core/v1alpha1/logicalcluster.go b/sdk/client/applyconfiguration/core/v1alpha1/logicalcluster.go index 0a86cbc5d7a..9e73d4e7c95 100644 --- a/sdk/client/applyconfiguration/core/v1alpha1/logicalcluster.go +++ b/sdk/client/applyconfiguration/core/v1alpha1/logicalcluster.go @@ -48,7 +48,7 @@ func LogicalCluster(name string) *LogicalClusterApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithKind(value string) *LogicalClusterApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *LogicalClusterApplyConfiguration) WithKind(value string) *LogicalCluste // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithAPIVersion(value string) *LogicalClusterApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *LogicalClusterApplyConfiguration) WithAPIVersion(value string) *Logical // If called multiple times, the Name field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithName(value string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *LogicalClusterApplyConfiguration) WithName(value string) *LogicalCluste // If called multiple times, the GenerateName field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithGenerateName(value string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *LogicalClusterApplyConfiguration) WithGenerateName(value string) *Logic // If called multiple times, the Namespace field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithNamespace(value string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *LogicalClusterApplyConfiguration) WithNamespace(value string) *LogicalC // If called multiple times, the UID field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithUID(value types.UID) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *LogicalClusterApplyConfiguration) WithUID(value types.UID) *LogicalClus // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithResourceVersion(value string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *LogicalClusterApplyConfiguration) WithResourceVersion(value string) *Lo // If called multiple times, the Generation field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithGeneration(value int64) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *LogicalClusterApplyConfiguration) WithGeneration(value int64) *LogicalC // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithCreationTimestamp(value metav1.Time) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *LogicalClusterApplyConfiguration) WithCreationTimestamp(value metav1.Ti // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *LogicalClusterApplyConfiguration) WithDeletionTimestamp(value metav1.Ti // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *LogicalClusterApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *LogicalClusterApplyConfiguration) WithDeletionGracePeriodSeconds(value // overwriting an existing map entries in Labels field with the same key. func (b *LogicalClusterApplyConfiguration) WithLabels(entries map[string]string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *LogicalClusterApplyConfiguration) WithLabels(entries map[string]string) // overwriting an existing map entries in Annotations field with the same key. func (b *LogicalClusterApplyConfiguration) WithAnnotations(entries map[string]string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *LogicalClusterApplyConfiguration) WithOwnerReferences(values ...*v1.Own if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *LogicalClusterApplyConfiguration) WithOwnerReferences(values ...*v1.Own func (b *LogicalClusterApplyConfiguration) WithFinalizers(values ...string) *LogicalClusterApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *LogicalClusterApplyConfiguration) WithStatus(value *LogicalClusterStatu // GetName retrieves the value of the Name field in the declarative configuration. func (b *LogicalClusterApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/core/v1alpha1/logicalclusterstatus.go b/sdk/client/applyconfiguration/core/v1alpha1/logicalclusterstatus.go index e5bc9b47867..d1a17a65be3 100644 --- a/sdk/client/applyconfiguration/core/v1alpha1/logicalclusterstatus.go +++ b/sdk/client/applyconfiguration/core/v1alpha1/logicalclusterstatus.go @@ -19,17 +19,17 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/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" ) // LogicalClusterStatusApplyConfiguration represents a declarative configuration of the LogicalClusterStatus type for use // with apply. type LogicalClusterStatusApplyConfiguration struct { - URL *string `json:"URL,omitempty"` - Phase *v1alpha1.LogicalClusterPhaseType `json:"phase,omitempty"` - Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` - Initializers []v1alpha1.LogicalClusterInitializer `json:"initializers,omitempty"` + URL *string `json:"URL,omitempty"` + Phase *corev1alpha1.LogicalClusterPhaseType `json:"phase,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` + Initializers []corev1alpha1.LogicalClusterInitializer `json:"initializers,omitempty"` } // LogicalClusterStatusApplyConfiguration constructs a declarative configuration of the LogicalClusterStatus type for use with @@ -49,7 +49,7 @@ func (b *LogicalClusterStatusApplyConfiguration) WithURL(value string) *LogicalC // WithPhase sets the Phase field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Phase field is set to the value of the last call. -func (b *LogicalClusterStatusApplyConfiguration) WithPhase(value v1alpha1.LogicalClusterPhaseType) *LogicalClusterStatusApplyConfiguration { +func (b *LogicalClusterStatusApplyConfiguration) WithPhase(value corev1alpha1.LogicalClusterPhaseType) *LogicalClusterStatusApplyConfiguration { b.Phase = &value return b } @@ -65,7 +65,7 @@ func (b *LogicalClusterStatusApplyConfiguration) WithConditions(value conditions // WithInitializers adds the given value to the Initializers field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Initializers field. -func (b *LogicalClusterStatusApplyConfiguration) WithInitializers(values ...v1alpha1.LogicalClusterInitializer) *LogicalClusterStatusApplyConfiguration { +func (b *LogicalClusterStatusApplyConfiguration) WithInitializers(values ...corev1alpha1.LogicalClusterInitializer) *LogicalClusterStatusApplyConfiguration { for i := range values { b.Initializers = append(b.Initializers, values[i]) } diff --git a/sdk/client/applyconfiguration/core/v1alpha1/shard.go b/sdk/client/applyconfiguration/core/v1alpha1/shard.go index b2aed9947ef..0b9b2df7243 100644 --- a/sdk/client/applyconfiguration/core/v1alpha1/shard.go +++ b/sdk/client/applyconfiguration/core/v1alpha1/shard.go @@ -48,7 +48,7 @@ func Shard(name string) *ShardApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *ShardApplyConfiguration) WithKind(value string) *ShardApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *ShardApplyConfiguration) WithKind(value string) *ShardApplyConfiguratio // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *ShardApplyConfiguration) WithAPIVersion(value string) *ShardApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *ShardApplyConfiguration) WithAPIVersion(value string) *ShardApplyConfig // If called multiple times, the Name field is set to the value of the last call. func (b *ShardApplyConfiguration) WithName(value string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *ShardApplyConfiguration) WithName(value string) *ShardApplyConfiguratio // If called multiple times, the GenerateName field is set to the value of the last call. func (b *ShardApplyConfiguration) WithGenerateName(value string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *ShardApplyConfiguration) WithGenerateName(value string) *ShardApplyConf // If called multiple times, the Namespace field is set to the value of the last call. func (b *ShardApplyConfiguration) WithNamespace(value string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *ShardApplyConfiguration) WithNamespace(value string) *ShardApplyConfigu // If called multiple times, the UID field is set to the value of the last call. func (b *ShardApplyConfiguration) WithUID(value types.UID) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *ShardApplyConfiguration) WithUID(value types.UID) *ShardApplyConfigurat // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *ShardApplyConfiguration) WithResourceVersion(value string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *ShardApplyConfiguration) WithResourceVersion(value string) *ShardApplyC // If called multiple times, the Generation field is set to the value of the last call. func (b *ShardApplyConfiguration) WithGeneration(value int64) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *ShardApplyConfiguration) WithGeneration(value int64) *ShardApplyConfigu // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *ShardApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *ShardApplyConfiguration) WithCreationTimestamp(value metav1.Time) *Shar // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *ShardApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *ShardApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Shar // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *ShardApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *ShardApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *S // overwriting an existing map entries in Labels field with the same key. func (b *ShardApplyConfiguration) WithLabels(entries map[string]string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *ShardApplyConfiguration) WithLabels(entries map[string]string) *ShardAp // overwriting an existing map entries in Annotations field with the same key. func (b *ShardApplyConfiguration) WithAnnotations(entries map[string]string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *ShardApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferen if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *ShardApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerReferen func (b *ShardApplyConfiguration) WithFinalizers(values ...string) *ShardApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *ShardApplyConfiguration) WithStatus(value *ShardStatusApplyConfiguratio // GetName retrieves the value of the Name field in the declarative configuration. func (b *ShardApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/core/v1alpha1/shardstatus.go b/sdk/client/applyconfiguration/core/v1alpha1/shardstatus.go index 650fa474c40..c3ca1143f31 100644 --- a/sdk/client/applyconfiguration/core/v1alpha1/shardstatus.go +++ b/sdk/client/applyconfiguration/core/v1alpha1/shardstatus.go @@ -21,14 +21,14 @@ package v1alpha1 import ( v1 "k8s.io/api/core/v1" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // ShardStatusApplyConfiguration represents a declarative configuration of the ShardStatus type for use // with apply. type ShardStatusApplyConfiguration struct { - Capacity *v1.ResourceList `json:"capacity,omitempty"` - Conditions *v1alpha1.Conditions `json:"conditions,omitempty"` + Capacity *v1.ResourceList `json:"capacity,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` } // ShardStatusApplyConfiguration constructs a declarative configuration of the ShardStatus type for use with @@ -48,7 +48,7 @@ func (b *ShardStatusApplyConfiguration) WithCapacity(value v1.ResourceList) *Sha // WithConditions sets the Conditions field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Conditions field is set to the value of the last call. -func (b *ShardStatusApplyConfiguration) WithConditions(value v1alpha1.Conditions) *ShardStatusApplyConfiguration { +func (b *ShardStatusApplyConfiguration) WithConditions(value conditionsv1alpha1.Conditions) *ShardStatusApplyConfiguration { b.Conditions = &value return b } diff --git a/sdk/client/applyconfiguration/internal/internal.go b/sdk/client/applyconfiguration/internal/internal.go index 1bcc7002d26..86ad90aa9fd 100644 --- a/sdk/client/applyconfiguration/internal/internal.go +++ b/sdk/client/applyconfiguration/internal/internal.go @@ -19,8 +19,8 @@ limitations under the License. package internal import ( - "fmt" - "sync" + fmt "fmt" + sync "sync" typed "sigs.k8s.io/structured-merge-diff/v4/typed" ) diff --git a/sdk/client/applyconfiguration/meta/v1/condition.go b/sdk/client/applyconfiguration/meta/v1/condition.go index 823954bdd16..40f8af37f48 100644 --- a/sdk/client/applyconfiguration/meta/v1/condition.go +++ b/sdk/client/applyconfiguration/meta/v1/condition.go @@ -19,18 +19,18 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // ConditionApplyConfiguration represents a declarative configuration of the Condition type for use // with apply. type ConditionApplyConfiguration struct { - Type *string `json:"type,omitempty"` - Status *v1.ConditionStatus `json:"status,omitempty"` - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - LastTransitionTime *v1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + Type *string `json:"type,omitempty"` + Status *metav1.ConditionStatus `json:"status,omitempty"` + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + Reason *string `json:"reason,omitempty"` + Message *string `json:"message,omitempty"` } // ConditionApplyConfiguration constructs a declarative configuration of the Condition type for use with @@ -50,7 +50,7 @@ func (b *ConditionApplyConfiguration) WithType(value string) *ConditionApplyConf // WithStatus sets the Status field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Status field is set to the value of the last call. -func (b *ConditionApplyConfiguration) WithStatus(value v1.ConditionStatus) *ConditionApplyConfiguration { +func (b *ConditionApplyConfiguration) WithStatus(value metav1.ConditionStatus) *ConditionApplyConfiguration { b.Status = &value return b } @@ -66,7 +66,7 @@ func (b *ConditionApplyConfiguration) WithObservedGeneration(value int64) *Condi // WithLastTransitionTime sets the LastTransitionTime field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the LastTransitionTime field is set to the value of the last call. -func (b *ConditionApplyConfiguration) WithLastTransitionTime(value v1.Time) *ConditionApplyConfiguration { +func (b *ConditionApplyConfiguration) WithLastTransitionTime(value metav1.Time) *ConditionApplyConfiguration { b.LastTransitionTime = &value return b } diff --git a/sdk/client/applyconfiguration/meta/v1/deleteoptions.go b/sdk/client/applyconfiguration/meta/v1/deleteoptions.go index e5135adb4e7..6d3742f2683 100644 --- a/sdk/client/applyconfiguration/meta/v1/deleteoptions.go +++ b/sdk/client/applyconfiguration/meta/v1/deleteoptions.go @@ -25,12 +25,13 @@ import ( // DeleteOptionsApplyConfiguration represents a declarative configuration of the DeleteOptions type for use // with apply. type DeleteOptionsApplyConfiguration struct { - TypeMetaApplyConfiguration `json:",inline"` - GracePeriodSeconds *int64 `json:"gracePeriodSeconds,omitempty"` - Preconditions *metav1.Preconditions `json:"preconditions,omitempty"` - OrphanDependents *bool `json:"orphanDependents,omitempty"` - PropagationPolicy *metav1.DeletionPropagation `json:"propagationPolicy,omitempty"` - DryRun []string `json:"dryRun,omitempty"` + TypeMetaApplyConfiguration `json:",inline"` + GracePeriodSeconds *int64 `json:"gracePeriodSeconds,omitempty"` + Preconditions *metav1.Preconditions `json:"preconditions,omitempty"` + OrphanDependents *bool `json:"orphanDependents,omitempty"` + PropagationPolicy *metav1.DeletionPropagation `json:"propagationPolicy,omitempty"` + DryRun []string `json:"dryRun,omitempty"` + IgnoreStoreReadErrorWithClusterBreakingPotential *bool `json:"ignoreStoreReadErrorWithClusterBreakingPotential,omitempty"` } // DeleteOptionsApplyConfiguration constructs a declarative configuration of the DeleteOptions type for use with @@ -46,7 +47,7 @@ func DeleteOptions() *DeleteOptionsApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *DeleteOptionsApplyConfiguration) WithKind(value string) *DeleteOptionsApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -54,7 +55,7 @@ func (b *DeleteOptionsApplyConfiguration) WithKind(value string) *DeleteOptionsA // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *DeleteOptionsApplyConfiguration) WithAPIVersion(value string) *DeleteOptionsApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -99,3 +100,11 @@ func (b *DeleteOptionsApplyConfiguration) WithDryRun(values ...string) *DeleteOp } return b } + +// WithIgnoreStoreReadErrorWithClusterBreakingPotential sets the IgnoreStoreReadErrorWithClusterBreakingPotential field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the IgnoreStoreReadErrorWithClusterBreakingPotential field is set to the value of the last call. +func (b *DeleteOptionsApplyConfiguration) WithIgnoreStoreReadErrorWithClusterBreakingPotential(value bool) *DeleteOptionsApplyConfiguration { + b.IgnoreStoreReadErrorWithClusterBreakingPotential = &value + return b +} diff --git a/sdk/client/applyconfiguration/meta/v1/labelselectorrequirement.go b/sdk/client/applyconfiguration/meta/v1/labelselectorrequirement.go index 4da2259b1f6..d77ea39305c 100644 --- a/sdk/client/applyconfiguration/meta/v1/labelselectorrequirement.go +++ b/sdk/client/applyconfiguration/meta/v1/labelselectorrequirement.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // LabelSelectorRequirementApplyConfiguration represents a declarative configuration of the LabelSelectorRequirement type for use // with apply. type LabelSelectorRequirementApplyConfiguration struct { - Key *string `json:"key,omitempty"` - Operator *v1.LabelSelectorOperator `json:"operator,omitempty"` - Values []string `json:"values,omitempty"` + Key *string `json:"key,omitempty"` + Operator *metav1.LabelSelectorOperator `json:"operator,omitempty"` + Values []string `json:"values,omitempty"` } // LabelSelectorRequirementApplyConfiguration constructs a declarative configuration of the LabelSelectorRequirement type for use with @@ -47,7 +47,7 @@ func (b *LabelSelectorRequirementApplyConfiguration) WithKey(value string) *Labe // WithOperator sets the Operator field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Operator field is set to the value of the last call. -func (b *LabelSelectorRequirementApplyConfiguration) WithOperator(value v1.LabelSelectorOperator) *LabelSelectorRequirementApplyConfiguration { +func (b *LabelSelectorRequirementApplyConfiguration) WithOperator(value metav1.LabelSelectorOperator) *LabelSelectorRequirementApplyConfiguration { b.Operator = &value return b } diff --git a/sdk/client/applyconfiguration/meta/v1/managedfieldsentry.go b/sdk/client/applyconfiguration/meta/v1/managedfieldsentry.go index 87bf99be61f..efdd7a58fd0 100644 --- a/sdk/client/applyconfiguration/meta/v1/managedfieldsentry.go +++ b/sdk/client/applyconfiguration/meta/v1/managedfieldsentry.go @@ -19,19 +19,19 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // ManagedFieldsEntryApplyConfiguration represents a declarative configuration of the ManagedFieldsEntry type for use // with apply. type ManagedFieldsEntryApplyConfiguration struct { - Manager *string `json:"manager,omitempty"` - Operation *v1.ManagedFieldsOperationType `json:"operation,omitempty"` - APIVersion *string `json:"apiVersion,omitempty"` - Time *v1.Time `json:"time,omitempty"` - FieldsType *string `json:"fieldsType,omitempty"` - FieldsV1 *v1.FieldsV1 `json:"fieldsV1,omitempty"` - Subresource *string `json:"subresource,omitempty"` + Manager *string `json:"manager,omitempty"` + Operation *metav1.ManagedFieldsOperationType `json:"operation,omitempty"` + APIVersion *string `json:"apiVersion,omitempty"` + Time *metav1.Time `json:"time,omitempty"` + FieldsType *string `json:"fieldsType,omitempty"` + FieldsV1 *metav1.FieldsV1 `json:"fieldsV1,omitempty"` + Subresource *string `json:"subresource,omitempty"` } // ManagedFieldsEntryApplyConfiguration constructs a declarative configuration of the ManagedFieldsEntry type for use with @@ -51,7 +51,7 @@ func (b *ManagedFieldsEntryApplyConfiguration) WithManager(value string) *Manage // WithOperation sets the Operation field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Operation field is set to the value of the last call. -func (b *ManagedFieldsEntryApplyConfiguration) WithOperation(value v1.ManagedFieldsOperationType) *ManagedFieldsEntryApplyConfiguration { +func (b *ManagedFieldsEntryApplyConfiguration) WithOperation(value metav1.ManagedFieldsOperationType) *ManagedFieldsEntryApplyConfiguration { b.Operation = &value return b } @@ -67,7 +67,7 @@ func (b *ManagedFieldsEntryApplyConfiguration) WithAPIVersion(value string) *Man // WithTime sets the Time field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Time field is set to the value of the last call. -func (b *ManagedFieldsEntryApplyConfiguration) WithTime(value v1.Time) *ManagedFieldsEntryApplyConfiguration { +func (b *ManagedFieldsEntryApplyConfiguration) WithTime(value metav1.Time) *ManagedFieldsEntryApplyConfiguration { b.Time = &value return b } @@ -83,7 +83,7 @@ func (b *ManagedFieldsEntryApplyConfiguration) WithFieldsType(value string) *Man // WithFieldsV1 sets the FieldsV1 field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the FieldsV1 field is set to the value of the last call. -func (b *ManagedFieldsEntryApplyConfiguration) WithFieldsV1(value v1.FieldsV1) *ManagedFieldsEntryApplyConfiguration { +func (b *ManagedFieldsEntryApplyConfiguration) WithFieldsV1(value metav1.FieldsV1) *ManagedFieldsEntryApplyConfiguration { b.FieldsV1 = &value return b } diff --git a/sdk/client/applyconfiguration/meta/v1/objectmeta.go b/sdk/client/applyconfiguration/meta/v1/objectmeta.go index 6b416cdaa7a..38633e00884 100644 --- a/sdk/client/applyconfiguration/meta/v1/objectmeta.go +++ b/sdk/client/applyconfiguration/meta/v1/objectmeta.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" ) @@ -32,8 +32,8 @@ type ObjectMetaApplyConfiguration struct { UID *types.UID `json:"uid,omitempty"` ResourceVersion *string `json:"resourceVersion,omitempty"` Generation *int64 `json:"generation,omitempty"` - CreationTimestamp *v1.Time `json:"creationTimestamp,omitempty"` - DeletionTimestamp *v1.Time `json:"deletionTimestamp,omitempty"` + CreationTimestamp *metav1.Time `json:"creationTimestamp,omitempty"` + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty"` DeletionGracePeriodSeconds *int64 `json:"deletionGracePeriodSeconds,omitempty"` Labels map[string]string `json:"labels,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` @@ -98,7 +98,7 @@ func (b *ObjectMetaApplyConfiguration) WithGeneration(value int64) *ObjectMetaAp // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *ObjectMetaApplyConfiguration) WithCreationTimestamp(value v1.Time) *ObjectMetaApplyConfiguration { +func (b *ObjectMetaApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ObjectMetaApplyConfiguration { b.CreationTimestamp = &value return b } @@ -106,7 +106,7 @@ func (b *ObjectMetaApplyConfiguration) WithCreationTimestamp(value v1.Time) *Obj // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *ObjectMetaApplyConfiguration) WithDeletionTimestamp(value v1.Time) *ObjectMetaApplyConfiguration { +func (b *ObjectMetaApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ObjectMetaApplyConfiguration { b.DeletionTimestamp = &value return b } diff --git a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspace.go b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspace.go index b0c5231c603..e1ba91eb292 100644 --- a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspace.go +++ b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspace.go @@ -48,7 +48,7 @@ func Workspace(name string) *WorkspaceApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithKind(value string) *WorkspaceApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *WorkspaceApplyConfiguration) WithKind(value string) *WorkspaceApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithAPIVersion(value string) *WorkspaceApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *WorkspaceApplyConfiguration) WithAPIVersion(value string) *WorkspaceApp // If called multiple times, the Name field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithName(value string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *WorkspaceApplyConfiguration) WithName(value string) *WorkspaceApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithGenerateName(value string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *WorkspaceApplyConfiguration) WithGenerateName(value string) *WorkspaceA // If called multiple times, the Namespace field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithNamespace(value string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *WorkspaceApplyConfiguration) WithNamespace(value string) *WorkspaceAppl // If called multiple times, the UID field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithUID(value types.UID) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *WorkspaceApplyConfiguration) WithUID(value types.UID) *WorkspaceApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithResourceVersion(value string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *WorkspaceApplyConfiguration) WithResourceVersion(value string) *Workspa // If called multiple times, the Generation field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithGeneration(value int64) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *WorkspaceApplyConfiguration) WithGeneration(value int64) *WorkspaceAppl // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithCreationTimestamp(value metav1.Time) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *WorkspaceApplyConfiguration) WithCreationTimestamp(value metav1.Time) * // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *WorkspaceApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *WorkspaceApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *WorkspaceApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *WorkspaceApplyConfiguration) WithLabels(entries map[string]string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *WorkspaceApplyConfiguration) WithLabels(entries map[string]string) *Wor // overwriting an existing map entries in Annotations field with the same key. func (b *WorkspaceApplyConfiguration) WithAnnotations(entries map[string]string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *WorkspaceApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *WorkspaceApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *WorkspaceApplyConfiguration) WithFinalizers(values ...string) *WorkspaceApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *WorkspaceApplyConfiguration) WithStatus(value *WorkspaceStatusApplyConf // GetName retrieves the value of the Name field in the declarative configuration. func (b *WorkspaceApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacestatus.go b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacestatus.go index 48f31eddddc..8d4bc898bcd 100644 --- a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacestatus.go +++ b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacestatus.go @@ -19,16 +19,16 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/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" ) // WorkspaceStatusApplyConfiguration represents a declarative configuration of the WorkspaceStatus type for use // with apply. type WorkspaceStatusApplyConfiguration struct { - Phase *v1alpha1.LogicalClusterPhaseType `json:"phase,omitempty"` - Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` - Initializers []v1alpha1.LogicalClusterInitializer `json:"initializers,omitempty"` + Phase *corev1alpha1.LogicalClusterPhaseType `json:"phase,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` + Initializers []corev1alpha1.LogicalClusterInitializer `json:"initializers,omitempty"` } // WorkspaceStatusApplyConfiguration constructs a declarative configuration of the WorkspaceStatus type for use with @@ -40,7 +40,7 @@ func WorkspaceStatus() *WorkspaceStatusApplyConfiguration { // WithPhase sets the Phase field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Phase field is set to the value of the last call. -func (b *WorkspaceStatusApplyConfiguration) WithPhase(value v1alpha1.LogicalClusterPhaseType) *WorkspaceStatusApplyConfiguration { +func (b *WorkspaceStatusApplyConfiguration) WithPhase(value corev1alpha1.LogicalClusterPhaseType) *WorkspaceStatusApplyConfiguration { b.Phase = &value return b } @@ -56,7 +56,7 @@ func (b *WorkspaceStatusApplyConfiguration) WithConditions(value conditionsv1alp // WithInitializers adds the given value to the Initializers field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Initializers field. -func (b *WorkspaceStatusApplyConfiguration) WithInitializers(values ...v1alpha1.LogicalClusterInitializer) *WorkspaceStatusApplyConfiguration { +func (b *WorkspaceStatusApplyConfiguration) WithInitializers(values ...corev1alpha1.LogicalClusterInitializer) *WorkspaceStatusApplyConfiguration { for i := range values { b.Initializers = append(b.Initializers, values[i]) } diff --git a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetype.go b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetype.go index 6ccfff2dbba..94fbc50ee55 100644 --- a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetype.go @@ -48,7 +48,7 @@ func WorkspaceType(name string) *WorkspaceTypeApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithKind(value string) *WorkspaceTypeApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithKind(value string) *WorkspaceTypeA // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithAPIVersion(value string) *WorkspaceTypeApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithAPIVersion(value string) *Workspac // If called multiple times, the Name field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithName(value string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithName(value string) *WorkspaceTypeA // If called multiple times, the GenerateName field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithGenerateName(value string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithGenerateName(value string) *Worksp // If called multiple times, the Namespace field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithNamespace(value string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithNamespace(value string) *Workspace // If called multiple times, the UID field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithUID(value types.UID) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithUID(value types.UID) *WorkspaceTyp // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithResourceVersion(value string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithResourceVersion(value string) *Wor // If called multiple times, the Generation field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithGeneration(value int64) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithGeneration(value int64) *Workspace // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithCreationTimestamp(value metav1.Time) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithCreationTimestamp(value metav1.Tim // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithDeletionTimestamp(value metav1.Tim // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *WorkspaceTypeApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *WorkspaceTypeApplyConfiguration) WithDeletionGracePeriodSeconds(value i // overwriting an existing map entries in Labels field with the same key. func (b *WorkspaceTypeApplyConfiguration) WithLabels(entries map[string]string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *WorkspaceTypeApplyConfiguration) WithLabels(entries map[string]string) // overwriting an existing map entries in Annotations field with the same key. func (b *WorkspaceTypeApplyConfiguration) WithAnnotations(entries map[string]string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithOwnerReferences(values ...*v1.Owne if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *WorkspaceTypeApplyConfiguration) WithOwnerReferences(values ...*v1.Owne func (b *WorkspaceTypeApplyConfiguration) WithFinalizers(values ...string) *WorkspaceTypeApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *WorkspaceTypeApplyConfiguration) WithStatus(value *WorkspaceTypeStatusA // GetName retrieves the value of the Name field in the declarative configuration. func (b *WorkspaceTypeApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypereference.go b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypereference.go index e9e9389edae..46aee09b49f 100644 --- a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypereference.go +++ b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypereference.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" ) // WorkspaceTypeReferenceApplyConfiguration represents a declarative configuration of the WorkspaceTypeReference type for use // with apply. type WorkspaceTypeReferenceApplyConfiguration struct { - Name *v1alpha1.WorkspaceTypeName `json:"name,omitempty"` - Path *string `json:"path,omitempty"` + Name *tenancyv1alpha1.WorkspaceTypeName `json:"name,omitempty"` + Path *string `json:"path,omitempty"` } // WorkspaceTypeReferenceApplyConfiguration constructs a declarative configuration of the WorkspaceTypeReference type for use with @@ -38,7 +38,7 @@ func WorkspaceTypeReference() *WorkspaceTypeReferenceApplyConfiguration { // WithName sets the Name field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Name field is set to the value of the last call. -func (b *WorkspaceTypeReferenceApplyConfiguration) WithName(value v1alpha1.WorkspaceTypeName) *WorkspaceTypeReferenceApplyConfiguration { +func (b *WorkspaceTypeReferenceApplyConfiguration) WithName(value tenancyv1alpha1.WorkspaceTypeName) *WorkspaceTypeReferenceApplyConfiguration { b.Name = &value return b } diff --git a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypestatus.go b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypestatus.go index 4a1027fba39..37b145dcc18 100644 --- a/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypestatus.go +++ b/sdk/client/applyconfiguration/tenancy/v1alpha1/workspacetypestatus.go @@ -19,13 +19,13 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // WorkspaceTypeStatusApplyConfiguration represents a declarative configuration of the WorkspaceTypeStatus type for use // with apply. type WorkspaceTypeStatusApplyConfiguration struct { - Conditions *v1alpha1.Conditions `json:"conditions,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` VirtualWorkspaces []VirtualWorkspaceApplyConfiguration `json:"virtualWorkspaces,omitempty"` } @@ -38,7 +38,7 @@ func WorkspaceTypeStatus() *WorkspaceTypeStatusApplyConfiguration { // WithConditions sets the Conditions field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Conditions field is set to the value of the last call. -func (b *WorkspaceTypeStatusApplyConfiguration) WithConditions(value v1alpha1.Conditions) *WorkspaceTypeStatusApplyConfiguration { +func (b *WorkspaceTypeStatusApplyConfiguration) WithConditions(value conditionsv1alpha1.Conditions) *WorkspaceTypeStatusApplyConfiguration { b.Conditions = &value return b } diff --git a/sdk/client/applyconfiguration/topology/v1alpha1/partition.go b/sdk/client/applyconfiguration/topology/v1alpha1/partition.go index 360a670b09a..e150f9fff73 100644 --- a/sdk/client/applyconfiguration/topology/v1alpha1/partition.go +++ b/sdk/client/applyconfiguration/topology/v1alpha1/partition.go @@ -47,7 +47,7 @@ func Partition(name string) *PartitionApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithKind(value string) *PartitionApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -55,7 +55,7 @@ func (b *PartitionApplyConfiguration) WithKind(value string) *PartitionApplyConf // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithAPIVersion(value string) *PartitionApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -64,7 +64,7 @@ func (b *PartitionApplyConfiguration) WithAPIVersion(value string) *PartitionApp // If called multiple times, the Name field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithName(value string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -73,7 +73,7 @@ func (b *PartitionApplyConfiguration) WithName(value string) *PartitionApplyConf // If called multiple times, the GenerateName field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithGenerateName(value string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -82,7 +82,7 @@ func (b *PartitionApplyConfiguration) WithGenerateName(value string) *PartitionA // If called multiple times, the Namespace field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithNamespace(value string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -91,7 +91,7 @@ func (b *PartitionApplyConfiguration) WithNamespace(value string) *PartitionAppl // If called multiple times, the UID field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithUID(value types.UID) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -100,7 +100,7 @@ func (b *PartitionApplyConfiguration) WithUID(value types.UID) *PartitionApplyCo // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithResourceVersion(value string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -109,7 +109,7 @@ func (b *PartitionApplyConfiguration) WithResourceVersion(value string) *Partiti // If called multiple times, the Generation field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithGeneration(value int64) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -118,7 +118,7 @@ func (b *PartitionApplyConfiguration) WithGeneration(value int64) *PartitionAppl // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithCreationTimestamp(value metav1.Time) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -127,7 +127,7 @@ func (b *PartitionApplyConfiguration) WithCreationTimestamp(value metav1.Time) * // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -136,7 +136,7 @@ func (b *PartitionApplyConfiguration) WithDeletionTimestamp(value metav1.Time) * // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *PartitionApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -146,11 +146,11 @@ func (b *PartitionApplyConfiguration) WithDeletionGracePeriodSeconds(value int64 // overwriting an existing map entries in Labels field with the same key. func (b *PartitionApplyConfiguration) WithLabels(entries map[string]string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -161,11 +161,11 @@ func (b *PartitionApplyConfiguration) WithLabels(entries map[string]string) *Par // overwriting an existing map entries in Annotations field with the same key. func (b *PartitionApplyConfiguration) WithAnnotations(entries map[string]string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -179,7 +179,7 @@ func (b *PartitionApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -190,7 +190,7 @@ func (b *PartitionApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRef func (b *PartitionApplyConfiguration) WithFinalizers(values ...string) *PartitionApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -212,5 +212,5 @@ func (b *PartitionApplyConfiguration) WithSpec(value *PartitionSpecApplyConfigur // GetName retrieves the value of the Name field in the declarative configuration. func (b *PartitionApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/topology/v1alpha1/partitionset.go b/sdk/client/applyconfiguration/topology/v1alpha1/partitionset.go index 314609a69c3..524a09e6836 100644 --- a/sdk/client/applyconfiguration/topology/v1alpha1/partitionset.go +++ b/sdk/client/applyconfiguration/topology/v1alpha1/partitionset.go @@ -48,7 +48,7 @@ func PartitionSet(name string) *PartitionSetApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithKind(value string) *PartitionSetApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *PartitionSetApplyConfiguration) WithKind(value string) *PartitionSetApp // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithAPIVersion(value string) *PartitionSetApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *PartitionSetApplyConfiguration) WithAPIVersion(value string) *Partition // If called multiple times, the Name field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithName(value string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *PartitionSetApplyConfiguration) WithName(value string) *PartitionSetApp // If called multiple times, the GenerateName field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithGenerateName(value string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *PartitionSetApplyConfiguration) WithGenerateName(value string) *Partiti // If called multiple times, the Namespace field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithNamespace(value string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *PartitionSetApplyConfiguration) WithNamespace(value string) *PartitionS // If called multiple times, the UID field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithUID(value types.UID) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *PartitionSetApplyConfiguration) WithUID(value types.UID) *PartitionSetA // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithResourceVersion(value string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *PartitionSetApplyConfiguration) WithResourceVersion(value string) *Part // If called multiple times, the Generation field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithGeneration(value int64) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *PartitionSetApplyConfiguration) WithGeneration(value int64) *PartitionS // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithCreationTimestamp(value metav1.Time) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *PartitionSetApplyConfiguration) WithCreationTimestamp(value metav1.Time // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *PartitionSetApplyConfiguration) WithDeletionTimestamp(value metav1.Time // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *PartitionSetApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *PartitionSetApplyConfiguration) WithDeletionGracePeriodSeconds(value in // overwriting an existing map entries in Labels field with the same key. func (b *PartitionSetApplyConfiguration) WithLabels(entries map[string]string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *PartitionSetApplyConfiguration) WithLabels(entries map[string]string) * // overwriting an existing map entries in Annotations field with the same key. func (b *PartitionSetApplyConfiguration) WithAnnotations(entries map[string]string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *PartitionSetApplyConfiguration) WithOwnerReferences(values ...*v1.Owner if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *PartitionSetApplyConfiguration) WithOwnerReferences(values ...*v1.Owner func (b *PartitionSetApplyConfiguration) WithFinalizers(values ...string) *PartitionSetApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *PartitionSetApplyConfiguration) WithStatus(value *PartitionSetStatusApp // GetName retrieves the value of the Name field in the declarative configuration. func (b *PartitionSetApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/sdk/client/applyconfiguration/topology/v1alpha1/partitionsetstatus.go b/sdk/client/applyconfiguration/topology/v1alpha1/partitionsetstatus.go index a2cd8a1a592..7a6a578724f 100644 --- a/sdk/client/applyconfiguration/topology/v1alpha1/partitionsetstatus.go +++ b/sdk/client/applyconfiguration/topology/v1alpha1/partitionsetstatus.go @@ -19,14 +19,14 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/third_party/conditions/apis/conditions/v1alpha1" ) // PartitionSetStatusApplyConfiguration represents a declarative configuration of the PartitionSetStatus type for use // with apply. type PartitionSetStatusApplyConfiguration struct { - Count *uint `json:"count,omitempty"` - Conditions *v1alpha1.Conditions `json:"conditions,omitempty"` + Count *uint `json:"count,omitempty"` + Conditions *conditionsv1alpha1.Conditions `json:"conditions,omitempty"` } // PartitionSetStatusApplyConfiguration constructs a declarative configuration of the PartitionSetStatus type for use with @@ -46,7 +46,7 @@ func (b *PartitionSetStatusApplyConfiguration) WithCount(value uint) *PartitionS // WithConditions sets the Conditions field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Conditions field is set to the value of the last call. -func (b *PartitionSetStatusApplyConfiguration) WithConditions(value v1alpha1.Conditions) *PartitionSetStatusApplyConfiguration { +func (b *PartitionSetStatusApplyConfiguration) WithConditions(value conditionsv1alpha1.Conditions) *PartitionSetStatusApplyConfiguration { b.Conditions = &value return b } diff --git a/sdk/client/clientset/versioned/clientset.go b/sdk/client/clientset/versioned/clientset.go index 741803847df..7b56efd36c7 100644 --- a/sdk/client/clientset/versioned/clientset.go +++ b/sdk/client/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" diff --git a/sdk/client/clientset/versioned/cluster/clientset.go b/sdk/client/clientset/versioned/cluster/clientset.go index 38e474b2806..6381512c6cd 100644 --- a/sdk/client/clientset/versioned/cluster/clientset.go +++ b/sdk/client/clientset/versioned/cluster/clientset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/clientset/versioned/cluster/fake/clientset.go b/sdk/client/clientset/versioned/cluster/fake/clientset.go index a58a729f642..715fa414242 100644 --- a/sdk/client/clientset/versioned/cluster/fake/clientset.go +++ b/sdk/client/clientset/versioned/cluster/fake/clientset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/clientset/versioned/cluster/scheme/register.go b/sdk/client/clientset/versioned/cluster/scheme/register.go index 5f5aee24575..c86f0fae328 100644 --- a/sdk/client/clientset/versioned/cluster/scheme/register.go +++ b/sdk/client/clientset/versioned/cluster/scheme/register.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 9038b4a427c..18fc479d3a9 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apibinding.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apibinding.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 322e066cdab..0f6ea117e27 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiconversion.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiconversion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 f9d8abed76a..2761062c34f 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexport.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexport.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 40092cf4577..6eb8e017efa 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiexportendpointslice.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 6a2520f9953..d08b863e9ac 100644 --- a/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/clientset/versioned/cluster/typed/apis/v1alpha1/apiresourceschema.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 68cd13a0096..cc67be89662 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 1989a31aa6c..cbbc31483e7 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 972db61520a..a143f39e7c2 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 e6ae6aa9afe..f910fd1ebdc 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 dd35fbe6e64..9b9b9dfe6a7 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 f2b504a20e6..13822a1ef99 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 31db28c5f71..a31d2914ab0 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 32283dc620c..0d213577aa2 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 19bc5757f3e..7518bb035fa 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 92b680a0341..b4574b07d4c 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 d69df210523..f5baf2e92b1 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 83bc6427421..768de712a2c 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/logicalcluster.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/logicalcluster.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 7fbdfd11e65..b2169ce65f5 100644 --- a/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/shard.go +++ b/sdk/client/clientset/versioned/cluster/typed/core/v1alpha1/shard.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 0af1f5e7c64..7c7652b03af 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 6dffae0c05e..c96d6516df0 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 8d47940eb1b..5eb4c1d90f5 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 a67b3e1212b..a7f7f527d36 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 2955316538f..00b1a9d228f 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspace.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspace.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 80cf7750a43..48228acb928 100644 --- a/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/clientset/versioned/cluster/typed/tenancy/v1alpha1/workspacetype.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 2831638ec8a..c019c0bc8c9 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 0bbdcb69eb5..aa52dd7cfd4 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 f47795f076c..1a361a47887 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 6a24ddd4584..d86325be202 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partition.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partition.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 62646ee8257..1712899e457 100644 --- a/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partitionset.go +++ b/sdk/client/clientset/versioned/cluster/typed/topology/v1alpha1/partitionset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. 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 039b74add8f..9e4e6e16866 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 @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go index fa21ba77b37..507b6a34bd2 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apibinding.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + applyconfigurationapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type APIBindingsGetter interface { // APIBindingInterface has methods to work with APIBinding resources. type APIBindingInterface interface { - Create(ctx context.Context, aPIBinding *v1alpha1.APIBinding, opts v1.CreateOptions) (*v1alpha1.APIBinding, error) - Update(ctx context.Context, aPIBinding *v1alpha1.APIBinding, opts v1.UpdateOptions) (*v1alpha1.APIBinding, error) + Create(ctx context.Context, aPIBinding *apisv1alpha1.APIBinding, opts v1.CreateOptions) (*apisv1alpha1.APIBinding, error) + Update(ctx context.Context, aPIBinding *apisv1alpha1.APIBinding, opts v1.UpdateOptions) (*apisv1alpha1.APIBinding, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, aPIBinding *v1alpha1.APIBinding, opts v1.UpdateOptions) (*v1alpha1.APIBinding, error) + UpdateStatus(ctx context.Context, aPIBinding *apisv1alpha1.APIBinding, opts v1.UpdateOptions) (*apisv1alpha1.APIBinding, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.APIBinding, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.APIBindingList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha1.APIBinding, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha1.APIBindingList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIBinding, err error) - Apply(ctx context.Context, aPIBinding *apisv1alpha1.APIBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIBinding, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha1.APIBinding, err error) + Apply(ctx context.Context, aPIBinding *applyconfigurationapisv1alpha1.APIBindingApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIBinding, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, aPIBinding *apisv1alpha1.APIBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIBinding, err error) + ApplyStatus(ctx context.Context, aPIBinding *applyconfigurationapisv1alpha1.APIBindingApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIBinding, err error) APIBindingExpansion } // aPIBindings implements APIBindingInterface type aPIBindings struct { - *gentype.ClientWithListAndApply[*v1alpha1.APIBinding, *v1alpha1.APIBindingList, *apisv1alpha1.APIBindingApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha1.APIBinding, *apisv1alpha1.APIBindingList, *applyconfigurationapisv1alpha1.APIBindingApplyConfiguration] } // newAPIBindings returns a APIBindings func newAPIBindings(c *ApisV1alpha1Client) *aPIBindings { return &aPIBindings{ - gentype.NewClientWithListAndApply[*v1alpha1.APIBinding, *v1alpha1.APIBindingList, *apisv1alpha1.APIBindingApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha1.APIBinding, *apisv1alpha1.APIBindingList, *applyconfigurationapisv1alpha1.APIBindingApplyConfiguration]( "apibindings", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.APIBinding { return &v1alpha1.APIBinding{} }, - func() *v1alpha1.APIBindingList { return &v1alpha1.APIBindingList{} }), + func() *apisv1alpha1.APIBinding { return &apisv1alpha1.APIBinding{} }, + func() *apisv1alpha1.APIBindingList { return &apisv1alpha1.APIBindingList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go index 78c1c4b9f80..dda122d5493 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiconversion.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + applyconfigurationapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,32 +39,33 @@ type APIConversionsGetter interface { // APIConversionInterface has methods to work with APIConversion resources. type APIConversionInterface interface { - Create(ctx context.Context, aPIConversion *v1alpha1.APIConversion, opts v1.CreateOptions) (*v1alpha1.APIConversion, error) - Update(ctx context.Context, aPIConversion *v1alpha1.APIConversion, opts v1.UpdateOptions) (*v1alpha1.APIConversion, error) + Create(ctx context.Context, aPIConversion *apisv1alpha1.APIConversion, opts v1.CreateOptions) (*apisv1alpha1.APIConversion, error) + Update(ctx context.Context, aPIConversion *apisv1alpha1.APIConversion, opts v1.UpdateOptions) (*apisv1alpha1.APIConversion, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.APIConversion, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.APIConversionList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha1.APIConversion, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha1.APIConversionList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIConversion, err error) - Apply(ctx context.Context, aPIConversion *apisv1alpha1.APIConversionApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIConversion, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha1.APIConversion, err error) + Apply(ctx context.Context, aPIConversion *applyconfigurationapisv1alpha1.APIConversionApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIConversion, err error) APIConversionExpansion } // aPIConversions implements APIConversionInterface type aPIConversions struct { - *gentype.ClientWithListAndApply[*v1alpha1.APIConversion, *v1alpha1.APIConversionList, *apisv1alpha1.APIConversionApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha1.APIConversion, *apisv1alpha1.APIConversionList, *applyconfigurationapisv1alpha1.APIConversionApplyConfiguration] } // newAPIConversions returns a APIConversions func newAPIConversions(c *ApisV1alpha1Client) *aPIConversions { return &aPIConversions{ - gentype.NewClientWithListAndApply[*v1alpha1.APIConversion, *v1alpha1.APIConversionList, *apisv1alpha1.APIConversionApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha1.APIConversion, *apisv1alpha1.APIConversionList, *applyconfigurationapisv1alpha1.APIConversionApplyConfiguration]( "apiconversions", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.APIConversion { return &v1alpha1.APIConversion{} }, - func() *v1alpha1.APIConversionList { return &v1alpha1.APIConversionList{} }), + func() *apisv1alpha1.APIConversion { return &apisv1alpha1.APIConversion{} }, + func() *apisv1alpha1.APIConversionList { return &apisv1alpha1.APIConversionList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go index 5cbdeceaf54..ec58f8e4259 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexport.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + applyconfigurationapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type APIExportsGetter interface { // APIExportInterface has methods to work with APIExport resources. type APIExportInterface interface { - Create(ctx context.Context, aPIExport *v1alpha1.APIExport, opts v1.CreateOptions) (*v1alpha1.APIExport, error) - Update(ctx context.Context, aPIExport *v1alpha1.APIExport, opts v1.UpdateOptions) (*v1alpha1.APIExport, error) + Create(ctx context.Context, aPIExport *apisv1alpha1.APIExport, opts v1.CreateOptions) (*apisv1alpha1.APIExport, error) + Update(ctx context.Context, aPIExport *apisv1alpha1.APIExport, opts v1.UpdateOptions) (*apisv1alpha1.APIExport, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, aPIExport *v1alpha1.APIExport, opts v1.UpdateOptions) (*v1alpha1.APIExport, error) + UpdateStatus(ctx context.Context, aPIExport *apisv1alpha1.APIExport, opts v1.UpdateOptions) (*apisv1alpha1.APIExport, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.APIExport, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.APIExportList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha1.APIExport, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha1.APIExportList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIExport, err error) - Apply(ctx context.Context, aPIExport *apisv1alpha1.APIExportApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExport, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha1.APIExport, err error) + Apply(ctx context.Context, aPIExport *applyconfigurationapisv1alpha1.APIExportApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIExport, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, aPIExport *apisv1alpha1.APIExportApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExport, err error) + ApplyStatus(ctx context.Context, aPIExport *applyconfigurationapisv1alpha1.APIExportApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIExport, err error) APIExportExpansion } // aPIExports implements APIExportInterface type aPIExports struct { - *gentype.ClientWithListAndApply[*v1alpha1.APIExport, *v1alpha1.APIExportList, *apisv1alpha1.APIExportApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha1.APIExport, *apisv1alpha1.APIExportList, *applyconfigurationapisv1alpha1.APIExportApplyConfiguration] } // newAPIExports returns a APIExports func newAPIExports(c *ApisV1alpha1Client) *aPIExports { return &aPIExports{ - gentype.NewClientWithListAndApply[*v1alpha1.APIExport, *v1alpha1.APIExportList, *apisv1alpha1.APIExportApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha1.APIExport, *apisv1alpha1.APIExportList, *applyconfigurationapisv1alpha1.APIExportApplyConfiguration]( "apiexports", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.APIExport { return &v1alpha1.APIExport{} }, - func() *v1alpha1.APIExportList { return &v1alpha1.APIExportList{} }), + func() *apisv1alpha1.APIExport { return &apisv1alpha1.APIExport{} }, + func() *apisv1alpha1.APIExportList { return &apisv1alpha1.APIExportList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go index 490d234436b..cba4f671eba 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiexportendpointslice.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + applyconfigurationapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type APIExportEndpointSlicesGetter interface { // APIExportEndpointSliceInterface has methods to work with APIExportEndpointSlice resources. type APIExportEndpointSliceInterface interface { - Create(ctx context.Context, aPIExportEndpointSlice *v1alpha1.APIExportEndpointSlice, opts v1.CreateOptions) (*v1alpha1.APIExportEndpointSlice, error) - Update(ctx context.Context, aPIExportEndpointSlice *v1alpha1.APIExportEndpointSlice, opts v1.UpdateOptions) (*v1alpha1.APIExportEndpointSlice, error) + Create(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSlice, opts v1.CreateOptions) (*apisv1alpha1.APIExportEndpointSlice, error) + Update(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSlice, opts v1.UpdateOptions) (*apisv1alpha1.APIExportEndpointSlice, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, aPIExportEndpointSlice *v1alpha1.APIExportEndpointSlice, opts v1.UpdateOptions) (*v1alpha1.APIExportEndpointSlice, error) + UpdateStatus(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSlice, opts v1.UpdateOptions) (*apisv1alpha1.APIExportEndpointSlice, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.APIExportEndpointSlice, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.APIExportEndpointSliceList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha1.APIExportEndpointSlice, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha1.APIExportEndpointSliceList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIExportEndpointSlice, err error) - Apply(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSliceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExportEndpointSlice, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha1.APIExportEndpointSlice, err error) + Apply(ctx context.Context, aPIExportEndpointSlice *applyconfigurationapisv1alpha1.APIExportEndpointSliceApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIExportEndpointSlice, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSliceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExportEndpointSlice, err error) + ApplyStatus(ctx context.Context, aPIExportEndpointSlice *applyconfigurationapisv1alpha1.APIExportEndpointSliceApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIExportEndpointSlice, err error) APIExportEndpointSliceExpansion } // aPIExportEndpointSlices implements APIExportEndpointSliceInterface type aPIExportEndpointSlices struct { - *gentype.ClientWithListAndApply[*v1alpha1.APIExportEndpointSlice, *v1alpha1.APIExportEndpointSliceList, *apisv1alpha1.APIExportEndpointSliceApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha1.APIExportEndpointSlice, *apisv1alpha1.APIExportEndpointSliceList, *applyconfigurationapisv1alpha1.APIExportEndpointSliceApplyConfiguration] } // newAPIExportEndpointSlices returns a APIExportEndpointSlices func newAPIExportEndpointSlices(c *ApisV1alpha1Client) *aPIExportEndpointSlices { return &aPIExportEndpointSlices{ - gentype.NewClientWithListAndApply[*v1alpha1.APIExportEndpointSlice, *v1alpha1.APIExportEndpointSliceList, *apisv1alpha1.APIExportEndpointSliceApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha1.APIExportEndpointSlice, *apisv1alpha1.APIExportEndpointSliceList, *applyconfigurationapisv1alpha1.APIExportEndpointSliceApplyConfiguration]( "apiexportendpointslices", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.APIExportEndpointSlice { return &v1alpha1.APIExportEndpointSlice{} }, - func() *v1alpha1.APIExportEndpointSliceList { return &v1alpha1.APIExportEndpointSliceList{} }), + func() *apisv1alpha1.APIExportEndpointSlice { return &apisv1alpha1.APIExportEndpointSlice{} }, + func() *apisv1alpha1.APIExportEndpointSliceList { return &apisv1alpha1.APIExportEndpointSliceList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go index 1acc79f610e..542178696ae 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apiresourceschema.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" - apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + applyconfigurationapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,32 +39,33 @@ type APIResourceSchemasGetter interface { // APIResourceSchemaInterface has methods to work with APIResourceSchema resources. type APIResourceSchemaInterface interface { - Create(ctx context.Context, aPIResourceSchema *v1alpha1.APIResourceSchema, opts v1.CreateOptions) (*v1alpha1.APIResourceSchema, error) - Update(ctx context.Context, aPIResourceSchema *v1alpha1.APIResourceSchema, opts v1.UpdateOptions) (*v1alpha1.APIResourceSchema, error) + Create(ctx context.Context, aPIResourceSchema *apisv1alpha1.APIResourceSchema, opts v1.CreateOptions) (*apisv1alpha1.APIResourceSchema, error) + Update(ctx context.Context, aPIResourceSchema *apisv1alpha1.APIResourceSchema, opts v1.UpdateOptions) (*apisv1alpha1.APIResourceSchema, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.APIResourceSchema, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.APIResourceSchemaList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*apisv1alpha1.APIResourceSchema, error) + List(ctx context.Context, opts v1.ListOptions) (*apisv1alpha1.APIResourceSchemaList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIResourceSchema, err error) - Apply(ctx context.Context, aPIResourceSchema *apisv1alpha1.APIResourceSchemaApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIResourceSchema, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *apisv1alpha1.APIResourceSchema, err error) + Apply(ctx context.Context, aPIResourceSchema *applyconfigurationapisv1alpha1.APIResourceSchemaApplyConfiguration, opts v1.ApplyOptions) (result *apisv1alpha1.APIResourceSchema, err error) APIResourceSchemaExpansion } // aPIResourceSchemas implements APIResourceSchemaInterface type aPIResourceSchemas struct { - *gentype.ClientWithListAndApply[*v1alpha1.APIResourceSchema, *v1alpha1.APIResourceSchemaList, *apisv1alpha1.APIResourceSchemaApplyConfiguration] + *gentype.ClientWithListAndApply[*apisv1alpha1.APIResourceSchema, *apisv1alpha1.APIResourceSchemaList, *applyconfigurationapisv1alpha1.APIResourceSchemaApplyConfiguration] } // newAPIResourceSchemas returns a APIResourceSchemas func newAPIResourceSchemas(c *ApisV1alpha1Client) *aPIResourceSchemas { return &aPIResourceSchemas{ - gentype.NewClientWithListAndApply[*v1alpha1.APIResourceSchema, *v1alpha1.APIResourceSchemaList, *apisv1alpha1.APIResourceSchemaApplyConfiguration]( + gentype.NewClientWithListAndApply[*apisv1alpha1.APIResourceSchema, *apisv1alpha1.APIResourceSchemaList, *applyconfigurationapisv1alpha1.APIResourceSchemaApplyConfiguration]( "apiresourceschemas", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.APIResourceSchema { return &v1alpha1.APIResourceSchema{} }, - func() *v1alpha1.APIResourceSchemaList { return &v1alpha1.APIResourceSchemaList{} }), + func() *apisv1alpha1.APIResourceSchema { return &apisv1alpha1.APIResourceSchema{} }, + func() *apisv1alpha1.APIResourceSchemaList { return &apisv1alpha1.APIResourceSchemaList{} }, + ), } } 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 b47d204f681..f21fe4e1c20 100644 --- a/sdk/client/clientset/versioned/typed/apis/v1alpha1/apis_client.go +++ b/sdk/client/clientset/versioned/typed/apis/v1alpha1/apis_client.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" - "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" + apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type ApisV1alpha1Interface interface { @@ -106,10 +106,10 @@ func New(c rest.Interface) *ApisV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := apisv1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apibinding.go b/sdk/client/clientset/versioned/typed/apis/v1alpha1/fake/fake_apibinding.go index 8ab2eac3c16..bc9f7e14a90 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 @@ -19,169 +19,34 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + typedapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) -// FakeAPIBindings implements APIBindingInterface -type FakeAPIBindings struct { +// fakeAPIBindings implements APIBindingInterface +type fakeAPIBindings struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.APIBinding, *v1alpha1.APIBindingList, *apisv1alpha1.APIBindingApplyConfiguration] Fake *FakeApisV1alpha1 } -var apibindingsResource = v1alpha1.SchemeGroupVersion.WithResource("apibindings") - -var apibindingsKind = v1alpha1.SchemeGroupVersion.WithKind("APIBinding") - -// Get takes name of the aPIBinding, and returns the corresponding aPIBinding object, and an error if there is any. -func (c *FakeAPIBindings) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.APIBinding, err error) { - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(apibindingsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIBinding), err -} - -// List takes label and field selectors, and returns the list of APIBindings that match those selectors. -func (c *FakeAPIBindings) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.APIBindingList, err error) { - emptyResult := &v1alpha1.APIBindingList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(apibindingsResource, apibindingsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.APIBindingList{ListMeta: obj.(*v1alpha1.APIBindingList).ListMeta} - for _, item := range obj.(*v1alpha1.APIBindingList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested aPIBindings. -func (c *FakeAPIBindings) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(apibindingsResource, opts)) -} - -// Create takes the representation of a aPIBinding and creates it. Returns the server's representation of the aPIBinding, and an error, if there is any. -func (c *FakeAPIBindings) Create(ctx context.Context, aPIBinding *v1alpha1.APIBinding, opts v1.CreateOptions) (result *v1alpha1.APIBinding, err error) { - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(apibindingsResource, aPIBinding, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIBinding), err -} - -// Update takes the representation of a aPIBinding and updates it. Returns the server's representation of the aPIBinding, and an error, if there is any. -func (c *FakeAPIBindings) Update(ctx context.Context, aPIBinding *v1alpha1.APIBinding, opts v1.UpdateOptions) (result *v1alpha1.APIBinding, err error) { - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(apibindingsResource, aPIBinding, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIBinding), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeAPIBindings) UpdateStatus(ctx context.Context, aPIBinding *v1alpha1.APIBinding, opts v1.UpdateOptions) (result *v1alpha1.APIBinding, err error) { - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(apibindingsResource, "status", aPIBinding, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIBinding), err -} - -// Delete takes name of the aPIBinding and deletes it. Returns an error if one occurs. -func (c *FakeAPIBindings) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(apibindingsResource, name, opts), &v1alpha1.APIBinding{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeAPIBindings) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(apibindingsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.APIBindingList{}) - return err -} - -// Patch applies the patch and returns the patched aPIBinding. -func (c *FakeAPIBindings) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIBinding, err error) { - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apibindingsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIBinding), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied aPIBinding. -func (c *FakeAPIBindings) Apply(ctx context.Context, aPIBinding *apisv1alpha1.APIBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIBinding, err error) { - if aPIBinding == nil { - return nil, fmt.Errorf("aPIBinding provided to Apply must not be nil") - } - data, err := json.Marshal(aPIBinding) - if err != nil { - return nil, err - } - name := aPIBinding.Name - if name == nil { - return nil, fmt.Errorf("aPIBinding.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apibindingsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIBinding), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeAPIBindings) ApplyStatus(ctx context.Context, aPIBinding *apisv1alpha1.APIBindingApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIBinding, err error) { - if aPIBinding == nil { - return nil, fmt.Errorf("aPIBinding provided to Apply must not be nil") - } - data, err := json.Marshal(aPIBinding) - if err != nil { - return nil, err - } - name := aPIBinding.Name - if name == nil { - return nil, fmt.Errorf("aPIBinding.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIBinding{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apibindingsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeAPIBindings(fake *FakeApisV1alpha1) typedapisv1alpha1.APIBindingInterface { + return &fakeAPIBindings{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.APIBinding, *v1alpha1.APIBindingList, *apisv1alpha1.APIBindingApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("apibindings"), + v1alpha1.SchemeGroupVersion.WithKind("APIBinding"), + func() *v1alpha1.APIBinding { return &v1alpha1.APIBinding{} }, + func() *v1alpha1.APIBindingList { return &v1alpha1.APIBindingList{} }, + func(dst, src *v1alpha1.APIBindingList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.APIBindingList) []*v1alpha1.APIBinding { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.APIBindingList, items []*v1alpha1.APIBinding) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.APIBinding), err } 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 91006c59863..18c55524db0 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 @@ -19,134 +19,36 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + typedapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) -// FakeAPIConversions implements APIConversionInterface -type FakeAPIConversions struct { +// fakeAPIConversions implements APIConversionInterface +type fakeAPIConversions struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.APIConversion, *v1alpha1.APIConversionList, *apisv1alpha1.APIConversionApplyConfiguration] Fake *FakeApisV1alpha1 } -var apiconversionsResource = v1alpha1.SchemeGroupVersion.WithResource("apiconversions") - -var apiconversionsKind = v1alpha1.SchemeGroupVersion.WithKind("APIConversion") - -// Get takes name of the aPIConversion, and returns the corresponding aPIConversion object, and an error if there is any. -func (c *FakeAPIConversions) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.APIConversion, err error) { - emptyResult := &v1alpha1.APIConversion{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(apiconversionsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIConversion), err -} - -// List takes label and field selectors, and returns the list of APIConversions that match those selectors. -func (c *FakeAPIConversions) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.APIConversionList, err error) { - emptyResult := &v1alpha1.APIConversionList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(apiconversionsResource, apiconversionsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.APIConversionList{ListMeta: obj.(*v1alpha1.APIConversionList).ListMeta} - for _, item := range obj.(*v1alpha1.APIConversionList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested aPIConversions. -func (c *FakeAPIConversions) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(apiconversionsResource, opts)) -} - -// Create takes the representation of a aPIConversion and creates it. Returns the server's representation of the aPIConversion, and an error, if there is any. -func (c *FakeAPIConversions) Create(ctx context.Context, aPIConversion *v1alpha1.APIConversion, opts v1.CreateOptions) (result *v1alpha1.APIConversion, err error) { - emptyResult := &v1alpha1.APIConversion{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(apiconversionsResource, aPIConversion, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIConversion), err -} - -// Update takes the representation of a aPIConversion and updates it. Returns the server's representation of the aPIConversion, and an error, if there is any. -func (c *FakeAPIConversions) Update(ctx context.Context, aPIConversion *v1alpha1.APIConversion, opts v1.UpdateOptions) (result *v1alpha1.APIConversion, err error) { - emptyResult := &v1alpha1.APIConversion{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(apiconversionsResource, aPIConversion, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIConversion), err -} - -// Delete takes name of the aPIConversion and deletes it. Returns an error if one occurs. -func (c *FakeAPIConversions) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(apiconversionsResource, name, opts), &v1alpha1.APIConversion{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeAPIConversions) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(apiconversionsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.APIConversionList{}) - return err -} - -// Patch applies the patch and returns the patched aPIConversion. -func (c *FakeAPIConversions) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIConversion, err error) { - emptyResult := &v1alpha1.APIConversion{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiconversionsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIConversion), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied aPIConversion. -func (c *FakeAPIConversions) Apply(ctx context.Context, aPIConversion *apisv1alpha1.APIConversionApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIConversion, err error) { - if aPIConversion == nil { - return nil, fmt.Errorf("aPIConversion provided to Apply must not be nil") - } - data, err := json.Marshal(aPIConversion) - if err != nil { - return nil, err - } - name := aPIConversion.Name - if name == nil { - return nil, fmt.Errorf("aPIConversion.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIConversion{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiconversionsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeAPIConversions(fake *FakeApisV1alpha1) typedapisv1alpha1.APIConversionInterface { + return &fakeAPIConversions{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.APIConversion, *v1alpha1.APIConversionList, *apisv1alpha1.APIConversionApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("apiconversions"), + v1alpha1.SchemeGroupVersion.WithKind("APIConversion"), + func() *v1alpha1.APIConversion { return &v1alpha1.APIConversion{} }, + func() *v1alpha1.APIConversionList { return &v1alpha1.APIConversionList{} }, + func(dst, src *v1alpha1.APIConversionList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.APIConversionList) []*v1alpha1.APIConversion { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.APIConversionList, items []*v1alpha1.APIConversion) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.APIConversion), err } 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 fbdbf18a7cd..608bcd37b8b 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 @@ -19,169 +19,34 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + typedapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) -// FakeAPIExports implements APIExportInterface -type FakeAPIExports struct { +// fakeAPIExports implements APIExportInterface +type fakeAPIExports struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.APIExport, *v1alpha1.APIExportList, *apisv1alpha1.APIExportApplyConfiguration] Fake *FakeApisV1alpha1 } -var apiexportsResource = v1alpha1.SchemeGroupVersion.WithResource("apiexports") - -var apiexportsKind = v1alpha1.SchemeGroupVersion.WithKind("APIExport") - -// Get takes name of the aPIExport, and returns the corresponding aPIExport object, and an error if there is any. -func (c *FakeAPIExports) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.APIExport, err error) { - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(apiexportsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExport), err -} - -// List takes label and field selectors, and returns the list of APIExports that match those selectors. -func (c *FakeAPIExports) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.APIExportList, err error) { - emptyResult := &v1alpha1.APIExportList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(apiexportsResource, apiexportsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.APIExportList{ListMeta: obj.(*v1alpha1.APIExportList).ListMeta} - for _, item := range obj.(*v1alpha1.APIExportList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested aPIExports. -func (c *FakeAPIExports) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(apiexportsResource, opts)) -} - -// Create takes the representation of a aPIExport and creates it. Returns the server's representation of the aPIExport, and an error, if there is any. -func (c *FakeAPIExports) Create(ctx context.Context, aPIExport *v1alpha1.APIExport, opts v1.CreateOptions) (result *v1alpha1.APIExport, err error) { - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(apiexportsResource, aPIExport, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExport), err -} - -// Update takes the representation of a aPIExport and updates it. Returns the server's representation of the aPIExport, and an error, if there is any. -func (c *FakeAPIExports) Update(ctx context.Context, aPIExport *v1alpha1.APIExport, opts v1.UpdateOptions) (result *v1alpha1.APIExport, err error) { - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(apiexportsResource, aPIExport, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExport), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeAPIExports) UpdateStatus(ctx context.Context, aPIExport *v1alpha1.APIExport, opts v1.UpdateOptions) (result *v1alpha1.APIExport, err error) { - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(apiexportsResource, "status", aPIExport, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExport), err -} - -// Delete takes name of the aPIExport and deletes it. Returns an error if one occurs. -func (c *FakeAPIExports) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(apiexportsResource, name, opts), &v1alpha1.APIExport{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeAPIExports) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(apiexportsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.APIExportList{}) - return err -} - -// Patch applies the patch and returns the patched aPIExport. -func (c *FakeAPIExports) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIExport, err error) { - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiexportsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExport), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied aPIExport. -func (c *FakeAPIExports) Apply(ctx context.Context, aPIExport *apisv1alpha1.APIExportApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExport, err error) { - if aPIExport == nil { - return nil, fmt.Errorf("aPIExport provided to Apply must not be nil") - } - data, err := json.Marshal(aPIExport) - if err != nil { - return nil, err - } - name := aPIExport.Name - if name == nil { - return nil, fmt.Errorf("aPIExport.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiexportsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExport), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeAPIExports) ApplyStatus(ctx context.Context, aPIExport *apisv1alpha1.APIExportApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExport, err error) { - if aPIExport == nil { - return nil, fmt.Errorf("aPIExport provided to Apply must not be nil") - } - data, err := json.Marshal(aPIExport) - if err != nil { - return nil, err - } - name := aPIExport.Name - if name == nil { - return nil, fmt.Errorf("aPIExport.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIExport{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiexportsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeAPIExports(fake *FakeApisV1alpha1) typedapisv1alpha1.APIExportInterface { + return &fakeAPIExports{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.APIExport, *v1alpha1.APIExportList, *apisv1alpha1.APIExportApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("apiexports"), + v1alpha1.SchemeGroupVersion.WithKind("APIExport"), + func() *v1alpha1.APIExport { return &v1alpha1.APIExport{} }, + func() *v1alpha1.APIExportList { return &v1alpha1.APIExportList{} }, + func(dst, src *v1alpha1.APIExportList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.APIExportList) []*v1alpha1.APIExport { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.APIExportList, items []*v1alpha1.APIExport) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.APIExport), err } 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 05f10213af3..d2602a28c29 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 @@ -19,169 +19,36 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + typedapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) -// FakeAPIExportEndpointSlices implements APIExportEndpointSliceInterface -type FakeAPIExportEndpointSlices struct { +// fakeAPIExportEndpointSlices implements APIExportEndpointSliceInterface +type fakeAPIExportEndpointSlices struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.APIExportEndpointSlice, *v1alpha1.APIExportEndpointSliceList, *apisv1alpha1.APIExportEndpointSliceApplyConfiguration] Fake *FakeApisV1alpha1 } -var apiexportendpointslicesResource = v1alpha1.SchemeGroupVersion.WithResource("apiexportendpointslices") - -var apiexportendpointslicesKind = v1alpha1.SchemeGroupVersion.WithKind("APIExportEndpointSlice") - -// Get takes name of the aPIExportEndpointSlice, and returns the corresponding aPIExportEndpointSlice object, and an error if there is any. -func (c *FakeAPIExportEndpointSlices) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.APIExportEndpointSlice, err error) { - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(apiexportendpointslicesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExportEndpointSlice), err -} - -// List takes label and field selectors, and returns the list of APIExportEndpointSlices that match those selectors. -func (c *FakeAPIExportEndpointSlices) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.APIExportEndpointSliceList, err error) { - emptyResult := &v1alpha1.APIExportEndpointSliceList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(apiexportendpointslicesResource, apiexportendpointslicesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.APIExportEndpointSliceList{ListMeta: obj.(*v1alpha1.APIExportEndpointSliceList).ListMeta} - for _, item := range obj.(*v1alpha1.APIExportEndpointSliceList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested aPIExportEndpointSlices. -func (c *FakeAPIExportEndpointSlices) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(apiexportendpointslicesResource, opts)) -} - -// Create takes the representation of a aPIExportEndpointSlice and creates it. Returns the server's representation of the aPIExportEndpointSlice, and an error, if there is any. -func (c *FakeAPIExportEndpointSlices) Create(ctx context.Context, aPIExportEndpointSlice *v1alpha1.APIExportEndpointSlice, opts v1.CreateOptions) (result *v1alpha1.APIExportEndpointSlice, err error) { - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(apiexportendpointslicesResource, aPIExportEndpointSlice, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExportEndpointSlice), err -} - -// Update takes the representation of a aPIExportEndpointSlice and updates it. Returns the server's representation of the aPIExportEndpointSlice, and an error, if there is any. -func (c *FakeAPIExportEndpointSlices) Update(ctx context.Context, aPIExportEndpointSlice *v1alpha1.APIExportEndpointSlice, opts v1.UpdateOptions) (result *v1alpha1.APIExportEndpointSlice, err error) { - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(apiexportendpointslicesResource, aPIExportEndpointSlice, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExportEndpointSlice), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeAPIExportEndpointSlices) UpdateStatus(ctx context.Context, aPIExportEndpointSlice *v1alpha1.APIExportEndpointSlice, opts v1.UpdateOptions) (result *v1alpha1.APIExportEndpointSlice, err error) { - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(apiexportendpointslicesResource, "status", aPIExportEndpointSlice, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExportEndpointSlice), err -} - -// Delete takes name of the aPIExportEndpointSlice and deletes it. Returns an error if one occurs. -func (c *FakeAPIExportEndpointSlices) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(apiexportendpointslicesResource, name, opts), &v1alpha1.APIExportEndpointSlice{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeAPIExportEndpointSlices) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(apiexportendpointslicesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.APIExportEndpointSliceList{}) - return err -} - -// Patch applies the patch and returns the patched aPIExportEndpointSlice. -func (c *FakeAPIExportEndpointSlices) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIExportEndpointSlice, err error) { - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiexportendpointslicesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExportEndpointSlice), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied aPIExportEndpointSlice. -func (c *FakeAPIExportEndpointSlices) Apply(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSliceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExportEndpointSlice, err error) { - if aPIExportEndpointSlice == nil { - return nil, fmt.Errorf("aPIExportEndpointSlice provided to Apply must not be nil") - } - data, err := json.Marshal(aPIExportEndpointSlice) - if err != nil { - return nil, err - } - name := aPIExportEndpointSlice.Name - if name == nil { - return nil, fmt.Errorf("aPIExportEndpointSlice.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiexportendpointslicesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIExportEndpointSlice), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeAPIExportEndpointSlices) ApplyStatus(ctx context.Context, aPIExportEndpointSlice *apisv1alpha1.APIExportEndpointSliceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIExportEndpointSlice, err error) { - if aPIExportEndpointSlice == nil { - return nil, fmt.Errorf("aPIExportEndpointSlice provided to Apply must not be nil") - } - data, err := json.Marshal(aPIExportEndpointSlice) - if err != nil { - return nil, err - } - name := aPIExportEndpointSlice.Name - if name == nil { - return nil, fmt.Errorf("aPIExportEndpointSlice.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIExportEndpointSlice{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiexportendpointslicesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeAPIExportEndpointSlices(fake *FakeApisV1alpha1) typedapisv1alpha1.APIExportEndpointSliceInterface { + return &fakeAPIExportEndpointSlices{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.APIExportEndpointSlice, *v1alpha1.APIExportEndpointSliceList, *apisv1alpha1.APIExportEndpointSliceApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("apiexportendpointslices"), + v1alpha1.SchemeGroupVersion.WithKind("APIExportEndpointSlice"), + func() *v1alpha1.APIExportEndpointSlice { return &v1alpha1.APIExportEndpointSlice{} }, + func() *v1alpha1.APIExportEndpointSliceList { return &v1alpha1.APIExportEndpointSliceList{} }, + func(dst, src *v1alpha1.APIExportEndpointSliceList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.APIExportEndpointSliceList) []*v1alpha1.APIExportEndpointSlice { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.APIExportEndpointSliceList, items []*v1alpha1.APIExportEndpointSlice) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.APIExportEndpointSlice), err } 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 cc2e98a47d2..8072c022d0c 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 @@ -19,134 +19,36 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" apisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/apis/v1alpha1" + typedapisv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/apis/v1alpha1" ) -// FakeAPIResourceSchemas implements APIResourceSchemaInterface -type FakeAPIResourceSchemas struct { +// fakeAPIResourceSchemas implements APIResourceSchemaInterface +type fakeAPIResourceSchemas struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.APIResourceSchema, *v1alpha1.APIResourceSchemaList, *apisv1alpha1.APIResourceSchemaApplyConfiguration] Fake *FakeApisV1alpha1 } -var apiresourceschemasResource = v1alpha1.SchemeGroupVersion.WithResource("apiresourceschemas") - -var apiresourceschemasKind = v1alpha1.SchemeGroupVersion.WithKind("APIResourceSchema") - -// Get takes name of the aPIResourceSchema, and returns the corresponding aPIResourceSchema object, and an error if there is any. -func (c *FakeAPIResourceSchemas) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.APIResourceSchema, err error) { - emptyResult := &v1alpha1.APIResourceSchema{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(apiresourceschemasResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIResourceSchema), err -} - -// List takes label and field selectors, and returns the list of APIResourceSchemas that match those selectors. -func (c *FakeAPIResourceSchemas) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.APIResourceSchemaList, err error) { - emptyResult := &v1alpha1.APIResourceSchemaList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(apiresourceschemasResource, apiresourceschemasKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.APIResourceSchemaList{ListMeta: obj.(*v1alpha1.APIResourceSchemaList).ListMeta} - for _, item := range obj.(*v1alpha1.APIResourceSchemaList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested aPIResourceSchemas. -func (c *FakeAPIResourceSchemas) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(apiresourceschemasResource, opts)) -} - -// Create takes the representation of a aPIResourceSchema and creates it. Returns the server's representation of the aPIResourceSchema, and an error, if there is any. -func (c *FakeAPIResourceSchemas) Create(ctx context.Context, aPIResourceSchema *v1alpha1.APIResourceSchema, opts v1.CreateOptions) (result *v1alpha1.APIResourceSchema, err error) { - emptyResult := &v1alpha1.APIResourceSchema{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(apiresourceschemasResource, aPIResourceSchema, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIResourceSchema), err -} - -// Update takes the representation of a aPIResourceSchema and updates it. Returns the server's representation of the aPIResourceSchema, and an error, if there is any. -func (c *FakeAPIResourceSchemas) Update(ctx context.Context, aPIResourceSchema *v1alpha1.APIResourceSchema, opts v1.UpdateOptions) (result *v1alpha1.APIResourceSchema, err error) { - emptyResult := &v1alpha1.APIResourceSchema{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(apiresourceschemasResource, aPIResourceSchema, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIResourceSchema), err -} - -// Delete takes name of the aPIResourceSchema and deletes it. Returns an error if one occurs. -func (c *FakeAPIResourceSchemas) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(apiresourceschemasResource, name, opts), &v1alpha1.APIResourceSchema{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeAPIResourceSchemas) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(apiresourceschemasResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.APIResourceSchemaList{}) - return err -} - -// Patch applies the patch and returns the patched aPIResourceSchema. -func (c *FakeAPIResourceSchemas) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.APIResourceSchema, err error) { - emptyResult := &v1alpha1.APIResourceSchema{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiresourceschemasResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.APIResourceSchema), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied aPIResourceSchema. -func (c *FakeAPIResourceSchemas) Apply(ctx context.Context, aPIResourceSchema *apisv1alpha1.APIResourceSchemaApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.APIResourceSchema, err error) { - if aPIResourceSchema == nil { - return nil, fmt.Errorf("aPIResourceSchema provided to Apply must not be nil") - } - data, err := json.Marshal(aPIResourceSchema) - if err != nil { - return nil, err - } - name := aPIResourceSchema.Name - if name == nil { - return nil, fmt.Errorf("aPIResourceSchema.Name must be provided to Apply") - } - emptyResult := &v1alpha1.APIResourceSchema{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(apiresourceschemasResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeAPIResourceSchemas(fake *FakeApisV1alpha1) typedapisv1alpha1.APIResourceSchemaInterface { + return &fakeAPIResourceSchemas{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.APIResourceSchema, *v1alpha1.APIResourceSchemaList, *apisv1alpha1.APIResourceSchemaApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("apiresourceschemas"), + v1alpha1.SchemeGroupVersion.WithKind("APIResourceSchema"), + func() *v1alpha1.APIResourceSchema { return &v1alpha1.APIResourceSchema{} }, + func() *v1alpha1.APIResourceSchemaList { return &v1alpha1.APIResourceSchemaList{} }, + func(dst, src *v1alpha1.APIResourceSchemaList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.APIResourceSchemaList) []*v1alpha1.APIResourceSchema { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.APIResourceSchemaList, items []*v1alpha1.APIResourceSchema) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.APIResourceSchema), err } 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 e13d89a68d4..484d7420a76 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 @@ -30,23 +30,23 @@ type FakeApisV1alpha1 struct { } func (c *FakeApisV1alpha1) APIBindings() v1alpha1.APIBindingInterface { - return &FakeAPIBindings{c} + return newFakeAPIBindings(c) } func (c *FakeApisV1alpha1) APIConversions() v1alpha1.APIConversionInterface { - return &FakeAPIConversions{c} + return newFakeAPIConversions(c) } func (c *FakeApisV1alpha1) APIExports() v1alpha1.APIExportInterface { - return &FakeAPIExports{c} + return newFakeAPIExports(c) } func (c *FakeApisV1alpha1) APIExportEndpointSlices() v1alpha1.APIExportEndpointSliceInterface { - return &FakeAPIExportEndpointSlices{c} + return newFakeAPIExportEndpointSlices(c) } func (c *FakeApisV1alpha1) APIResourceSchemas() v1alpha1.APIResourceSchemaInterface { - return &FakeAPIResourceSchemas{c} + return newFakeAPIResourceSchemas(c) } // RESTClient returns a RESTClient that is used to communicate 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 3a65147305e..5f8e75c1b63 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/core_client.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/core_client.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" - "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type CoreV1alpha1Interface interface { @@ -91,10 +91,10 @@ func New(c rest.Interface) *CoreV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := corev1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/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 903193f909d..845b1ebed25 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 @@ -30,11 +30,11 @@ type FakeCoreV1alpha1 struct { } func (c *FakeCoreV1alpha1) LogicalClusters() v1alpha1.LogicalClusterInterface { - return &FakeLogicalClusters{c} + return newFakeLogicalClusters(c) } func (c *FakeCoreV1alpha1) Shards() v1alpha1.ShardInterface { - return &FakeShards{c} + return newFakeShards(c) } // RESTClient returns a RESTClient that is used to communicate 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 ead0c057a15..9c370a530c6 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 @@ -19,169 +19,36 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/core/v1alpha1" + typedcorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) -// FakeLogicalClusters implements LogicalClusterInterface -type FakeLogicalClusters struct { +// fakeLogicalClusters implements LogicalClusterInterface +type fakeLogicalClusters struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.LogicalCluster, *v1alpha1.LogicalClusterList, *corev1alpha1.LogicalClusterApplyConfiguration] Fake *FakeCoreV1alpha1 } -var logicalclustersResource = v1alpha1.SchemeGroupVersion.WithResource("logicalclusters") - -var logicalclustersKind = v1alpha1.SchemeGroupVersion.WithKind("LogicalCluster") - -// Get takes name of the logicalCluster, and returns the corresponding logicalCluster object, and an error if there is any. -func (c *FakeLogicalClusters) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.LogicalCluster, err error) { - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(logicalclustersResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.LogicalCluster), err -} - -// List takes label and field selectors, and returns the list of LogicalClusters that match those selectors. -func (c *FakeLogicalClusters) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.LogicalClusterList, err error) { - emptyResult := &v1alpha1.LogicalClusterList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(logicalclustersResource, logicalclustersKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.LogicalClusterList{ListMeta: obj.(*v1alpha1.LogicalClusterList).ListMeta} - for _, item := range obj.(*v1alpha1.LogicalClusterList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested logicalClusters. -func (c *FakeLogicalClusters) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(logicalclustersResource, opts)) -} - -// Create takes the representation of a logicalCluster and creates it. Returns the server's representation of the logicalCluster, and an error, if there is any. -func (c *FakeLogicalClusters) Create(ctx context.Context, logicalCluster *v1alpha1.LogicalCluster, opts v1.CreateOptions) (result *v1alpha1.LogicalCluster, err error) { - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(logicalclustersResource, logicalCluster, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.LogicalCluster), err -} - -// Update takes the representation of a logicalCluster and updates it. Returns the server's representation of the logicalCluster, and an error, if there is any. -func (c *FakeLogicalClusters) Update(ctx context.Context, logicalCluster *v1alpha1.LogicalCluster, opts v1.UpdateOptions) (result *v1alpha1.LogicalCluster, err error) { - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(logicalclustersResource, logicalCluster, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.LogicalCluster), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeLogicalClusters) UpdateStatus(ctx context.Context, logicalCluster *v1alpha1.LogicalCluster, opts v1.UpdateOptions) (result *v1alpha1.LogicalCluster, err error) { - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(logicalclustersResource, "status", logicalCluster, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.LogicalCluster), err -} - -// Delete takes name of the logicalCluster and deletes it. Returns an error if one occurs. -func (c *FakeLogicalClusters) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(logicalclustersResource, name, opts), &v1alpha1.LogicalCluster{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeLogicalClusters) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(logicalclustersResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.LogicalClusterList{}) - return err -} - -// Patch applies the patch and returns the patched logicalCluster. -func (c *FakeLogicalClusters) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.LogicalCluster, err error) { - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(logicalclustersResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.LogicalCluster), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied logicalCluster. -func (c *FakeLogicalClusters) Apply(ctx context.Context, logicalCluster *corev1alpha1.LogicalClusterApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LogicalCluster, err error) { - if logicalCluster == nil { - return nil, fmt.Errorf("logicalCluster provided to Apply must not be nil") - } - data, err := json.Marshal(logicalCluster) - if err != nil { - return nil, err - } - name := logicalCluster.Name - if name == nil { - return nil, fmt.Errorf("logicalCluster.Name must be provided to Apply") - } - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(logicalclustersResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.LogicalCluster), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeLogicalClusters) ApplyStatus(ctx context.Context, logicalCluster *corev1alpha1.LogicalClusterApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LogicalCluster, err error) { - if logicalCluster == nil { - return nil, fmt.Errorf("logicalCluster provided to Apply must not be nil") - } - data, err := json.Marshal(logicalCluster) - if err != nil { - return nil, err - } - name := logicalCluster.Name - if name == nil { - return nil, fmt.Errorf("logicalCluster.Name must be provided to Apply") - } - emptyResult := &v1alpha1.LogicalCluster{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(logicalclustersResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeLogicalClusters(fake *FakeCoreV1alpha1) typedcorev1alpha1.LogicalClusterInterface { + return &fakeLogicalClusters{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.LogicalCluster, *v1alpha1.LogicalClusterList, *corev1alpha1.LogicalClusterApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("logicalclusters"), + v1alpha1.SchemeGroupVersion.WithKind("LogicalCluster"), + func() *v1alpha1.LogicalCluster { return &v1alpha1.LogicalCluster{} }, + func() *v1alpha1.LogicalClusterList { return &v1alpha1.LogicalClusterList{} }, + func(dst, src *v1alpha1.LogicalClusterList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.LogicalClusterList) []*v1alpha1.LogicalCluster { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.LogicalClusterList, items []*v1alpha1.LogicalCluster) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.LogicalCluster), err } 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 f209f5f5c11..b860b340aa8 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 @@ -19,169 +19,32 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/core/v1alpha1" + typedcorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/core/v1alpha1" ) -// FakeShards implements ShardInterface -type FakeShards struct { +// fakeShards implements ShardInterface +type fakeShards struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.Shard, *v1alpha1.ShardList, *corev1alpha1.ShardApplyConfiguration] Fake *FakeCoreV1alpha1 } -var shardsResource = v1alpha1.SchemeGroupVersion.WithResource("shards") - -var shardsKind = v1alpha1.SchemeGroupVersion.WithKind("Shard") - -// Get takes name of the shard, and returns the corresponding shard object, and an error if there is any. -func (c *FakeShards) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Shard, err error) { - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(shardsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Shard), err -} - -// List takes label and field selectors, and returns the list of Shards that match those selectors. -func (c *FakeShards) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.ShardList, err error) { - emptyResult := &v1alpha1.ShardList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(shardsResource, shardsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.ShardList{ListMeta: obj.(*v1alpha1.ShardList).ListMeta} - for _, item := range obj.(*v1alpha1.ShardList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested shards. -func (c *FakeShards) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(shardsResource, opts)) -} - -// Create takes the representation of a shard and creates it. Returns the server's representation of the shard, and an error, if there is any. -func (c *FakeShards) Create(ctx context.Context, shard *v1alpha1.Shard, opts v1.CreateOptions) (result *v1alpha1.Shard, err error) { - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(shardsResource, shard, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Shard), err -} - -// Update takes the representation of a shard and updates it. Returns the server's representation of the shard, and an error, if there is any. -func (c *FakeShards) Update(ctx context.Context, shard *v1alpha1.Shard, opts v1.UpdateOptions) (result *v1alpha1.Shard, err error) { - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(shardsResource, shard, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Shard), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeShards) UpdateStatus(ctx context.Context, shard *v1alpha1.Shard, opts v1.UpdateOptions) (result *v1alpha1.Shard, err error) { - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(shardsResource, "status", shard, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Shard), err -} - -// Delete takes name of the shard and deletes it. Returns an error if one occurs. -func (c *FakeShards) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(shardsResource, name, opts), &v1alpha1.Shard{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeShards) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(shardsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.ShardList{}) - return err -} - -// Patch applies the patch and returns the patched shard. -func (c *FakeShards) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Shard, err error) { - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(shardsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Shard), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied shard. -func (c *FakeShards) Apply(ctx context.Context, shard *corev1alpha1.ShardApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Shard, err error) { - if shard == nil { - return nil, fmt.Errorf("shard provided to Apply must not be nil") - } - data, err := json.Marshal(shard) - if err != nil { - return nil, err - } - name := shard.Name - if name == nil { - return nil, fmt.Errorf("shard.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(shardsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Shard), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeShards) ApplyStatus(ctx context.Context, shard *corev1alpha1.ShardApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Shard, err error) { - if shard == nil { - return nil, fmt.Errorf("shard provided to Apply must not be nil") - } - data, err := json.Marshal(shard) - if err != nil { - return nil, err - } - name := shard.Name - if name == nil { - return nil, fmt.Errorf("shard.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Shard{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(shardsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeShards(fake *FakeCoreV1alpha1) typedcorev1alpha1.ShardInterface { + return &fakeShards{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.Shard, *v1alpha1.ShardList, *corev1alpha1.ShardApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("shards"), + v1alpha1.SchemeGroupVersion.WithKind("Shard"), + func() *v1alpha1.Shard { return &v1alpha1.Shard{} }, + func() *v1alpha1.ShardList { return &v1alpha1.ShardList{} }, + func(dst, src *v1alpha1.ShardList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.ShardList) []*v1alpha1.Shard { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.ShardList, items []*v1alpha1.Shard) { list.Items = gentype.FromPointerSlice(items) }, + ), + fake, } - return obj.(*v1alpha1.Shard), err } diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go index ca4fce37e61..d2dc89f837c 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/logicalcluster.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + applyconfigurationcorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/core/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type LogicalClustersGetter interface { // LogicalClusterInterface has methods to work with LogicalCluster resources. type LogicalClusterInterface interface { - Create(ctx context.Context, logicalCluster *v1alpha1.LogicalCluster, opts v1.CreateOptions) (*v1alpha1.LogicalCluster, error) - Update(ctx context.Context, logicalCluster *v1alpha1.LogicalCluster, opts v1.UpdateOptions) (*v1alpha1.LogicalCluster, error) + Create(ctx context.Context, logicalCluster *corev1alpha1.LogicalCluster, opts v1.CreateOptions) (*corev1alpha1.LogicalCluster, error) + Update(ctx context.Context, logicalCluster *corev1alpha1.LogicalCluster, opts v1.UpdateOptions) (*corev1alpha1.LogicalCluster, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, logicalCluster *v1alpha1.LogicalCluster, opts v1.UpdateOptions) (*v1alpha1.LogicalCluster, error) + UpdateStatus(ctx context.Context, logicalCluster *corev1alpha1.LogicalCluster, opts v1.UpdateOptions) (*corev1alpha1.LogicalCluster, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.LogicalCluster, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.LogicalClusterList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*corev1alpha1.LogicalCluster, error) + List(ctx context.Context, opts v1.ListOptions) (*corev1alpha1.LogicalClusterList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.LogicalCluster, err error) - Apply(ctx context.Context, logicalCluster *corev1alpha1.LogicalClusterApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LogicalCluster, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *corev1alpha1.LogicalCluster, err error) + Apply(ctx context.Context, logicalCluster *applyconfigurationcorev1alpha1.LogicalClusterApplyConfiguration, opts v1.ApplyOptions) (result *corev1alpha1.LogicalCluster, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, logicalCluster *corev1alpha1.LogicalClusterApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.LogicalCluster, err error) + ApplyStatus(ctx context.Context, logicalCluster *applyconfigurationcorev1alpha1.LogicalClusterApplyConfiguration, opts v1.ApplyOptions) (result *corev1alpha1.LogicalCluster, err error) LogicalClusterExpansion } // logicalClusters implements LogicalClusterInterface type logicalClusters struct { - *gentype.ClientWithListAndApply[*v1alpha1.LogicalCluster, *v1alpha1.LogicalClusterList, *corev1alpha1.LogicalClusterApplyConfiguration] + *gentype.ClientWithListAndApply[*corev1alpha1.LogicalCluster, *corev1alpha1.LogicalClusterList, *applyconfigurationcorev1alpha1.LogicalClusterApplyConfiguration] } // newLogicalClusters returns a LogicalClusters func newLogicalClusters(c *CoreV1alpha1Client) *logicalClusters { return &logicalClusters{ - gentype.NewClientWithListAndApply[*v1alpha1.LogicalCluster, *v1alpha1.LogicalClusterList, *corev1alpha1.LogicalClusterApplyConfiguration]( + gentype.NewClientWithListAndApply[*corev1alpha1.LogicalCluster, *corev1alpha1.LogicalClusterList, *applyconfigurationcorev1alpha1.LogicalClusterApplyConfiguration]( "logicalclusters", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.LogicalCluster { return &v1alpha1.LogicalCluster{} }, - func() *v1alpha1.LogicalClusterList { return &v1alpha1.LogicalClusterList{} }), + func() *corev1alpha1.LogicalCluster { return &corev1alpha1.LogicalCluster{} }, + func() *corev1alpha1.LogicalClusterList { return &corev1alpha1.LogicalClusterList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go b/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go index 17d710145fc..67efe8313a6 100644 --- a/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go +++ b/sdk/client/clientset/versioned/typed/core/v1alpha1/shard.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" - corev1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/core/v1alpha1" + corev1alpha1 "github.com/kcp-dev/kcp/sdk/apis/core/v1alpha1" + applyconfigurationcorev1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/core/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type ShardsGetter interface { // ShardInterface has methods to work with Shard resources. type ShardInterface interface { - Create(ctx context.Context, shard *v1alpha1.Shard, opts v1.CreateOptions) (*v1alpha1.Shard, error) - Update(ctx context.Context, shard *v1alpha1.Shard, opts v1.UpdateOptions) (*v1alpha1.Shard, error) + Create(ctx context.Context, shard *corev1alpha1.Shard, opts v1.CreateOptions) (*corev1alpha1.Shard, error) + Update(ctx context.Context, shard *corev1alpha1.Shard, opts v1.UpdateOptions) (*corev1alpha1.Shard, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, shard *v1alpha1.Shard, opts v1.UpdateOptions) (*v1alpha1.Shard, error) + UpdateStatus(ctx context.Context, shard *corev1alpha1.Shard, opts v1.UpdateOptions) (*corev1alpha1.Shard, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Shard, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.ShardList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*corev1alpha1.Shard, error) + List(ctx context.Context, opts v1.ListOptions) (*corev1alpha1.ShardList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Shard, err error) - Apply(ctx context.Context, shard *corev1alpha1.ShardApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Shard, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *corev1alpha1.Shard, err error) + Apply(ctx context.Context, shard *applyconfigurationcorev1alpha1.ShardApplyConfiguration, opts v1.ApplyOptions) (result *corev1alpha1.Shard, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, shard *corev1alpha1.ShardApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Shard, err error) + ApplyStatus(ctx context.Context, shard *applyconfigurationcorev1alpha1.ShardApplyConfiguration, opts v1.ApplyOptions) (result *corev1alpha1.Shard, err error) ShardExpansion } // shards implements ShardInterface type shards struct { - *gentype.ClientWithListAndApply[*v1alpha1.Shard, *v1alpha1.ShardList, *corev1alpha1.ShardApplyConfiguration] + *gentype.ClientWithListAndApply[*corev1alpha1.Shard, *corev1alpha1.ShardList, *applyconfigurationcorev1alpha1.ShardApplyConfiguration] } // newShards returns a Shards func newShards(c *CoreV1alpha1Client) *shards { return &shards{ - gentype.NewClientWithListAndApply[*v1alpha1.Shard, *v1alpha1.ShardList, *corev1alpha1.ShardApplyConfiguration]( + gentype.NewClientWithListAndApply[*corev1alpha1.Shard, *corev1alpha1.ShardList, *applyconfigurationcorev1alpha1.ShardApplyConfiguration]( "shards", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.Shard { return &v1alpha1.Shard{} }, - func() *v1alpha1.ShardList { return &v1alpha1.ShardList{} }), + func() *corev1alpha1.Shard { return &corev1alpha1.Shard{} }, + func() *corev1alpha1.ShardList { return &corev1alpha1.ShardList{} }, + ), } } 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 948dfeb8044..c67fc94fe86 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 @@ -30,11 +30,11 @@ type FakeTenancyV1alpha1 struct { } func (c *FakeTenancyV1alpha1) Workspaces() v1alpha1.WorkspaceInterface { - return &FakeWorkspaces{c} + return newFakeWorkspaces(c) } func (c *FakeTenancyV1alpha1) WorkspaceTypes() v1alpha1.WorkspaceTypeInterface { - return &FakeWorkspaceTypes{c} + return newFakeWorkspaceTypes(c) } // RESTClient returns a RESTClient that is used to communicate 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 b96da686278..e72cc1f407c 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 @@ -19,169 +19,34 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/tenancy/v1alpha1" + typedtenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) -// FakeWorkspaces implements WorkspaceInterface -type FakeWorkspaces struct { +// fakeWorkspaces implements WorkspaceInterface +type fakeWorkspaces struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.Workspace, *v1alpha1.WorkspaceList, *tenancyv1alpha1.WorkspaceApplyConfiguration] Fake *FakeTenancyV1alpha1 } -var workspacesResource = v1alpha1.SchemeGroupVersion.WithResource("workspaces") - -var workspacesKind = v1alpha1.SchemeGroupVersion.WithKind("Workspace") - -// Get takes name of the workspace, and returns the corresponding workspace object, and an error if there is any. -func (c *FakeWorkspaces) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Workspace, err error) { - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(workspacesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Workspace), err -} - -// List takes label and field selectors, and returns the list of Workspaces that match those selectors. -func (c *FakeWorkspaces) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.WorkspaceList, err error) { - emptyResult := &v1alpha1.WorkspaceList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(workspacesResource, workspacesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.WorkspaceList{ListMeta: obj.(*v1alpha1.WorkspaceList).ListMeta} - for _, item := range obj.(*v1alpha1.WorkspaceList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested workspaces. -func (c *FakeWorkspaces) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(workspacesResource, opts)) -} - -// Create takes the representation of a workspace and creates it. Returns the server's representation of the workspace, and an error, if there is any. -func (c *FakeWorkspaces) Create(ctx context.Context, workspace *v1alpha1.Workspace, opts v1.CreateOptions) (result *v1alpha1.Workspace, err error) { - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(workspacesResource, workspace, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Workspace), err -} - -// Update takes the representation of a workspace and updates it. Returns the server's representation of the workspace, and an error, if there is any. -func (c *FakeWorkspaces) Update(ctx context.Context, workspace *v1alpha1.Workspace, opts v1.UpdateOptions) (result *v1alpha1.Workspace, err error) { - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(workspacesResource, workspace, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Workspace), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeWorkspaces) UpdateStatus(ctx context.Context, workspace *v1alpha1.Workspace, opts v1.UpdateOptions) (result *v1alpha1.Workspace, err error) { - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(workspacesResource, "status", workspace, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Workspace), err -} - -// Delete takes name of the workspace and deletes it. Returns an error if one occurs. -func (c *FakeWorkspaces) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(workspacesResource, name, opts), &v1alpha1.Workspace{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeWorkspaces) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(workspacesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.WorkspaceList{}) - return err -} - -// Patch applies the patch and returns the patched workspace. -func (c *FakeWorkspaces) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Workspace, err error) { - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(workspacesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Workspace), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied workspace. -func (c *FakeWorkspaces) Apply(ctx context.Context, workspace *tenancyv1alpha1.WorkspaceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Workspace, err error) { - if workspace == nil { - return nil, fmt.Errorf("workspace provided to Apply must not be nil") - } - data, err := json.Marshal(workspace) - if err != nil { - return nil, err - } - name := workspace.Name - if name == nil { - return nil, fmt.Errorf("workspace.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(workspacesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Workspace), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeWorkspaces) ApplyStatus(ctx context.Context, workspace *tenancyv1alpha1.WorkspaceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Workspace, err error) { - if workspace == nil { - return nil, fmt.Errorf("workspace provided to Apply must not be nil") - } - data, err := json.Marshal(workspace) - if err != nil { - return nil, err - } - name := workspace.Name - if name == nil { - return nil, fmt.Errorf("workspace.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Workspace{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(workspacesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeWorkspaces(fake *FakeTenancyV1alpha1) typedtenancyv1alpha1.WorkspaceInterface { + return &fakeWorkspaces{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.Workspace, *v1alpha1.WorkspaceList, *tenancyv1alpha1.WorkspaceApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("workspaces"), + v1alpha1.SchemeGroupVersion.WithKind("Workspace"), + func() *v1alpha1.Workspace { return &v1alpha1.Workspace{} }, + func() *v1alpha1.WorkspaceList { return &v1alpha1.WorkspaceList{} }, + func(dst, src *v1alpha1.WorkspaceList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.WorkspaceList) []*v1alpha1.Workspace { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.WorkspaceList, items []*v1alpha1.Workspace) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.Workspace), err } 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 772246f3c02..3d6e00cfd3c 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 @@ -19,169 +19,36 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/tenancy/v1alpha1" + typedtenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/tenancy/v1alpha1" ) -// FakeWorkspaceTypes implements WorkspaceTypeInterface -type FakeWorkspaceTypes struct { +// fakeWorkspaceTypes implements WorkspaceTypeInterface +type fakeWorkspaceTypes struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.WorkspaceType, *v1alpha1.WorkspaceTypeList, *tenancyv1alpha1.WorkspaceTypeApplyConfiguration] Fake *FakeTenancyV1alpha1 } -var workspacetypesResource = v1alpha1.SchemeGroupVersion.WithResource("workspacetypes") - -var workspacetypesKind = v1alpha1.SchemeGroupVersion.WithKind("WorkspaceType") - -// Get takes name of the workspaceType, and returns the corresponding workspaceType object, and an error if there is any. -func (c *FakeWorkspaceTypes) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.WorkspaceType, err error) { - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(workspacetypesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.WorkspaceType), err -} - -// List takes label and field selectors, and returns the list of WorkspaceTypes that match those selectors. -func (c *FakeWorkspaceTypes) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.WorkspaceTypeList, err error) { - emptyResult := &v1alpha1.WorkspaceTypeList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(workspacetypesResource, workspacetypesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.WorkspaceTypeList{ListMeta: obj.(*v1alpha1.WorkspaceTypeList).ListMeta} - for _, item := range obj.(*v1alpha1.WorkspaceTypeList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested workspaceTypes. -func (c *FakeWorkspaceTypes) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(workspacetypesResource, opts)) -} - -// Create takes the representation of a workspaceType and creates it. Returns the server's representation of the workspaceType, and an error, if there is any. -func (c *FakeWorkspaceTypes) Create(ctx context.Context, workspaceType *v1alpha1.WorkspaceType, opts v1.CreateOptions) (result *v1alpha1.WorkspaceType, err error) { - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(workspacetypesResource, workspaceType, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.WorkspaceType), err -} - -// Update takes the representation of a workspaceType and updates it. Returns the server's representation of the workspaceType, and an error, if there is any. -func (c *FakeWorkspaceTypes) Update(ctx context.Context, workspaceType *v1alpha1.WorkspaceType, opts v1.UpdateOptions) (result *v1alpha1.WorkspaceType, err error) { - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(workspacetypesResource, workspaceType, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.WorkspaceType), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeWorkspaceTypes) UpdateStatus(ctx context.Context, workspaceType *v1alpha1.WorkspaceType, opts v1.UpdateOptions) (result *v1alpha1.WorkspaceType, err error) { - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(workspacetypesResource, "status", workspaceType, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.WorkspaceType), err -} - -// Delete takes name of the workspaceType and deletes it. Returns an error if one occurs. -func (c *FakeWorkspaceTypes) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(workspacetypesResource, name, opts), &v1alpha1.WorkspaceType{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeWorkspaceTypes) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(workspacetypesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.WorkspaceTypeList{}) - return err -} - -// Patch applies the patch and returns the patched workspaceType. -func (c *FakeWorkspaceTypes) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.WorkspaceType, err error) { - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(workspacetypesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.WorkspaceType), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied workspaceType. -func (c *FakeWorkspaceTypes) Apply(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceTypeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.WorkspaceType, err error) { - if workspaceType == nil { - return nil, fmt.Errorf("workspaceType provided to Apply must not be nil") - } - data, err := json.Marshal(workspaceType) - if err != nil { - return nil, err - } - name := workspaceType.Name - if name == nil { - return nil, fmt.Errorf("workspaceType.Name must be provided to Apply") - } - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(workspacetypesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.WorkspaceType), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeWorkspaceTypes) ApplyStatus(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceTypeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.WorkspaceType, err error) { - if workspaceType == nil { - return nil, fmt.Errorf("workspaceType provided to Apply must not be nil") - } - data, err := json.Marshal(workspaceType) - if err != nil { - return nil, err - } - name := workspaceType.Name - if name == nil { - return nil, fmt.Errorf("workspaceType.Name must be provided to Apply") - } - emptyResult := &v1alpha1.WorkspaceType{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(workspacetypesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeWorkspaceTypes(fake *FakeTenancyV1alpha1) typedtenancyv1alpha1.WorkspaceTypeInterface { + return &fakeWorkspaceTypes{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.WorkspaceType, *v1alpha1.WorkspaceTypeList, *tenancyv1alpha1.WorkspaceTypeApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("workspacetypes"), + v1alpha1.SchemeGroupVersion.WithKind("WorkspaceType"), + func() *v1alpha1.WorkspaceType { return &v1alpha1.WorkspaceType{} }, + func() *v1alpha1.WorkspaceTypeList { return &v1alpha1.WorkspaceTypeList{} }, + func(dst, src *v1alpha1.WorkspaceTypeList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.WorkspaceTypeList) []*v1alpha1.WorkspaceType { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.WorkspaceTypeList, items []*v1alpha1.WorkspaceType) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.WorkspaceType), err } 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 c6ebc4e4ec5..b5c37d495db 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/tenancy_client.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/tenancy_client.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" - "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type TenancyV1alpha1Interface interface { @@ -91,10 +91,10 @@ func New(c rest.Interface) *TenancyV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := tenancyv1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go index 4a3b881ba7c..8d1017d8863 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspace.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + applyconfigurationtenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/tenancy/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type WorkspacesGetter interface { // WorkspaceInterface has methods to work with Workspace resources. type WorkspaceInterface interface { - Create(ctx context.Context, workspace *v1alpha1.Workspace, opts v1.CreateOptions) (*v1alpha1.Workspace, error) - Update(ctx context.Context, workspace *v1alpha1.Workspace, opts v1.UpdateOptions) (*v1alpha1.Workspace, error) + Create(ctx context.Context, workspace *tenancyv1alpha1.Workspace, opts v1.CreateOptions) (*tenancyv1alpha1.Workspace, error) + Update(ctx context.Context, workspace *tenancyv1alpha1.Workspace, opts v1.UpdateOptions) (*tenancyv1alpha1.Workspace, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, workspace *v1alpha1.Workspace, opts v1.UpdateOptions) (*v1alpha1.Workspace, error) + UpdateStatus(ctx context.Context, workspace *tenancyv1alpha1.Workspace, opts v1.UpdateOptions) (*tenancyv1alpha1.Workspace, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Workspace, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.WorkspaceList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*tenancyv1alpha1.Workspace, error) + List(ctx context.Context, opts v1.ListOptions) (*tenancyv1alpha1.WorkspaceList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Workspace, err error) - Apply(ctx context.Context, workspace *tenancyv1alpha1.WorkspaceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Workspace, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *tenancyv1alpha1.Workspace, err error) + Apply(ctx context.Context, workspace *applyconfigurationtenancyv1alpha1.WorkspaceApplyConfiguration, opts v1.ApplyOptions) (result *tenancyv1alpha1.Workspace, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, workspace *tenancyv1alpha1.WorkspaceApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Workspace, err error) + ApplyStatus(ctx context.Context, workspace *applyconfigurationtenancyv1alpha1.WorkspaceApplyConfiguration, opts v1.ApplyOptions) (result *tenancyv1alpha1.Workspace, err error) WorkspaceExpansion } // workspaces implements WorkspaceInterface type workspaces struct { - *gentype.ClientWithListAndApply[*v1alpha1.Workspace, *v1alpha1.WorkspaceList, *tenancyv1alpha1.WorkspaceApplyConfiguration] + *gentype.ClientWithListAndApply[*tenancyv1alpha1.Workspace, *tenancyv1alpha1.WorkspaceList, *applyconfigurationtenancyv1alpha1.WorkspaceApplyConfiguration] } // newWorkspaces returns a Workspaces func newWorkspaces(c *TenancyV1alpha1Client) *workspaces { return &workspaces{ - gentype.NewClientWithListAndApply[*v1alpha1.Workspace, *v1alpha1.WorkspaceList, *tenancyv1alpha1.WorkspaceApplyConfiguration]( + gentype.NewClientWithListAndApply[*tenancyv1alpha1.Workspace, *tenancyv1alpha1.WorkspaceList, *applyconfigurationtenancyv1alpha1.WorkspaceApplyConfiguration]( "workspaces", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.Workspace { return &v1alpha1.Workspace{} }, - func() *v1alpha1.WorkspaceList { return &v1alpha1.WorkspaceList{} }), + func() *tenancyv1alpha1.Workspace { return &tenancyv1alpha1.Workspace{} }, + func() *tenancyv1alpha1.WorkspaceList { return &tenancyv1alpha1.WorkspaceList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go index ed16de3d1ff..aae68f56c91 100644 --- a/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/clientset/versioned/typed/tenancy/v1alpha1/workspacetype.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" - tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/tenancy/v1alpha1" + tenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/tenancy/v1alpha1" + applyconfigurationtenancyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/tenancy/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type WorkspaceTypesGetter interface { // WorkspaceTypeInterface has methods to work with WorkspaceType resources. type WorkspaceTypeInterface interface { - Create(ctx context.Context, workspaceType *v1alpha1.WorkspaceType, opts v1.CreateOptions) (*v1alpha1.WorkspaceType, error) - Update(ctx context.Context, workspaceType *v1alpha1.WorkspaceType, opts v1.UpdateOptions) (*v1alpha1.WorkspaceType, error) + Create(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceType, opts v1.CreateOptions) (*tenancyv1alpha1.WorkspaceType, error) + Update(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceType, opts v1.UpdateOptions) (*tenancyv1alpha1.WorkspaceType, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, workspaceType *v1alpha1.WorkspaceType, opts v1.UpdateOptions) (*v1alpha1.WorkspaceType, error) + UpdateStatus(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceType, opts v1.UpdateOptions) (*tenancyv1alpha1.WorkspaceType, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.WorkspaceType, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.WorkspaceTypeList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*tenancyv1alpha1.WorkspaceType, error) + List(ctx context.Context, opts v1.ListOptions) (*tenancyv1alpha1.WorkspaceTypeList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.WorkspaceType, err error) - Apply(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceTypeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.WorkspaceType, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *tenancyv1alpha1.WorkspaceType, err error) + Apply(ctx context.Context, workspaceType *applyconfigurationtenancyv1alpha1.WorkspaceTypeApplyConfiguration, opts v1.ApplyOptions) (result *tenancyv1alpha1.WorkspaceType, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, workspaceType *tenancyv1alpha1.WorkspaceTypeApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.WorkspaceType, err error) + ApplyStatus(ctx context.Context, workspaceType *applyconfigurationtenancyv1alpha1.WorkspaceTypeApplyConfiguration, opts v1.ApplyOptions) (result *tenancyv1alpha1.WorkspaceType, err error) WorkspaceTypeExpansion } // workspaceTypes implements WorkspaceTypeInterface type workspaceTypes struct { - *gentype.ClientWithListAndApply[*v1alpha1.WorkspaceType, *v1alpha1.WorkspaceTypeList, *tenancyv1alpha1.WorkspaceTypeApplyConfiguration] + *gentype.ClientWithListAndApply[*tenancyv1alpha1.WorkspaceType, *tenancyv1alpha1.WorkspaceTypeList, *applyconfigurationtenancyv1alpha1.WorkspaceTypeApplyConfiguration] } // newWorkspaceTypes returns a WorkspaceTypes func newWorkspaceTypes(c *TenancyV1alpha1Client) *workspaceTypes { return &workspaceTypes{ - gentype.NewClientWithListAndApply[*v1alpha1.WorkspaceType, *v1alpha1.WorkspaceTypeList, *tenancyv1alpha1.WorkspaceTypeApplyConfiguration]( + gentype.NewClientWithListAndApply[*tenancyv1alpha1.WorkspaceType, *tenancyv1alpha1.WorkspaceTypeList, *applyconfigurationtenancyv1alpha1.WorkspaceTypeApplyConfiguration]( "workspacetypes", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.WorkspaceType { return &v1alpha1.WorkspaceType{} }, - func() *v1alpha1.WorkspaceTypeList { return &v1alpha1.WorkspaceTypeList{} }), + func() *tenancyv1alpha1.WorkspaceType { return &tenancyv1alpha1.WorkspaceType{} }, + func() *tenancyv1alpha1.WorkspaceTypeList { return &tenancyv1alpha1.WorkspaceTypeList{} }, + ), } } 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 41854b3894c..5b936682192 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 @@ -19,134 +19,34 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/topology/v1alpha1" + typedtopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) -// FakePartitions implements PartitionInterface -type FakePartitions struct { +// fakePartitions implements PartitionInterface +type fakePartitions struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.Partition, *v1alpha1.PartitionList, *topologyv1alpha1.PartitionApplyConfiguration] Fake *FakeTopologyV1alpha1 } -var partitionsResource = v1alpha1.SchemeGroupVersion.WithResource("partitions") - -var partitionsKind = v1alpha1.SchemeGroupVersion.WithKind("Partition") - -// Get takes name of the partition, and returns the corresponding partition object, and an error if there is any. -func (c *FakePartitions) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Partition, err error) { - emptyResult := &v1alpha1.Partition{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(partitionsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Partition), err -} - -// List takes label and field selectors, and returns the list of Partitions that match those selectors. -func (c *FakePartitions) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PartitionList, err error) { - emptyResult := &v1alpha1.PartitionList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(partitionsResource, partitionsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.PartitionList{ListMeta: obj.(*v1alpha1.PartitionList).ListMeta} - for _, item := range obj.(*v1alpha1.PartitionList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested partitions. -func (c *FakePartitions) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(partitionsResource, opts)) -} - -// Create takes the representation of a partition and creates it. Returns the server's representation of the partition, and an error, if there is any. -func (c *FakePartitions) Create(ctx context.Context, partition *v1alpha1.Partition, opts v1.CreateOptions) (result *v1alpha1.Partition, err error) { - emptyResult := &v1alpha1.Partition{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(partitionsResource, partition, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Partition), err -} - -// Update takes the representation of a partition and updates it. Returns the server's representation of the partition, and an error, if there is any. -func (c *FakePartitions) Update(ctx context.Context, partition *v1alpha1.Partition, opts v1.UpdateOptions) (result *v1alpha1.Partition, err error) { - emptyResult := &v1alpha1.Partition{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(partitionsResource, partition, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Partition), err -} - -// Delete takes name of the partition and deletes it. Returns an error if one occurs. -func (c *FakePartitions) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(partitionsResource, name, opts), &v1alpha1.Partition{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakePartitions) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(partitionsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.PartitionList{}) - return err -} - -// Patch applies the patch and returns the patched partition. -func (c *FakePartitions) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Partition, err error) { - emptyResult := &v1alpha1.Partition{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(partitionsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Partition), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied partition. -func (c *FakePartitions) Apply(ctx context.Context, partition *topologyv1alpha1.PartitionApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Partition, err error) { - if partition == nil { - return nil, fmt.Errorf("partition provided to Apply must not be nil") - } - data, err := json.Marshal(partition) - if err != nil { - return nil, err - } - name := partition.Name - if name == nil { - return nil, fmt.Errorf("partition.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Partition{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(partitionsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err +func newFakePartitions(fake *FakeTopologyV1alpha1) typedtopologyv1alpha1.PartitionInterface { + return &fakePartitions{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.Partition, *v1alpha1.PartitionList, *topologyv1alpha1.PartitionApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("partitions"), + v1alpha1.SchemeGroupVersion.WithKind("Partition"), + func() *v1alpha1.Partition { return &v1alpha1.Partition{} }, + func() *v1alpha1.PartitionList { return &v1alpha1.PartitionList{} }, + func(dst, src *v1alpha1.PartitionList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.PartitionList) []*v1alpha1.Partition { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.PartitionList, items []*v1alpha1.Partition) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.Partition), err } 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 60deda2fe73..490c44772d2 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 @@ -19,169 +19,36 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/topology/v1alpha1" + typedtopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/typed/topology/v1alpha1" ) -// FakePartitionSets implements PartitionSetInterface -type FakePartitionSets struct { +// fakePartitionSets implements PartitionSetInterface +type fakePartitionSets struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.PartitionSet, *v1alpha1.PartitionSetList, *topologyv1alpha1.PartitionSetApplyConfiguration] Fake *FakeTopologyV1alpha1 } -var partitionsetsResource = v1alpha1.SchemeGroupVersion.WithResource("partitionsets") - -var partitionsetsKind = v1alpha1.SchemeGroupVersion.WithKind("PartitionSet") - -// Get takes name of the partitionSet, and returns the corresponding partitionSet object, and an error if there is any. -func (c *FakePartitionSets) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PartitionSet, err error) { - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(partitionsetsResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.PartitionSet), err -} - -// List takes label and field selectors, and returns the list of PartitionSets that match those selectors. -func (c *FakePartitionSets) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.PartitionSetList, err error) { - emptyResult := &v1alpha1.PartitionSetList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(partitionsetsResource, partitionsetsKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.PartitionSetList{ListMeta: obj.(*v1alpha1.PartitionSetList).ListMeta} - for _, item := range obj.(*v1alpha1.PartitionSetList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested partitionSets. -func (c *FakePartitionSets) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(partitionsetsResource, opts)) -} - -// Create takes the representation of a partitionSet and creates it. Returns the server's representation of the partitionSet, and an error, if there is any. -func (c *FakePartitionSets) Create(ctx context.Context, partitionSet *v1alpha1.PartitionSet, opts v1.CreateOptions) (result *v1alpha1.PartitionSet, err error) { - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(partitionsetsResource, partitionSet, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.PartitionSet), err -} - -// Update takes the representation of a partitionSet and updates it. Returns the server's representation of the partitionSet, and an error, if there is any. -func (c *FakePartitionSets) Update(ctx context.Context, partitionSet *v1alpha1.PartitionSet, opts v1.UpdateOptions) (result *v1alpha1.PartitionSet, err error) { - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(partitionsetsResource, partitionSet, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.PartitionSet), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakePartitionSets) UpdateStatus(ctx context.Context, partitionSet *v1alpha1.PartitionSet, opts v1.UpdateOptions) (result *v1alpha1.PartitionSet, err error) { - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(partitionsetsResource, "status", partitionSet, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.PartitionSet), err -} - -// Delete takes name of the partitionSet and deletes it. Returns an error if one occurs. -func (c *FakePartitionSets) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(partitionsetsResource, name, opts), &v1alpha1.PartitionSet{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakePartitionSets) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(partitionsetsResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.PartitionSetList{}) - return err -} - -// Patch applies the patch and returns the patched partitionSet. -func (c *FakePartitionSets) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PartitionSet, err error) { - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(partitionsetsResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.PartitionSet), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied partitionSet. -func (c *FakePartitionSets) Apply(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PartitionSet, err error) { - if partitionSet == nil { - return nil, fmt.Errorf("partitionSet provided to Apply must not be nil") - } - data, err := json.Marshal(partitionSet) - if err != nil { - return nil, err - } - name := partitionSet.Name - if name == nil { - return nil, fmt.Errorf("partitionSet.Name must be provided to Apply") - } - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(partitionsetsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.PartitionSet), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakePartitionSets) ApplyStatus(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PartitionSet, err error) { - if partitionSet == nil { - return nil, fmt.Errorf("partitionSet provided to Apply must not be nil") - } - data, err := json.Marshal(partitionSet) - if err != nil { - return nil, err - } - name := partitionSet.Name - if name == nil { - return nil, fmt.Errorf("partitionSet.Name must be provided to Apply") - } - emptyResult := &v1alpha1.PartitionSet{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(partitionsetsResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakePartitionSets(fake *FakeTopologyV1alpha1) typedtopologyv1alpha1.PartitionSetInterface { + return &fakePartitionSets{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.PartitionSet, *v1alpha1.PartitionSetList, *topologyv1alpha1.PartitionSetApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("partitionsets"), + v1alpha1.SchemeGroupVersion.WithKind("PartitionSet"), + func() *v1alpha1.PartitionSet { return &v1alpha1.PartitionSet{} }, + func() *v1alpha1.PartitionSetList { return &v1alpha1.PartitionSetList{} }, + func(dst, src *v1alpha1.PartitionSetList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.PartitionSetList) []*v1alpha1.PartitionSet { + return gentype.ToPointerSlice(list.Items) + }, + func(list *v1alpha1.PartitionSetList, items []*v1alpha1.PartitionSet) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.PartitionSet), err } 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 d4d2dfd4d9a..c19a4219978 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 @@ -30,11 +30,11 @@ type FakeTopologyV1alpha1 struct { } func (c *FakeTopologyV1alpha1) Partitions() v1alpha1.PartitionInterface { - return &FakePartitions{c} + return newFakePartitions(c) } func (c *FakeTopologyV1alpha1) PartitionSets() v1alpha1.PartitionSetInterface { - return &FakePartitionSets{c} + return newFakePartitionSets(c) } // RESTClient returns a RESTClient that is used to communicate diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go index 105c1a55253..6f2f3ca17f1 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partition.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + applyconfigurationtopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/topology/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,32 +39,33 @@ type PartitionsGetter interface { // PartitionInterface has methods to work with Partition resources. type PartitionInterface interface { - Create(ctx context.Context, partition *v1alpha1.Partition, opts v1.CreateOptions) (*v1alpha1.Partition, error) - Update(ctx context.Context, partition *v1alpha1.Partition, opts v1.UpdateOptions) (*v1alpha1.Partition, error) + Create(ctx context.Context, partition *topologyv1alpha1.Partition, opts v1.CreateOptions) (*topologyv1alpha1.Partition, error) + Update(ctx context.Context, partition *topologyv1alpha1.Partition, opts v1.UpdateOptions) (*topologyv1alpha1.Partition, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Partition, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.PartitionList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*topologyv1alpha1.Partition, error) + List(ctx context.Context, opts v1.ListOptions) (*topologyv1alpha1.PartitionList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Partition, err error) - Apply(ctx context.Context, partition *topologyv1alpha1.PartitionApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Partition, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *topologyv1alpha1.Partition, err error) + Apply(ctx context.Context, partition *applyconfigurationtopologyv1alpha1.PartitionApplyConfiguration, opts v1.ApplyOptions) (result *topologyv1alpha1.Partition, err error) PartitionExpansion } // partitions implements PartitionInterface type partitions struct { - *gentype.ClientWithListAndApply[*v1alpha1.Partition, *v1alpha1.PartitionList, *topologyv1alpha1.PartitionApplyConfiguration] + *gentype.ClientWithListAndApply[*topologyv1alpha1.Partition, *topologyv1alpha1.PartitionList, *applyconfigurationtopologyv1alpha1.PartitionApplyConfiguration] } // newPartitions returns a Partitions func newPartitions(c *TopologyV1alpha1Client) *partitions { return &partitions{ - gentype.NewClientWithListAndApply[*v1alpha1.Partition, *v1alpha1.PartitionList, *topologyv1alpha1.PartitionApplyConfiguration]( + gentype.NewClientWithListAndApply[*topologyv1alpha1.Partition, *topologyv1alpha1.PartitionList, *applyconfigurationtopologyv1alpha1.PartitionApplyConfiguration]( "partitions", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.Partition { return &v1alpha1.Partition{} }, - func() *v1alpha1.PartitionList { return &v1alpha1.PartitionList{} }), + func() *topologyv1alpha1.Partition { return &topologyv1alpha1.Partition{} }, + func() *topologyv1alpha1.PartitionList { return &topologyv1alpha1.PartitionList{} }, + ), } } diff --git a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go index 748c368ca37..cf592287e65 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/partitionset.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" - topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/topology/v1alpha1" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + applyconfigurationtopologyv1alpha1 "github.com/kcp-dev/kcp/sdk/client/applyconfiguration/topology/v1alpha1" scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type PartitionSetsGetter interface { // PartitionSetInterface has methods to work with PartitionSet resources. type PartitionSetInterface interface { - Create(ctx context.Context, partitionSet *v1alpha1.PartitionSet, opts v1.CreateOptions) (*v1alpha1.PartitionSet, error) - Update(ctx context.Context, partitionSet *v1alpha1.PartitionSet, opts v1.UpdateOptions) (*v1alpha1.PartitionSet, error) + Create(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSet, opts v1.CreateOptions) (*topologyv1alpha1.PartitionSet, error) + Update(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSet, opts v1.UpdateOptions) (*topologyv1alpha1.PartitionSet, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, partitionSet *v1alpha1.PartitionSet, opts v1.UpdateOptions) (*v1alpha1.PartitionSet, error) + UpdateStatus(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSet, opts v1.UpdateOptions) (*topologyv1alpha1.PartitionSet, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.PartitionSet, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.PartitionSetList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*topologyv1alpha1.PartitionSet, error) + List(ctx context.Context, opts v1.ListOptions) (*topologyv1alpha1.PartitionSetList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.PartitionSet, err error) - Apply(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PartitionSet, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *topologyv1alpha1.PartitionSet, err error) + Apply(ctx context.Context, partitionSet *applyconfigurationtopologyv1alpha1.PartitionSetApplyConfiguration, opts v1.ApplyOptions) (result *topologyv1alpha1.PartitionSet, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, partitionSet *topologyv1alpha1.PartitionSetApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.PartitionSet, err error) + ApplyStatus(ctx context.Context, partitionSet *applyconfigurationtopologyv1alpha1.PartitionSetApplyConfiguration, opts v1.ApplyOptions) (result *topologyv1alpha1.PartitionSet, err error) PartitionSetExpansion } // partitionSets implements PartitionSetInterface type partitionSets struct { - *gentype.ClientWithListAndApply[*v1alpha1.PartitionSet, *v1alpha1.PartitionSetList, *topologyv1alpha1.PartitionSetApplyConfiguration] + *gentype.ClientWithListAndApply[*topologyv1alpha1.PartitionSet, *topologyv1alpha1.PartitionSetList, *applyconfigurationtopologyv1alpha1.PartitionSetApplyConfiguration] } // newPartitionSets returns a PartitionSets func newPartitionSets(c *TopologyV1alpha1Client) *partitionSets { return &partitionSets{ - gentype.NewClientWithListAndApply[*v1alpha1.PartitionSet, *v1alpha1.PartitionSetList, *topologyv1alpha1.PartitionSetApplyConfiguration]( + gentype.NewClientWithListAndApply[*topologyv1alpha1.PartitionSet, *topologyv1alpha1.PartitionSetList, *applyconfigurationtopologyv1alpha1.PartitionSetApplyConfiguration]( "partitionsets", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.PartitionSet { return &v1alpha1.PartitionSet{} }, - func() *v1alpha1.PartitionSetList { return &v1alpha1.PartitionSetList{} }), + func() *topologyv1alpha1.PartitionSet { return &topologyv1alpha1.PartitionSet{} }, + func() *topologyv1alpha1.PartitionSetList { return &topologyv1alpha1.PartitionSetList{} }, + ), } } 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 e889c860d07..810db761800 100644 --- a/sdk/client/clientset/versioned/typed/topology/v1alpha1/topology_client.go +++ b/sdk/client/clientset/versioned/typed/topology/v1alpha1/topology_client.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" - "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" + topologyv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/topology/v1alpha1" + scheme "github.com/kcp-dev/kcp/sdk/client/clientset/versioned/scheme" ) type TopologyV1alpha1Interface interface { @@ -91,10 +91,10 @@ func New(c rest.Interface) *TopologyV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := topologyv1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/sdk/client/informers/externalversions/apis/interface.go b/sdk/client/informers/externalversions/apis/interface.go index 932bdcf526f..7ef946ddcb7 100644 --- a/sdk/client/informers/externalversions/apis/interface.go +++ b/sdk/client/informers/externalversions/apis/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go b/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go index eb86a83ae04..62647dee9cf 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apibinding.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go index 7bd469b1680..6cf170febaa 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiconversion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go index 53bbe245c8e..9ab427332d5 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiexport.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go index 9c19d8bfd05..657ea0282bb 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiexportendpointslice.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go b/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go index 656e8aa4c24..dc914021179 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/apiresourceschema.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/apis/v1alpha1/interface.go b/sdk/client/informers/externalversions/apis/v1alpha1/interface.go index d93c4a164a2..23c5e76d9e7 100644 --- a/sdk/client/informers/externalversions/apis/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/apis/v1alpha1/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/core/interface.go b/sdk/client/informers/externalversions/core/interface.go index 96980b60273..5ab83f24247 100644 --- a/sdk/client/informers/externalversions/core/interface.go +++ b/sdk/client/informers/externalversions/core/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/core/v1alpha1/interface.go b/sdk/client/informers/externalversions/core/v1alpha1/interface.go index c3281eac3ff..0241505f23f 100644 --- a/sdk/client/informers/externalversions/core/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/core/v1alpha1/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go b/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go index 33c819a370f..440a3b90bb1 100644 --- a/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go +++ b/sdk/client/informers/externalversions/core/v1alpha1/logicalcluster.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/core/v1alpha1/shard.go b/sdk/client/informers/externalversions/core/v1alpha1/shard.go index 250ff9660d0..f48c5c9e16d 100644 --- a/sdk/client/informers/externalversions/core/v1alpha1/shard.go +++ b/sdk/client/informers/externalversions/core/v1alpha1/shard.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/factory.go b/sdk/client/informers/externalversions/factory.go index d5683291791..59bd0a176c1 100644 --- a/sdk/client/informers/externalversions/factory.go +++ b/sdk/client/informers/externalversions/factory.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/generic.go b/sdk/client/informers/externalversions/generic.go index 82275753ad4..1b659ed1716 100644 --- a/sdk/client/informers/externalversions/generic.go +++ b/sdk/client/informers/externalversions/generic.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 3de2708b726..5df644785d4 100644 --- a/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/sdk/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/tenancy/interface.go b/sdk/client/informers/externalversions/tenancy/interface.go index fe93782e9e5..3a4d6fd74f6 100644 --- a/sdk/client/informers/externalversions/tenancy/interface.go +++ b/sdk/client/informers/externalversions/tenancy/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go b/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go index ef00dd0d151..ebea4cac237 100644 --- a/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/tenancy/v1alpha1/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go index 482ceb9c8b2..c702c5c0087 100644 --- a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go +++ b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspace.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go index e7e58a20c2c..3d70e2e7582 100644 --- a/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/informers/externalversions/tenancy/v1alpha1/workspacetype.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/topology/interface.go b/sdk/client/informers/externalversions/topology/interface.go index a35a7580843..ba7d1d60548 100644 --- a/sdk/client/informers/externalversions/topology/interface.go +++ b/sdk/client/informers/externalversions/topology/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/topology/v1alpha1/interface.go b/sdk/client/informers/externalversions/topology/v1alpha1/interface.go index d17449ff093..43a975bf893 100644 --- a/sdk/client/informers/externalversions/topology/v1alpha1/interface.go +++ b/sdk/client/informers/externalversions/topology/v1alpha1/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/topology/v1alpha1/partition.go b/sdk/client/informers/externalversions/topology/v1alpha1/partition.go index a7d498049b3..d8e78bee1fc 100644 --- a/sdk/client/informers/externalversions/topology/v1alpha1/partition.go +++ b/sdk/client/informers/externalversions/topology/v1alpha1/partition.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go b/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go index 3a3b17e5cec..3fbbfb092db 100644 --- a/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go +++ b/sdk/client/informers/externalversions/topology/v1alpha1/partitionset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/apis/v1alpha1/apibinding.go b/sdk/client/listers/apis/v1alpha1/apibinding.go index 31a29a077a1..118bfc10d9e 100644 --- a/sdk/client/listers/apis/v1alpha1/apibinding.go +++ b/sdk/client/listers/apis/v1alpha1/apibinding.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/apis/v1alpha1/apiconversion.go b/sdk/client/listers/apis/v1alpha1/apiconversion.go index 182f64654b9..12e6fa35867 100644 --- a/sdk/client/listers/apis/v1alpha1/apiconversion.go +++ b/sdk/client/listers/apis/v1alpha1/apiconversion.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/apis/v1alpha1/apiexport.go b/sdk/client/listers/apis/v1alpha1/apiexport.go index 8200e9d0ee3..eca7aa8aaf7 100644 --- a/sdk/client/listers/apis/v1alpha1/apiexport.go +++ b/sdk/client/listers/apis/v1alpha1/apiexport.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go b/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go index 4ef6f05850e..8e6753d2cc6 100644 --- a/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go +++ b/sdk/client/listers/apis/v1alpha1/apiexportendpointslice.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/apis/v1alpha1/apiresourceschema.go b/sdk/client/listers/apis/v1alpha1/apiresourceschema.go index 4f7226cf77d..fa5190e18cd 100644 --- a/sdk/client/listers/apis/v1alpha1/apiresourceschema.go +++ b/sdk/client/listers/apis/v1alpha1/apiresourceschema.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/core/v1alpha1/logicalcluster.go b/sdk/client/listers/core/v1alpha1/logicalcluster.go index 09cf653f867..380be262b14 100644 --- a/sdk/client/listers/core/v1alpha1/logicalcluster.go +++ b/sdk/client/listers/core/v1alpha1/logicalcluster.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/core/v1alpha1/shard.go b/sdk/client/listers/core/v1alpha1/shard.go index 657c4359ea7..6647dbc53a5 100644 --- a/sdk/client/listers/core/v1alpha1/shard.go +++ b/sdk/client/listers/core/v1alpha1/shard.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/tenancy/v1alpha1/workspace.go b/sdk/client/listers/tenancy/v1alpha1/workspace.go index ace4808b8e1..28ae84937ed 100644 --- a/sdk/client/listers/tenancy/v1alpha1/workspace.go +++ b/sdk/client/listers/tenancy/v1alpha1/workspace.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/tenancy/v1alpha1/workspacetype.go b/sdk/client/listers/tenancy/v1alpha1/workspacetype.go index 685cbe874bb..4eac9d89ca7 100644 --- a/sdk/client/listers/tenancy/v1alpha1/workspacetype.go +++ b/sdk/client/listers/tenancy/v1alpha1/workspacetype.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/topology/v1alpha1/partition.go b/sdk/client/listers/topology/v1alpha1/partition.go index 0e95b71f301..3e00b36ded0 100644 --- a/sdk/client/listers/topology/v1alpha1/partition.go +++ b/sdk/client/listers/topology/v1alpha1/partition.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/client/listers/topology/v1alpha1/partitionset.go b/sdk/client/listers/topology/v1alpha1/partitionset.go index 7083d335f30..756f7caf9ae 100644 --- a/sdk/client/listers/topology/v1alpha1/partitionset.go +++ b/sdk/client/listers/topology/v1alpha1/partitionset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/sdk/go.mod b/sdk/go.mod index 2d251f037ae..88873fcf99e 100644 --- a/sdk/go.mod +++ b/sdk/go.mod @@ -1,35 +1,36 @@ module github.com/kcp-dev/kcp/sdk -go 1.22.0 +go 1.23.0 require ( github.com/MakeNowJust/heredoc v1.0.0 github.com/bombsimon/logrusr/v3 v3.1.0 github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 - github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb - github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e + github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 + github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861 github.com/kcp-dev/logicalcluster/v3 v3.0.5 github.com/muesli/reflow v0.3.0 - github.com/onsi/gomega v1.33.1 + github.com/onsi/gomega v1.35.1 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 - github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace - github.com/stretchr/testify v1.9.0 - k8s.io/api v0.31.0 - k8s.io/apiextensions-apiserver v0.31.0 - k8s.io/apimachinery v0.31.0 - k8s.io/apiserver v0.31.0 - k8s.io/client-go v0.31.0 - k8s.io/component-base v0.31.0 - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 + github.com/spf13/pflag v1.0.6 + github.com/stretchr/testify v1.10.0 + k8s.io/api v0.32.0 + k8s.io/apiextensions-apiserver v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/apiserver v0.32.0 + k8s.io/client-go v0.32.0 + k8s.io/component-base v0.32.0 + sigs.k8s.io/structured-merge-diff/v4 v4.5.0 sigs.k8s.io/yaml v1.4.0 ) require ( - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + cel.dev/expr v0.19.1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect - github.com/antlr4-go/antlr/v4 v4.13.0 // indirect + github.com/antlr4-go/antlr/v4 v4.13.1 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect @@ -38,29 +39,30 @@ require ( github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.4 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/cel-go v0.20.1 // indirect - github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/cel-go v0.22.1 // indirect + github.com/google/gnostic-models v0.6.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect - github.com/imdario/mergo v0.3.12 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect github.com/inconshreveable/mousetrap v1.1.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/klauspost/compress v1.17.11 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/mailru/easyjson v0.9.0 // indirect github.com/mattn/go-runewidth v0.0.12 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect @@ -68,47 +70,47 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_golang v1.20.5 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/stoewer/go-strcase v1.2.0 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect github.com/x448/float16 v0.8.4 // indirect - go.etcd.io/etcd/api/v3 v3.5.14 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect - go.etcd.io/etcd/client/v3 v3.5.14 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect + go.etcd.io/etcd/api/v3 v3.5.17 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect + go.etcd.io/etcd/client/v3 v3.5.17 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect + go.opentelemetry.io/otel v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect + go.opentelemetry.io/otel/metric v1.34.0 // indirect + go.opentelemetry.io/otel/sdk v1.34.0 // indirect + go.opentelemetry.io/otel/trace v1.34.0 // indirect + go.opentelemetry.io/proto/otlp v1.5.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.26.0 // indirect - golang.org/x/crypto v0.31.0 // indirect - golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.33.0 // indirect - golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect - golang.org/x/time v0.3.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect - google.golang.org/grpc v1.65.0 // indirect - google.golang.org/protobuf v1.34.2 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/crypto v0.33.0 // indirect + golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect + golang.org/x/net v0.35.0 // indirect + golang.org/x/oauth2 v0.26.0 // indirect + golang.org/x/sync v0.11.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/term v0.29.0 // indirect + golang.org/x/text v0.22.0 // indirect + golang.org/x/time v0.10.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect + google.golang.org/grpc v1.70.0 // indirect + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect + k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect ) diff --git a/sdk/go.sum b/sdk/go.sum index c5e2396626e..698a482867c 100644 --- a/sdk/go.sum +++ b/sdk/go.sum @@ -1,11 +1,13 @@ -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= +cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= -github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= -github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= +github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ= +github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -23,7 +25,6 @@ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03V github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -32,8 +33,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= -github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= 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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= @@ -49,13 +50,12 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= -github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -63,24 +63,22 @@ github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= -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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.20.1 h1:nDx9r8S3L4pE61eDdt8igGj8rf5kjYR3ILxWIpWNi84= -github.com/google/cel-go v0.20.1/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u4dOYLg= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.22.1 h1:AfVXx3chM2qwoSbM7Da8g8hX8OVSkBFwX+rz2+PcK40= +github.com/google/cel-go v0.22.1/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= +github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= +github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= -github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= @@ -91,35 +89,34 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92Bcuy github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= 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/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= -github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= -github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jonboulle/clockwork v0.4.0 h1:p4Cf1aMWXnXAUh8lVfewRBx1zaTSYKrKMF2g3ST4RZ4= +github.com/jonboulle/clockwork v0.4.0/go.mod h1:xgRqUGwRcjKCO1vbZUEtSLrqKoPSsUpK7fnezOII0kc= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb h1:W11F/dp6NdUnHeB0SrpyWLiifRosu1qaMJvdFGGLXc0= -github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20240817110845-a9eb9752bfeb/go.mod h1:mEDD1K5BVUXJ4CP6wcJ0vZUf+7tbFMjkCFzBKsUNj18= -github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e h1:9wOMy1qKXpefpW28vccGEX3o/IaoDu3PZSqDeaz1p8k= -github.com/kcp-dev/client-go v0.0.0-20240903163341-318c14d7636e/go.mod h1:GZTo7YtdO7PJ6VwWjKUiby5WjNh7YQZieDqNvbSHd0U= +github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2 h1:6MeV6CBJhNxF3DhkdwhcqeyEc8Al2MGeKFNA0O95icc= +github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250207161408-e1833e4a94f2/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA= +github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861 h1:Wzb0BaJPK3vMU7HSkGGprs7fJSB90o2d8coj2S2xP0Q= +github.com/kcp-dev/client-go v0.0.0-20250210163812-5ae6774ab861/go.mod h1:RRScyGU72S5wVJDBWxcANmxgx723N/Eb4XqEF4655wI= github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU= github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow= github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= @@ -133,28 +130,28 @@ github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= +github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= @@ -163,126 +160,129 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= -github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -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/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/objx v0.1.0/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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE= github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 h1:S2dVYn90KE98chqDkyE9Z4N61UnQd+KOfgp5Iu53llk= +github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.9 h1:8x7aARPEXiXbHmtUwAIv7eV2fQFHrLLavdiJ3uzJXoI= -go.etcd.io/bbolt v1.3.9/go.mod h1:zaO32+Ti0PK1ivdPtgMESzuzL2VPoIG1PCQNvOdo/dE= -go.etcd.io/etcd/api/v3 v3.5.14 h1:vHObSCxyB9zlF60w7qzAdTcGaglbJOpSj1Xj9+WGxq0= -go.etcd.io/etcd/api/v3 v3.5.14/go.mod h1:BmtWcRlQvwa1h3G2jvKYwIQy4PkHlDej5t7uLMUdJUU= -go.etcd.io/etcd/client/pkg/v3 v3.5.14 h1:SaNH6Y+rVEdxfpA2Jr5wkEvN6Zykme5+YnbCkxvuWxQ= -go.etcd.io/etcd/client/pkg/v3 v3.5.14/go.mod h1:8uMgAokyG1czCtIdsq+AGyYQMvpIKnSvPjFMunkgeZI= -go.etcd.io/etcd/client/v2 v2.305.13 h1:RWfV1SX5jTU0lbCvpVQe3iPQeAHETWdOTb6pxhd77C8= -go.etcd.io/etcd/client/v2 v2.305.13/go.mod h1:iQnL7fepbiomdXMb3om1rHq96htNNGv2sJkEcZGDRRg= -go.etcd.io/etcd/client/v3 v3.5.14 h1:CWfRs4FDaDoSz81giL7zPpZH2Z35tbOrAJkkjMqOupg= -go.etcd.io/etcd/client/v3 v3.5.14/go.mod h1:k3XfdV/VIHy/97rqWjoUzrj9tk7GgJGH9J8L4dNXmAk= -go.etcd.io/etcd/pkg/v3 v3.5.13 h1:st9bDWNsKkBNpP4PR1MvM/9NqUPfvYZx/YXegsYEH8M= -go.etcd.io/etcd/pkg/v3 v3.5.13/go.mod h1:N+4PLrp7agI/Viy+dUYpX7iRtSPvKq+w8Y14d1vX+m0= -go.etcd.io/etcd/raft/v3 v3.5.13 h1:7r/NKAOups1YnKcfro2RvGGo2PTuizF/xh26Z2CTAzA= -go.etcd.io/etcd/raft/v3 v3.5.13/go.mod h1:uUFibGLn2Ksm2URMxN1fICGhk8Wu96EfDQyuLhAcAmw= -go.etcd.io/etcd/server/v3 v3.5.13 h1:V6KG+yMfMSqWt+lGnhFpP5z5dRUj1BDRJ5k1fQ9DFok= -go.etcd.io/etcd/server/v3 v3.5.13/go.mod h1:K/8nbsGupHqmr5MkgaZpLlH1QdX1pcNQLAkODy44XcQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= +go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= +go.etcd.io/etcd/api/v3 v3.5.17 h1:cQB8eb8bxwuxOilBpMJAEo8fAONyrdXTHUNcMd8yT1w= +go.etcd.io/etcd/api/v3 v3.5.17/go.mod h1:d1hvkRuXkts6PmaYk2Vrgqbv7H4ADfAKhyJqHNLJCB4= +go.etcd.io/etcd/client/pkg/v3 v3.5.17 h1:XxnDXAWq2pnxqx76ljWwiQ9jylbpC4rvkAeRVOUKKVw= +go.etcd.io/etcd/client/pkg/v3 v3.5.17/go.mod h1:4DqK1TKacp/86nJk4FLQqo6Mn2vvQFBmruW3pP14H/w= +go.etcd.io/etcd/client/v2 v2.305.16 h1:kQrn9o5czVNaukf2A2At43cE9ZtWauOtf9vRZuiKXow= +go.etcd.io/etcd/client/v2 v2.305.16/go.mod h1:h9YxWCzcdvZENbfzBTFCnoNumr2ax3F19sKMqHFmXHE= +go.etcd.io/etcd/client/v3 v3.5.17 h1:o48sINNeWz5+pjy/Z0+HKpj/xSnBkuVhVvXkjEXbqZY= +go.etcd.io/etcd/client/v3 v3.5.17/go.mod h1:j2d4eXTHWkT2ClBgnnEPm/Wuu7jsqku41v9DZ3OtjQo= +go.etcd.io/etcd/pkg/v3 v3.5.16 h1:cnavs5WSPWeK4TYwPYfmcr3Joz9BH+TZ6qoUtz6/+mc= +go.etcd.io/etcd/pkg/v3 v3.5.16/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= +go.etcd.io/etcd/raft/v3 v3.5.16 h1:zBXA3ZUpYs1AwiLGPafYAKKl/CORn/uaxYDwlNwndAk= +go.etcd.io/etcd/raft/v3 v3.5.16/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= +go.etcd.io/etcd/server/v3 v3.5.16 h1:d0/SAdJ3vVsZvF8IFVb1k8zqMZ+heGcNfft71ul9GWE= +go.etcd.io/etcd/server/v3 v3.5.16/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I= +go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= +go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE= +go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= +go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= +go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= +go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= +go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4= +go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= -go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= -golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE= +golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= -golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4= +golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY= -google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 h1:7whR9kGa5LUwFtpLm2ArCEejtnxlGeLbAyjFY8sGNFw= -google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157/go.mod h1:99sLkeliLXfdj2J75X3Ho+rrVCaJze0uwN7zDDkjPVU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6 h1:L9JNMl/plZH9wmzQUHleO/ZZDSN+9Gh41wPczNy+5Fk= +google.golang.org/genproto/googleapis/api v0.0.0-20250207221924-e9438ea467c6/go.mod h1:iYONQfRdizDB8JJBybql13nArx91jcUk7zCXEsOofM4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 h1:2duwAxN2+k0xLNpjnHTXoMUgnv6VPSp5fiqTuwSxjmI= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6/go.mod h1:8BS3B93F/U1juMFq9+EDk+qOT5CO1R9IzXxG3PTqiRk= +google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= +google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -292,39 +292,34 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.0 h1:b9LiSjR2ym/SzTOlfMHm1tr7/21aD7fSkqgD/CVJBCo= -k8s.io/api v0.31.0/go.mod h1:0YiFF+JfFxMM6+1hQei8FY8M7s1Mth+z/q7eF1aJkTE= -k8s.io/apiextensions-apiserver v0.31.0 h1:fZgCVhGwsclj3qCw1buVXCV6khjRzKC5eCFt24kyLSk= -k8s.io/apiextensions-apiserver v0.31.0/go.mod h1:b9aMDEYaEe5sdK+1T0KU78ApR/5ZVp4i56VacZYEHxk= -k8s.io/apimachinery v0.31.0 h1:m9jOiSr3FoSSL5WO9bjm1n6B9KROYYgNZOb4tyZ1lBc= -k8s.io/apimachinery v0.31.0/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/apiserver v0.31.0 h1:p+2dgJjy+bk+B1Csz+mc2wl5gHwvNkC9QJV+w55LVrY= -k8s.io/apiserver v0.31.0/go.mod h1:KI9ox5Yu902iBnnyMmy7ajonhKnkeZYJhTZ/YI+WEMk= -k8s.io/client-go v0.31.0 h1:QqEJzNjbN2Yv1H79SsS+SWnXkBgVu4Pj3CJQgbx0gI8= -k8s.io/client-go v0.31.0/go.mod h1:Y9wvC76g4fLjmU0BA+rV+h2cncoadjvjjkkIGoTLcGU= -k8s.io/component-base v0.31.0 h1:/KIzGM5EvPNQcYgwq5NwoQBaOlVFrghoVGr8lG6vNRs= -k8s.io/component-base v0.31.0/go.mod h1:TYVuzI1QmN4L5ItVdMSXKvH7/DtvIuas5/mm8YT3rTo= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= +k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= +k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs= +k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU= +k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.31.0 h1:KchILPfB1ZE+ka7223mpU5zeFNkmb45jl7RHnlImUaI= -k8s.io/kms v0.31.0/go.mod h1:OZKwl1fan3n3N5FFxnW5C4V3ygrah/3YXeJWS3O6+94= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= -k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +k8s.io/kms v0.32.0 h1:jwOfunHIrcdYl5FRcA+uUKKtg6qiqoPCwmS2T3XTYL4= +k8s.io/kms v0.32.0/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg= +k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk= +sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/internal/internal.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/internal/internal.go index 1bcc7002d26..86ad90aa9fd 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/internal/internal.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/internal/internal.go @@ -19,8 +19,8 @@ limitations under the License. package internal import ( - "fmt" - "sync" + fmt "fmt" + sync "sync" typed "sigs.k8s.io/structured-merge-diff/v4/typed" ) diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/condition.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/condition.go index 823954bdd16..40f8af37f48 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/condition.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/condition.go @@ -19,18 +19,18 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // ConditionApplyConfiguration represents a declarative configuration of the Condition type for use // with apply. type ConditionApplyConfiguration struct { - Type *string `json:"type,omitempty"` - Status *v1.ConditionStatus `json:"status,omitempty"` - ObservedGeneration *int64 `json:"observedGeneration,omitempty"` - LastTransitionTime *v1.Time `json:"lastTransitionTime,omitempty"` - Reason *string `json:"reason,omitempty"` - Message *string `json:"message,omitempty"` + Type *string `json:"type,omitempty"` + Status *metav1.ConditionStatus `json:"status,omitempty"` + ObservedGeneration *int64 `json:"observedGeneration,omitempty"` + LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty"` + Reason *string `json:"reason,omitempty"` + Message *string `json:"message,omitempty"` } // ConditionApplyConfiguration constructs a declarative configuration of the Condition type for use with @@ -50,7 +50,7 @@ func (b *ConditionApplyConfiguration) WithType(value string) *ConditionApplyConf // WithStatus sets the Status field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Status field is set to the value of the last call. -func (b *ConditionApplyConfiguration) WithStatus(value v1.ConditionStatus) *ConditionApplyConfiguration { +func (b *ConditionApplyConfiguration) WithStatus(value metav1.ConditionStatus) *ConditionApplyConfiguration { b.Status = &value return b } @@ -66,7 +66,7 @@ func (b *ConditionApplyConfiguration) WithObservedGeneration(value int64) *Condi // WithLastTransitionTime sets the LastTransitionTime field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the LastTransitionTime field is set to the value of the last call. -func (b *ConditionApplyConfiguration) WithLastTransitionTime(value v1.Time) *ConditionApplyConfiguration { +func (b *ConditionApplyConfiguration) WithLastTransitionTime(value metav1.Time) *ConditionApplyConfiguration { b.LastTransitionTime = &value return b } diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/deleteoptions.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/deleteoptions.go index e5135adb4e7..6d3742f2683 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/deleteoptions.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/deleteoptions.go @@ -25,12 +25,13 @@ import ( // DeleteOptionsApplyConfiguration represents a declarative configuration of the DeleteOptions type for use // with apply. type DeleteOptionsApplyConfiguration struct { - TypeMetaApplyConfiguration `json:",inline"` - GracePeriodSeconds *int64 `json:"gracePeriodSeconds,omitempty"` - Preconditions *metav1.Preconditions `json:"preconditions,omitempty"` - OrphanDependents *bool `json:"orphanDependents,omitempty"` - PropagationPolicy *metav1.DeletionPropagation `json:"propagationPolicy,omitempty"` - DryRun []string `json:"dryRun,omitempty"` + TypeMetaApplyConfiguration `json:",inline"` + GracePeriodSeconds *int64 `json:"gracePeriodSeconds,omitempty"` + Preconditions *metav1.Preconditions `json:"preconditions,omitempty"` + OrphanDependents *bool `json:"orphanDependents,omitempty"` + PropagationPolicy *metav1.DeletionPropagation `json:"propagationPolicy,omitempty"` + DryRun []string `json:"dryRun,omitempty"` + IgnoreStoreReadErrorWithClusterBreakingPotential *bool `json:"ignoreStoreReadErrorWithClusterBreakingPotential,omitempty"` } // DeleteOptionsApplyConfiguration constructs a declarative configuration of the DeleteOptions type for use with @@ -46,7 +47,7 @@ func DeleteOptions() *DeleteOptionsApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *DeleteOptionsApplyConfiguration) WithKind(value string) *DeleteOptionsApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -54,7 +55,7 @@ func (b *DeleteOptionsApplyConfiguration) WithKind(value string) *DeleteOptionsA // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *DeleteOptionsApplyConfiguration) WithAPIVersion(value string) *DeleteOptionsApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -99,3 +100,11 @@ func (b *DeleteOptionsApplyConfiguration) WithDryRun(values ...string) *DeleteOp } return b } + +// WithIgnoreStoreReadErrorWithClusterBreakingPotential sets the IgnoreStoreReadErrorWithClusterBreakingPotential field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the IgnoreStoreReadErrorWithClusterBreakingPotential field is set to the value of the last call. +func (b *DeleteOptionsApplyConfiguration) WithIgnoreStoreReadErrorWithClusterBreakingPotential(value bool) *DeleteOptionsApplyConfiguration { + b.IgnoreStoreReadErrorWithClusterBreakingPotential = &value + return b +} diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselector.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselector.go index 47dcc5de090..e93850b3331 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselector.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselector.go @@ -19,14 +19,14 @@ limitations under the License. package v1 import ( - v1 "k8s.io/client-go/applyconfigurations/meta/v1" + metav1 "k8s.io/client-go/applyconfigurations/meta/v1" ) // LabelSelectorApplyConfiguration represents a declarative configuration of the LabelSelector type for use // with apply. type LabelSelectorApplyConfiguration struct { - MatchLabels map[string]string `json:"matchLabels,omitempty"` - MatchExpressions []v1.LabelSelectorRequirementApplyConfiguration `json:"matchExpressions,omitempty"` + MatchLabels map[string]string `json:"matchLabels,omitempty"` + MatchExpressions []metav1.LabelSelectorRequirementApplyConfiguration `json:"matchExpressions,omitempty"` } // LabelSelectorApplyConfiguration constructs a declarative configuration of the LabelSelector type for use with @@ -52,7 +52,7 @@ func (b *LabelSelectorApplyConfiguration) WithMatchLabels(entries map[string]str // WithMatchExpressions adds the given value to the MatchExpressions field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the MatchExpressions field. -func (b *LabelSelectorApplyConfiguration) WithMatchExpressions(values ...*v1.LabelSelectorRequirementApplyConfiguration) *LabelSelectorApplyConfiguration { +func (b *LabelSelectorApplyConfiguration) WithMatchExpressions(values ...*metav1.LabelSelectorRequirementApplyConfiguration) *LabelSelectorApplyConfiguration { for i := range values { if values[i] == nil { panic("nil value passed to WithMatchExpressions") diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselectorrequirement.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselectorrequirement.go index 4da2259b1f6..d77ea39305c 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselectorrequirement.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/labelselectorrequirement.go @@ -19,15 +19,15 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // LabelSelectorRequirementApplyConfiguration represents a declarative configuration of the LabelSelectorRequirement type for use // with apply. type LabelSelectorRequirementApplyConfiguration struct { - Key *string `json:"key,omitempty"` - Operator *v1.LabelSelectorOperator `json:"operator,omitempty"` - Values []string `json:"values,omitempty"` + Key *string `json:"key,omitempty"` + Operator *metav1.LabelSelectorOperator `json:"operator,omitempty"` + Values []string `json:"values,omitempty"` } // LabelSelectorRequirementApplyConfiguration constructs a declarative configuration of the LabelSelectorRequirement type for use with @@ -47,7 +47,7 @@ func (b *LabelSelectorRequirementApplyConfiguration) WithKey(value string) *Labe // WithOperator sets the Operator field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Operator field is set to the value of the last call. -func (b *LabelSelectorRequirementApplyConfiguration) WithOperator(value v1.LabelSelectorOperator) *LabelSelectorRequirementApplyConfiguration { +func (b *LabelSelectorRequirementApplyConfiguration) WithOperator(value metav1.LabelSelectorOperator) *LabelSelectorRequirementApplyConfiguration { b.Operator = &value return b } diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/managedfieldsentry.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/managedfieldsentry.go index 87bf99be61f..efdd7a58fd0 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/managedfieldsentry.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/managedfieldsentry.go @@ -19,19 +19,19 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // ManagedFieldsEntryApplyConfiguration represents a declarative configuration of the ManagedFieldsEntry type for use // with apply. type ManagedFieldsEntryApplyConfiguration struct { - Manager *string `json:"manager,omitempty"` - Operation *v1.ManagedFieldsOperationType `json:"operation,omitempty"` - APIVersion *string `json:"apiVersion,omitempty"` - Time *v1.Time `json:"time,omitempty"` - FieldsType *string `json:"fieldsType,omitempty"` - FieldsV1 *v1.FieldsV1 `json:"fieldsV1,omitempty"` - Subresource *string `json:"subresource,omitempty"` + Manager *string `json:"manager,omitempty"` + Operation *metav1.ManagedFieldsOperationType `json:"operation,omitempty"` + APIVersion *string `json:"apiVersion,omitempty"` + Time *metav1.Time `json:"time,omitempty"` + FieldsType *string `json:"fieldsType,omitempty"` + FieldsV1 *metav1.FieldsV1 `json:"fieldsV1,omitempty"` + Subresource *string `json:"subresource,omitempty"` } // ManagedFieldsEntryApplyConfiguration constructs a declarative configuration of the ManagedFieldsEntry type for use with @@ -51,7 +51,7 @@ func (b *ManagedFieldsEntryApplyConfiguration) WithManager(value string) *Manage // WithOperation sets the Operation field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Operation field is set to the value of the last call. -func (b *ManagedFieldsEntryApplyConfiguration) WithOperation(value v1.ManagedFieldsOperationType) *ManagedFieldsEntryApplyConfiguration { +func (b *ManagedFieldsEntryApplyConfiguration) WithOperation(value metav1.ManagedFieldsOperationType) *ManagedFieldsEntryApplyConfiguration { b.Operation = &value return b } @@ -67,7 +67,7 @@ func (b *ManagedFieldsEntryApplyConfiguration) WithAPIVersion(value string) *Man // WithTime sets the Time field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Time field is set to the value of the last call. -func (b *ManagedFieldsEntryApplyConfiguration) WithTime(value v1.Time) *ManagedFieldsEntryApplyConfiguration { +func (b *ManagedFieldsEntryApplyConfiguration) WithTime(value metav1.Time) *ManagedFieldsEntryApplyConfiguration { b.Time = &value return b } @@ -83,7 +83,7 @@ func (b *ManagedFieldsEntryApplyConfiguration) WithFieldsType(value string) *Man // WithFieldsV1 sets the FieldsV1 field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the FieldsV1 field is set to the value of the last call. -func (b *ManagedFieldsEntryApplyConfiguration) WithFieldsV1(value v1.FieldsV1) *ManagedFieldsEntryApplyConfiguration { +func (b *ManagedFieldsEntryApplyConfiguration) WithFieldsV1(value metav1.FieldsV1) *ManagedFieldsEntryApplyConfiguration { b.FieldsV1 = &value return b } diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/objectmeta.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/objectmeta.go index 6b416cdaa7a..38633e00884 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/objectmeta.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/meta/v1/objectmeta.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" ) @@ -32,8 +32,8 @@ type ObjectMetaApplyConfiguration struct { UID *types.UID `json:"uid,omitempty"` ResourceVersion *string `json:"resourceVersion,omitempty"` Generation *int64 `json:"generation,omitempty"` - CreationTimestamp *v1.Time `json:"creationTimestamp,omitempty"` - DeletionTimestamp *v1.Time `json:"deletionTimestamp,omitempty"` + CreationTimestamp *metav1.Time `json:"creationTimestamp,omitempty"` + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty"` DeletionGracePeriodSeconds *int64 `json:"deletionGracePeriodSeconds,omitempty"` Labels map[string]string `json:"labels,omitempty"` Annotations map[string]string `json:"annotations,omitempty"` @@ -98,7 +98,7 @@ func (b *ObjectMetaApplyConfiguration) WithGeneration(value int64) *ObjectMetaAp // WithCreationTimestamp sets the CreationTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the CreationTimestamp field is set to the value of the last call. -func (b *ObjectMetaApplyConfiguration) WithCreationTimestamp(value v1.Time) *ObjectMetaApplyConfiguration { +func (b *ObjectMetaApplyConfiguration) WithCreationTimestamp(value metav1.Time) *ObjectMetaApplyConfiguration { b.CreationTimestamp = &value return b } @@ -106,7 +106,7 @@ func (b *ObjectMetaApplyConfiguration) WithCreationTimestamp(value v1.Time) *Obj // WithDeletionTimestamp sets the DeletionTimestamp field in the declarative configuration to the given value // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the DeletionTimestamp field is set to the value of the last call. -func (b *ObjectMetaApplyConfiguration) WithDeletionTimestamp(value v1.Time) *ObjectMetaApplyConfiguration { +func (b *ObjectMetaApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *ObjectMetaApplyConfiguration { b.DeletionTimestamp = &value return b } diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/cowboy.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/cowboy.go index 8ae6cd3891f..aefb71f25b4 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/cowboy.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/cowboy.go @@ -49,7 +49,7 @@ func Cowboy(name, namespace string) *CowboyApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithKind(value string) *CowboyApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -57,7 +57,7 @@ func (b *CowboyApplyConfiguration) WithKind(value string) *CowboyApplyConfigurat // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithAPIVersion(value string) *CowboyApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -66,7 +66,7 @@ func (b *CowboyApplyConfiguration) WithAPIVersion(value string) *CowboyApplyConf // If called multiple times, the Name field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithName(value string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -75,7 +75,7 @@ func (b *CowboyApplyConfiguration) WithName(value string) *CowboyApplyConfigurat // If called multiple times, the GenerateName field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithGenerateName(value string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -84,7 +84,7 @@ func (b *CowboyApplyConfiguration) WithGenerateName(value string) *CowboyApplyCo // If called multiple times, the Namespace field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithNamespace(value string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -93,7 +93,7 @@ func (b *CowboyApplyConfiguration) WithNamespace(value string) *CowboyApplyConfi // If called multiple times, the UID field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithUID(value types.UID) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -102,7 +102,7 @@ func (b *CowboyApplyConfiguration) WithUID(value types.UID) *CowboyApplyConfigur // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithResourceVersion(value string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -111,7 +111,7 @@ func (b *CowboyApplyConfiguration) WithResourceVersion(value string) *CowboyAppl // If called multiple times, the Generation field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithGeneration(value int64) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -120,7 +120,7 @@ func (b *CowboyApplyConfiguration) WithGeneration(value int64) *CowboyApplyConfi // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithCreationTimestamp(value metav1.Time) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -129,7 +129,7 @@ func (b *CowboyApplyConfiguration) WithCreationTimestamp(value metav1.Time) *Cow // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -138,7 +138,7 @@ func (b *CowboyApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Cow // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *CowboyApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -148,11 +148,11 @@ func (b *CowboyApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) * // overwriting an existing map entries in Labels field with the same key. func (b *CowboyApplyConfiguration) WithLabels(entries map[string]string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -163,11 +163,11 @@ func (b *CowboyApplyConfiguration) WithLabels(entries map[string]string) *Cowboy // overwriting an existing map entries in Annotations field with the same key. func (b *CowboyApplyConfiguration) WithAnnotations(entries map[string]string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -181,7 +181,7 @@ func (b *CowboyApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefere if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -192,7 +192,7 @@ func (b *CowboyApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefere func (b *CowboyApplyConfiguration) WithFinalizers(values ...string) *CowboyApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -222,5 +222,5 @@ func (b *CowboyApplyConfiguration) WithStatus(value *CowboyStatusApplyConfigurat // GetName retrieves the value of the Name field in the declarative configuration. func (b *CowboyApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/sheriff.go b/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/sheriff.go index 3c1adce1609..af9a04d69c7 100644 --- a/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/sheriff.go +++ b/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1/sheriff.go @@ -48,7 +48,7 @@ func Sheriff(name string) *SheriffApplyConfiguration { // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the Kind field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithKind(value string) *SheriffApplyConfiguration { - b.Kind = &value + b.TypeMetaApplyConfiguration.Kind = &value return b } @@ -56,7 +56,7 @@ func (b *SheriffApplyConfiguration) WithKind(value string) *SheriffApplyConfigur // and returns the receiver, so that objects can be built by chaining "With" function invocations. // If called multiple times, the APIVersion field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithAPIVersion(value string) *SheriffApplyConfiguration { - b.APIVersion = &value + b.TypeMetaApplyConfiguration.APIVersion = &value return b } @@ -65,7 +65,7 @@ func (b *SheriffApplyConfiguration) WithAPIVersion(value string) *SheriffApplyCo // If called multiple times, the Name field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithName(value string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Name = &value + b.ObjectMetaApplyConfiguration.Name = &value return b } @@ -74,7 +74,7 @@ func (b *SheriffApplyConfiguration) WithName(value string) *SheriffApplyConfigur // If called multiple times, the GenerateName field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithGenerateName(value string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.GenerateName = &value + b.ObjectMetaApplyConfiguration.GenerateName = &value return b } @@ -83,7 +83,7 @@ func (b *SheriffApplyConfiguration) WithGenerateName(value string) *SheriffApply // If called multiple times, the Namespace field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithNamespace(value string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Namespace = &value + b.ObjectMetaApplyConfiguration.Namespace = &value return b } @@ -92,7 +92,7 @@ func (b *SheriffApplyConfiguration) WithNamespace(value string) *SheriffApplyCon // If called multiple times, the UID field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithUID(value types.UID) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.UID = &value + b.ObjectMetaApplyConfiguration.UID = &value return b } @@ -101,7 +101,7 @@ func (b *SheriffApplyConfiguration) WithUID(value types.UID) *SheriffApplyConfig // If called multiple times, the ResourceVersion field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithResourceVersion(value string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.ResourceVersion = &value + b.ObjectMetaApplyConfiguration.ResourceVersion = &value return b } @@ -110,7 +110,7 @@ func (b *SheriffApplyConfiguration) WithResourceVersion(value string) *SheriffAp // If called multiple times, the Generation field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithGeneration(value int64) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.Generation = &value + b.ObjectMetaApplyConfiguration.Generation = &value return b } @@ -119,7 +119,7 @@ func (b *SheriffApplyConfiguration) WithGeneration(value int64) *SheriffApplyCon // If called multiple times, the CreationTimestamp field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithCreationTimestamp(value metav1.Time) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.CreationTimestamp = &value + b.ObjectMetaApplyConfiguration.CreationTimestamp = &value return b } @@ -128,7 +128,7 @@ func (b *SheriffApplyConfiguration) WithCreationTimestamp(value metav1.Time) *Sh // If called multiple times, the DeletionTimestamp field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionTimestamp = &value + b.ObjectMetaApplyConfiguration.DeletionTimestamp = &value return b } @@ -137,7 +137,7 @@ func (b *SheriffApplyConfiguration) WithDeletionTimestamp(value metav1.Time) *Sh // If called multiple times, the DeletionGracePeriodSeconds field is set to the value of the last call. func (b *SheriffApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - b.DeletionGracePeriodSeconds = &value + b.ObjectMetaApplyConfiguration.DeletionGracePeriodSeconds = &value return b } @@ -147,11 +147,11 @@ func (b *SheriffApplyConfiguration) WithDeletionGracePeriodSeconds(value int64) // overwriting an existing map entries in Labels field with the same key. func (b *SheriffApplyConfiguration) WithLabels(entries map[string]string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Labels == nil && len(entries) > 0 { - b.Labels = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Labels == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Labels = make(map[string]string, len(entries)) } for k, v := range entries { - b.Labels[k] = v + b.ObjectMetaApplyConfiguration.Labels[k] = v } return b } @@ -162,11 +162,11 @@ func (b *SheriffApplyConfiguration) WithLabels(entries map[string]string) *Sheri // overwriting an existing map entries in Annotations field with the same key. func (b *SheriffApplyConfiguration) WithAnnotations(entries map[string]string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() - if b.Annotations == nil && len(entries) > 0 { - b.Annotations = make(map[string]string, len(entries)) + if b.ObjectMetaApplyConfiguration.Annotations == nil && len(entries) > 0 { + b.ObjectMetaApplyConfiguration.Annotations = make(map[string]string, len(entries)) } for k, v := range entries { - b.Annotations[k] = v + b.ObjectMetaApplyConfiguration.Annotations[k] = v } return b } @@ -180,7 +180,7 @@ func (b *SheriffApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer if values[i] == nil { panic("nil value passed to WithOwnerReferences") } - b.OwnerReferences = append(b.OwnerReferences, *values[i]) + b.ObjectMetaApplyConfiguration.OwnerReferences = append(b.ObjectMetaApplyConfiguration.OwnerReferences, *values[i]) } return b } @@ -191,7 +191,7 @@ func (b *SheriffApplyConfiguration) WithOwnerReferences(values ...*v1.OwnerRefer func (b *SheriffApplyConfiguration) WithFinalizers(values ...string) *SheriffApplyConfiguration { b.ensureObjectMetaApplyConfigurationExists() for i := range values { - b.Finalizers = append(b.Finalizers, values[i]) + b.ObjectMetaApplyConfiguration.Finalizers = append(b.ObjectMetaApplyConfiguration.Finalizers, values[i]) } return b } @@ -221,5 +221,5 @@ func (b *SheriffApplyConfiguration) WithStatus(value *SheriffStatusApplyConfigur // GetName retrieves the value of the Name field in the declarative configuration. func (b *SheriffApplyConfiguration) GetName() *string { b.ensureObjectMetaApplyConfigurationExists() - return b.Name + return b.ObjectMetaApplyConfiguration.Name } diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/clientset.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/clientset.go index 62fd6c92c1c..a50d0849dfa 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/clientset.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/clientset.go @@ -19,8 +19,8 @@ limitations under the License. package versioned import ( - "fmt" - "net/http" + fmt "fmt" + http "net/http" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/clientset.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/clientset.go index f70b2b333ae..d9458b2be56 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/clientset.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/clientset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/fake/clientset.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/fake/clientset.go index 20af297af95..ba456877d9c 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/fake/clientset.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/fake/clientset.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/scheme/register.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/scheme/register.go index 4371fe17943..edd0c19a1c2 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/scheme/register.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/scheme/register.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/cowboy.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/cowboy.go index 62b9f35f2d0..7720a6aca9d 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/cowboy.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/cowboy.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/cowboy.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/cowboy.go index 4cb3bc27f07..dcce6055f94 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/cowboy.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/cowboy.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/sheriff.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/sheriff.go index ee80f44c09a..cd6b3a102f8 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/sheriff.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/sheriff.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/wildwest_client.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/wildwest_client.go index 260d8a87ec5..55f424ce36e 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/wildwest_client.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/fake/wildwest_client.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/sheriff.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/sheriff.go index e115394f728..0289f97b2c1 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/sheriff.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/sheriff.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/wildwest_client.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/wildwest_client.go index f8c0e0400b3..102ae9b76c6 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/wildwest_client.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/cluster/typed/wildwest/v1alpha1/wildwest_client.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/cowboy.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/cowboy.go index b014d0a0de6..fc7c04e9cba 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/cowboy.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/cowboy.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" - wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1" + wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" + applyconfigurationwildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1" scheme "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type CowboysGetter interface { // CowboyInterface has methods to work with Cowboy resources. type CowboyInterface interface { - Create(ctx context.Context, cowboy *v1alpha1.Cowboy, opts v1.CreateOptions) (*v1alpha1.Cowboy, error) - Update(ctx context.Context, cowboy *v1alpha1.Cowboy, opts v1.UpdateOptions) (*v1alpha1.Cowboy, error) + Create(ctx context.Context, cowboy *wildwestv1alpha1.Cowboy, opts v1.CreateOptions) (*wildwestv1alpha1.Cowboy, error) + Update(ctx context.Context, cowboy *wildwestv1alpha1.Cowboy, opts v1.UpdateOptions) (*wildwestv1alpha1.Cowboy, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, cowboy *v1alpha1.Cowboy, opts v1.UpdateOptions) (*v1alpha1.Cowboy, error) + UpdateStatus(ctx context.Context, cowboy *wildwestv1alpha1.Cowboy, opts v1.UpdateOptions) (*wildwestv1alpha1.Cowboy, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Cowboy, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.CowboyList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*wildwestv1alpha1.Cowboy, error) + List(ctx context.Context, opts v1.ListOptions) (*wildwestv1alpha1.CowboyList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Cowboy, err error) - Apply(ctx context.Context, cowboy *wildwestv1alpha1.CowboyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Cowboy, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *wildwestv1alpha1.Cowboy, err error) + Apply(ctx context.Context, cowboy *applyconfigurationwildwestv1alpha1.CowboyApplyConfiguration, opts v1.ApplyOptions) (result *wildwestv1alpha1.Cowboy, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, cowboy *wildwestv1alpha1.CowboyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Cowboy, err error) + ApplyStatus(ctx context.Context, cowboy *applyconfigurationwildwestv1alpha1.CowboyApplyConfiguration, opts v1.ApplyOptions) (result *wildwestv1alpha1.Cowboy, err error) CowboyExpansion } // cowboys implements CowboyInterface type cowboys struct { - *gentype.ClientWithListAndApply[*v1alpha1.Cowboy, *v1alpha1.CowboyList, *wildwestv1alpha1.CowboyApplyConfiguration] + *gentype.ClientWithListAndApply[*wildwestv1alpha1.Cowboy, *wildwestv1alpha1.CowboyList, *applyconfigurationwildwestv1alpha1.CowboyApplyConfiguration] } // newCowboys returns a Cowboys func newCowboys(c *WildwestV1alpha1Client, namespace string) *cowboys { return &cowboys{ - gentype.NewClientWithListAndApply[*v1alpha1.Cowboy, *v1alpha1.CowboyList, *wildwestv1alpha1.CowboyApplyConfiguration]( + gentype.NewClientWithListAndApply[*wildwestv1alpha1.Cowboy, *wildwestv1alpha1.CowboyList, *applyconfigurationwildwestv1alpha1.CowboyApplyConfiguration]( "cowboys", c.RESTClient(), scheme.ParameterCodec, namespace, - func() *v1alpha1.Cowboy { return &v1alpha1.Cowboy{} }, - func() *v1alpha1.CowboyList { return &v1alpha1.CowboyList{} }), + func() *wildwestv1alpha1.Cowboy { return &wildwestv1alpha1.Cowboy{} }, + func() *wildwestv1alpha1.CowboyList { return &wildwestv1alpha1.CowboyList{} }, + ), } } diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_cowboy.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_cowboy.go index 8dc29f09b49..d00458a26d3 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_cowboy.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_cowboy.go @@ -19,180 +19,34 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1" + typedwildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1" ) -// FakeCowboys implements CowboyInterface -type FakeCowboys struct { +// fakeCowboys implements CowboyInterface +type fakeCowboys struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.Cowboy, *v1alpha1.CowboyList, *wildwestv1alpha1.CowboyApplyConfiguration] Fake *FakeWildwestV1alpha1 - ns string -} - -var cowboysResource = v1alpha1.SchemeGroupVersion.WithResource("cowboys") - -var cowboysKind = v1alpha1.SchemeGroupVersion.WithKind("Cowboy") - -// Get takes name of the cowboy, and returns the corresponding cowboy object, and an error if there is any. -func (c *FakeCowboys) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Cowboy, err error) { - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewGetActionWithOptions(cowboysResource, c.ns, name, options), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Cowboy), err -} - -// List takes label and field selectors, and returns the list of Cowboys that match those selectors. -func (c *FakeCowboys) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.CowboyList, err error) { - emptyResult := &v1alpha1.CowboyList{} - obj, err := c.Fake. - Invokes(testing.NewListActionWithOptions(cowboysResource, cowboysKind, c.ns, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.CowboyList{ListMeta: obj.(*v1alpha1.CowboyList).ListMeta} - for _, item := range obj.(*v1alpha1.CowboyList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested cowboys. -func (c *FakeCowboys) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewWatchActionWithOptions(cowboysResource, c.ns, opts)) - -} - -// Create takes the representation of a cowboy and creates it. Returns the server's representation of the cowboy, and an error, if there is any. -func (c *FakeCowboys) Create(ctx context.Context, cowboy *v1alpha1.Cowboy, opts v1.CreateOptions) (result *v1alpha1.Cowboy, err error) { - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewCreateActionWithOptions(cowboysResource, c.ns, cowboy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Cowboy), err -} - -// Update takes the representation of a cowboy and updates it. Returns the server's representation of the cowboy, and an error, if there is any. -func (c *FakeCowboys) Update(ctx context.Context, cowboy *v1alpha1.Cowboy, opts v1.UpdateOptions) (result *v1alpha1.Cowboy, err error) { - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateActionWithOptions(cowboysResource, c.ns, cowboy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Cowboy), err } -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeCowboys) UpdateStatus(ctx context.Context, cowboy *v1alpha1.Cowboy, opts v1.UpdateOptions) (result *v1alpha1.Cowboy, err error) { - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewUpdateSubresourceActionWithOptions(cowboysResource, "status", c.ns, cowboy, opts), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Cowboy), err -} - -// Delete takes name of the cowboy and deletes it. Returns an error if one occurs. -func (c *FakeCowboys) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewDeleteActionWithOptions(cowboysResource, c.ns, name, opts), &v1alpha1.Cowboy{}) - - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeCowboys) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewDeleteCollectionActionWithOptions(cowboysResource, c.ns, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.CowboyList{}) - return err -} - -// Patch applies the patch and returns the patched cowboy. -func (c *FakeCowboys) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Cowboy, err error) { - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(cowboysResource, c.ns, name, pt, data, opts, subresources...), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Cowboy), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied cowboy. -func (c *FakeCowboys) Apply(ctx context.Context, cowboy *wildwestv1alpha1.CowboyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Cowboy, err error) { - if cowboy == nil { - return nil, fmt.Errorf("cowboy provided to Apply must not be nil") - } - data, err := json.Marshal(cowboy) - if err != nil { - return nil, err - } - name := cowboy.Name - if name == nil { - return nil, fmt.Errorf("cowboy.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(cowboysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Cowboy), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeCowboys) ApplyStatus(ctx context.Context, cowboy *wildwestv1alpha1.CowboyApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Cowboy, err error) { - if cowboy == nil { - return nil, fmt.Errorf("cowboy provided to Apply must not be nil") - } - data, err := json.Marshal(cowboy) - if err != nil { - return nil, err - } - name := cowboy.Name - if name == nil { - return nil, fmt.Errorf("cowboy.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Cowboy{} - obj, err := c.Fake. - Invokes(testing.NewPatchSubresourceActionWithOptions(cowboysResource, c.ns, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - - if obj == nil { - return emptyResult, err +func newFakeCowboys(fake *FakeWildwestV1alpha1, namespace string) typedwildwestv1alpha1.CowboyInterface { + return &fakeCowboys{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.Cowboy, *v1alpha1.CowboyList, *wildwestv1alpha1.CowboyApplyConfiguration]( + fake.Fake, + namespace, + v1alpha1.SchemeGroupVersion.WithResource("cowboys"), + v1alpha1.SchemeGroupVersion.WithKind("Cowboy"), + func() *v1alpha1.Cowboy { return &v1alpha1.Cowboy{} }, + func() *v1alpha1.CowboyList { return &v1alpha1.CowboyList{} }, + func(dst, src *v1alpha1.CowboyList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.CowboyList) []*v1alpha1.Cowboy { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.CowboyList, items []*v1alpha1.Cowboy) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.Cowboy), err } diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_sheriff.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_sheriff.go index b11c6352740..86168223901 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_sheriff.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_sheriff.go @@ -19,169 +19,34 @@ limitations under the License. package fake import ( - "context" - json "encoding/json" - "fmt" - - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - labels "k8s.io/apimachinery/pkg/labels" - types "k8s.io/apimachinery/pkg/types" - watch "k8s.io/apimachinery/pkg/watch" - testing "k8s.io/client-go/testing" + gentype "k8s.io/client-go/gentype" v1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1" + typedwildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1" ) -// FakeSherifves implements SheriffInterface -type FakeSherifves struct { +// fakeSherifves implements SheriffInterface +type fakeSherifves struct { + *gentype.FakeClientWithListAndApply[*v1alpha1.Sheriff, *v1alpha1.SheriffList, *wildwestv1alpha1.SheriffApplyConfiguration] Fake *FakeWildwestV1alpha1 } -var sherifvesResource = v1alpha1.SchemeGroupVersion.WithResource("sherifves") - -var sherifvesKind = v1alpha1.SchemeGroupVersion.WithKind("Sheriff") - -// Get takes name of the sheriff, and returns the corresponding sheriff object, and an error if there is any. -func (c *FakeSherifves) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Sheriff, err error) { - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootGetActionWithOptions(sherifvesResource, name, options), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Sheriff), err -} - -// List takes label and field selectors, and returns the list of Sherifves that match those selectors. -func (c *FakeSherifves) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.SheriffList, err error) { - emptyResult := &v1alpha1.SheriffList{} - obj, err := c.Fake. - Invokes(testing.NewRootListActionWithOptions(sherifvesResource, sherifvesKind, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - - label, _, _ := testing.ExtractFromListOptions(opts) - if label == nil { - label = labels.Everything() - } - list := &v1alpha1.SheriffList{ListMeta: obj.(*v1alpha1.SheriffList).ListMeta} - for _, item := range obj.(*v1alpha1.SheriffList).Items { - if label.Matches(labels.Set(item.Labels)) { - list.Items = append(list.Items, item) - } - } - return list, err -} - -// Watch returns a watch.Interface that watches the requested sherifves. -func (c *FakeSherifves) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { - return c.Fake. - InvokesWatch(testing.NewRootWatchActionWithOptions(sherifvesResource, opts)) -} - -// Create takes the representation of a sheriff and creates it. Returns the server's representation of the sheriff, and an error, if there is any. -func (c *FakeSherifves) Create(ctx context.Context, sheriff *v1alpha1.Sheriff, opts v1.CreateOptions) (result *v1alpha1.Sheriff, err error) { - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootCreateActionWithOptions(sherifvesResource, sheriff, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Sheriff), err -} - -// Update takes the representation of a sheriff and updates it. Returns the server's representation of the sheriff, and an error, if there is any. -func (c *FakeSherifves) Update(ctx context.Context, sheriff *v1alpha1.Sheriff, opts v1.UpdateOptions) (result *v1alpha1.Sheriff, err error) { - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateActionWithOptions(sherifvesResource, sheriff, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Sheriff), err -} - -// UpdateStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). -func (c *FakeSherifves) UpdateStatus(ctx context.Context, sheriff *v1alpha1.Sheriff, opts v1.UpdateOptions) (result *v1alpha1.Sheriff, err error) { - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceActionWithOptions(sherifvesResource, "status", sheriff, opts), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Sheriff), err -} - -// Delete takes name of the sheriff and deletes it. Returns an error if one occurs. -func (c *FakeSherifves) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error { - _, err := c.Fake. - Invokes(testing.NewRootDeleteActionWithOptions(sherifvesResource, name, opts), &v1alpha1.Sheriff{}) - return err -} - -// DeleteCollection deletes a collection of objects. -func (c *FakeSherifves) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error { - action := testing.NewRootDeleteCollectionActionWithOptions(sherifvesResource, opts, listOpts) - - _, err := c.Fake.Invokes(action, &v1alpha1.SheriffList{}) - return err -} - -// Patch applies the patch and returns the patched sheriff. -func (c *FakeSherifves) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Sheriff, err error) { - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(sherifvesResource, name, pt, data, opts, subresources...), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Sheriff), err -} - -// Apply takes the given apply declarative configuration, applies it and returns the applied sheriff. -func (c *FakeSherifves) Apply(ctx context.Context, sheriff *wildwestv1alpha1.SheriffApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Sheriff, err error) { - if sheriff == nil { - return nil, fmt.Errorf("sheriff provided to Apply must not be nil") - } - data, err := json.Marshal(sheriff) - if err != nil { - return nil, err - } - name := sheriff.Name - if name == nil { - return nil, fmt.Errorf("sheriff.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(sherifvesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions()), emptyResult) - if obj == nil { - return emptyResult, err - } - return obj.(*v1alpha1.Sheriff), err -} - -// ApplyStatus was generated because the type contains a Status member. -// Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). -func (c *FakeSherifves) ApplyStatus(ctx context.Context, sheriff *wildwestv1alpha1.SheriffApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Sheriff, err error) { - if sheriff == nil { - return nil, fmt.Errorf("sheriff provided to Apply must not be nil") - } - data, err := json.Marshal(sheriff) - if err != nil { - return nil, err - } - name := sheriff.Name - if name == nil { - return nil, fmt.Errorf("sheriff.Name must be provided to Apply") - } - emptyResult := &v1alpha1.Sheriff{} - obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceActionWithOptions(sherifvesResource, *name, types.ApplyPatchType, data, opts.ToPatchOptions(), "status"), emptyResult) - if obj == nil { - return emptyResult, err +func newFakeSherifves(fake *FakeWildwestV1alpha1) typedwildwestv1alpha1.SheriffInterface { + return &fakeSherifves{ + gentype.NewFakeClientWithListAndApply[*v1alpha1.Sheriff, *v1alpha1.SheriffList, *wildwestv1alpha1.SheriffApplyConfiguration]( + fake.Fake, + "", + v1alpha1.SchemeGroupVersion.WithResource("sherifves"), + v1alpha1.SchemeGroupVersion.WithKind("Sheriff"), + func() *v1alpha1.Sheriff { return &v1alpha1.Sheriff{} }, + func() *v1alpha1.SheriffList { return &v1alpha1.SheriffList{} }, + func(dst, src *v1alpha1.SheriffList) { dst.ListMeta = src.ListMeta }, + func(list *v1alpha1.SheriffList) []*v1alpha1.Sheriff { return gentype.ToPointerSlice(list.Items) }, + func(list *v1alpha1.SheriffList, items []*v1alpha1.Sheriff) { + list.Items = gentype.FromPointerSlice(items) + }, + ), + fake, } - return obj.(*v1alpha1.Sheriff), err } diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_wildwest_client.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_wildwest_client.go index ac67c3eb24a..008ace85374 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_wildwest_client.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/fake/fake_wildwest_client.go @@ -30,11 +30,11 @@ type FakeWildwestV1alpha1 struct { } func (c *FakeWildwestV1alpha1) Cowboys(namespace string) v1alpha1.CowboyInterface { - return &FakeCowboys{c, namespace} + return newFakeCowboys(c, namespace) } func (c *FakeWildwestV1alpha1) Sherifves() v1alpha1.SheriffInterface { - return &FakeSherifves{c} + return newFakeSherifves(c) } // RESTClient returns a RESTClient that is used to communicate diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/sheriff.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/sheriff.go index e466e3b62fb..2dc92bafbcc 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/sheriff.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/sheriff.go @@ -19,15 +19,15 @@ limitations under the License. package v1alpha1 import ( - "context" + context "context" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" gentype "k8s.io/client-go/gentype" - v1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" - wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1" + wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" + applyconfigurationwildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/applyconfiguration/wildwest/v1alpha1" scheme "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme" ) @@ -39,36 +39,37 @@ type SherifvesGetter interface { // SheriffInterface has methods to work with Sheriff resources. type SheriffInterface interface { - Create(ctx context.Context, sheriff *v1alpha1.Sheriff, opts v1.CreateOptions) (*v1alpha1.Sheriff, error) - Update(ctx context.Context, sheriff *v1alpha1.Sheriff, opts v1.UpdateOptions) (*v1alpha1.Sheriff, error) + Create(ctx context.Context, sheriff *wildwestv1alpha1.Sheriff, opts v1.CreateOptions) (*wildwestv1alpha1.Sheriff, error) + Update(ctx context.Context, sheriff *wildwestv1alpha1.Sheriff, opts v1.UpdateOptions) (*wildwestv1alpha1.Sheriff, error) // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). - UpdateStatus(ctx context.Context, sheriff *v1alpha1.Sheriff, opts v1.UpdateOptions) (*v1alpha1.Sheriff, error) + UpdateStatus(ctx context.Context, sheriff *wildwestv1alpha1.Sheriff, opts v1.UpdateOptions) (*wildwestv1alpha1.Sheriff, error) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error - Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Sheriff, error) - List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.SheriffList, error) + Get(ctx context.Context, name string, opts v1.GetOptions) (*wildwestv1alpha1.Sheriff, error) + List(ctx context.Context, opts v1.ListOptions) (*wildwestv1alpha1.SheriffList, error) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) - Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Sheriff, err error) - Apply(ctx context.Context, sheriff *wildwestv1alpha1.SheriffApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Sheriff, err error) + Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *wildwestv1alpha1.Sheriff, err error) + Apply(ctx context.Context, sheriff *applyconfigurationwildwestv1alpha1.SheriffApplyConfiguration, opts v1.ApplyOptions) (result *wildwestv1alpha1.Sheriff, err error) // Add a +genclient:noStatus comment above the type to avoid generating ApplyStatus(). - ApplyStatus(ctx context.Context, sheriff *wildwestv1alpha1.SheriffApplyConfiguration, opts v1.ApplyOptions) (result *v1alpha1.Sheriff, err error) + ApplyStatus(ctx context.Context, sheriff *applyconfigurationwildwestv1alpha1.SheriffApplyConfiguration, opts v1.ApplyOptions) (result *wildwestv1alpha1.Sheriff, err error) SheriffExpansion } // sherifves implements SheriffInterface type sherifves struct { - *gentype.ClientWithListAndApply[*v1alpha1.Sheriff, *v1alpha1.SheriffList, *wildwestv1alpha1.SheriffApplyConfiguration] + *gentype.ClientWithListAndApply[*wildwestv1alpha1.Sheriff, *wildwestv1alpha1.SheriffList, *applyconfigurationwildwestv1alpha1.SheriffApplyConfiguration] } // newSherifves returns a Sherifves func newSherifves(c *WildwestV1alpha1Client) *sherifves { return &sherifves{ - gentype.NewClientWithListAndApply[*v1alpha1.Sheriff, *v1alpha1.SheriffList, *wildwestv1alpha1.SheriffApplyConfiguration]( + gentype.NewClientWithListAndApply[*wildwestv1alpha1.Sheriff, *wildwestv1alpha1.SheriffList, *applyconfigurationwildwestv1alpha1.SheriffApplyConfiguration]( "sherifves", c.RESTClient(), scheme.ParameterCodec, "", - func() *v1alpha1.Sheriff { return &v1alpha1.Sheriff{} }, - func() *v1alpha1.SheriffList { return &v1alpha1.SheriffList{} }), + func() *wildwestv1alpha1.Sheriff { return &wildwestv1alpha1.Sheriff{} }, + func() *wildwestv1alpha1.SheriffList { return &wildwestv1alpha1.SheriffList{} }, + ), } } diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/wildwest_client.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/wildwest_client.go index 2a7efe96ec1..54b14ae8446 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/wildwest_client.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/typed/wildwest/v1alpha1/wildwest_client.go @@ -19,12 +19,12 @@ limitations under the License. package v1alpha1 import ( - "net/http" + http "net/http" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" - "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme" + wildwestv1alpha1 "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/apis/wildwest/v1alpha1" + scheme "github.com/kcp-dev/kcp/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme" ) type WildwestV1alpha1Interface interface { @@ -91,10 +91,10 @@ func New(c rest.Interface) *WildwestV1alpha1Client { } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := wildwestv1alpha1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" - config.NegotiatedSerializer = scheme.Codecs.WithoutConversion() + config.NegotiatedSerializer = rest.CodecFactoryForGeneratedClient(scheme.Scheme, scheme.Codecs).WithoutConversion() if config.UserAgent == "" { config.UserAgent = rest.DefaultKubernetesUserAgent() diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/factory.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/factory.go index ca6c8339cd6..db20334a319 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/factory.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/factory.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/generic.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/generic.go index f2c71f2e65f..741d1c0e77a 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/generic.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/generic.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 79eaadf2229..2a0bbc80d06 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/interface.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/interface.go index f09f52fb03d..964597b40ec 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/interface.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/cowboy.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/cowboy.go index d2059c2eff3..8523d403312 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/cowboy.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/cowboy.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/interface.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/interface.go index 7e2fcec1992..924898621f9 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/interface.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/interface.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/sheriff.go b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/sheriff.go index a2c37fbb3d0..8442929ad36 100644 --- a/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/sheriff.go +++ b/test/e2e/fixtures/wildwest/client/informers/externalversions/wildwest/v1alpha1/sheriff.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/cowboy.go b/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/cowboy.go index ed50cc64ebd..13e74f2dd0b 100644 --- a/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/cowboy.go +++ b/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/cowboy.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/sheriff.go b/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/sheriff.go index 6c7dcb684c1..fd0cfa4cf5e 100644 --- a/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/sheriff.go +++ b/test/e2e/fixtures/wildwest/client/listers/wildwest/v1alpha1/sheriff.go @@ -1,6 +1,3 @@ -//go:build !ignore_autogenerated -// +build !ignore_autogenerated - /* Copyright The KCP Authors. diff --git a/test/e2e/framework/kcp.go b/test/e2e/framework/kcp.go index 3f6bb4d80c7..806ca655f7a 100644 --- a/test/e2e/framework/kcp.go +++ b/test/e2e/framework/kcp.go @@ -641,7 +641,7 @@ func (c *kcpServer) Run(opts ...RunOption) error { return err } - completed, err := serverOptions.Complete() + completed, err := serverOptions.Complete(ctx) if err != nil { cleanup() return err