From 5ddc213e45a9bf6c5171f47a223b48345fd91a0c Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Thu, 8 Dec 2022 14:48:32 -0800 Subject: [PATCH 1/3] Update Go 1.19 Signed-off-by: Vince Prignano --- .ci-operator.yaml | 2 +- .github/workflows/ci.yaml | 4 +- .github/workflows/docs-gen-and-push.yaml | 2 +- .github/workflows/e2e-ci-ppc64le.yml | 18 ++++---- .github/workflows/goreleaser.yml | 2 +- .github/workflows/kcp-image.yaml | 2 +- .github/workflows/kcp-test-image.yaml | 2 +- .github/workflows/syncer-image.yaml | 2 +- CONTRIBUTING.md | 2 +- Dockerfile | 2 +- cmd/sharded-test-server/doc.go | 46 +++++++++---------- docs/content/en/main/concepts/syncer.md | 8 ++-- docs/go.mod | 2 +- go.mod | 2 +- pkg/apis/go.mod | 2 +- .../replication_reconcile_unstructured.go | 6 +-- .../framework/dynamic/apiserver/handler.go | 2 +- pkg/virtual/framework/dynamic/doc.go | 4 +- pkg/virtual/syncer/doc.go | 1 - pkg/virtual/syncer/transformations/types.go | 1 + 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index c3247aac9a0..501e55dcbb0 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: namespace: ci name: kcp-dev-build-root - tag: "1.18" \ No newline at end of file + tag: "1.19" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1174dda256d..134bb16663f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -34,7 +34,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 cache: true - run: make build @@ -64,7 +64,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 cache: true - run: make build diff --git a/.github/workflows/docs-gen-and-push.yaml b/.github/workflows/docs-gen-and-push.yaml index 8b964fc0579..a08d662c974 100644 --- a/.github/workflows/docs-gen-and-push.yaml +++ b/.github/workflows/docs-gen-and-push.yaml @@ -37,7 +37,7 @@ jobs: path: docs - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 - name: Setup Hugo uses: peaceiris/actions-hugo@v2 with: diff --git a/.github/workflows/e2e-ci-ppc64le.yml b/.github/workflows/e2e-ci-ppc64le.yml index d31d56388ec..e01eb4d42d8 100644 --- a/.github/workflows/e2e-ci-ppc64le.yml +++ b/.github/workflows/e2e-ci-ppc64le.yml @@ -38,14 +38,14 @@ jobs: with: arch: ppc64le distro: ubuntu20.04 - + dockerRunArgs: | --volume "/var/run/docker.sock:/var/run/docker.sock" - + run: | apt-get update -y apt-get install wget tar gcc git curl runc iptables libdevmapper1.02.1 make jq -y - + #Install docker apt-get install apt-transport-https ca-certificates software-properties-common -y curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - @@ -53,19 +53,19 @@ jobs: apt-get update -y apt-get install docker-ce -y service docker start - + #Install Go, Kind, kubectl - cd /root/ && wget https://go.dev/dl/go1.18.linux-ppc64le.tar.gz - tar -C /usr/local -xzf go1.18.linux-ppc64le.tar.gz + cd /root/ && wget https://go.dev/dl/go1.19.linux-ppc64le.tar.gz + tar -C /usr/local -xzf go1.19.linux-ppc64le.tar.gz export PATH=$PATH:/usr/local/go/bin go install github.com/google/ko@latest go install sigs.k8s.io/kind@v0.14.0 - export PATH=$PATH:$(go env GOPATH)/bin + export PATH=$PATH:$(go env GOPATH)/bin curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/ppc64le/kubectl" chmod +x kubectl export PATH=$PATH:/root/ - + git clone https://github.com/kcp-dev/kcp.git && cd kcp export PATH=$PWD/bin:$PATH LOG_DIR=/tmp/e2e/shared-server/artifacts ARTIFACT_DIR=/tmp/e2e \ - OS=linux ARCH=ppc64le E2E_PARALLELISM=4 make test-e2e -e TEST_ARGS="-timeout 50m" \ No newline at end of file + OS=linux ARCH=ppc64le E2E_PARALLELISM=4 make test-e2e -e TEST_ARGS="-timeout 50m" diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml index 132e0d3929a..1547c2d97bb 100644 --- a/.github/workflows/goreleaser.yml +++ b/.github/workflows/goreleaser.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 - name: Delete non-semver tags run: 'git tag -d $(git tag -l | grep -v "^v")' - name: Set LDFLAGS diff --git a/.github/workflows/kcp-image.yaml b/.github/workflows/kcp-image.yaml index 1ba7979c879..81229aaade9 100644 --- a/.github/workflows/kcp-image.yaml +++ b/.github/workflows/kcp-image.yaml @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 - name: Get the short sha id: vars diff --git a/.github/workflows/kcp-test-image.yaml b/.github/workflows/kcp-test-image.yaml index 355558697d0..d91c9c166ce 100644 --- a/.github/workflows/kcp-test-image.yaml +++ b/.github/workflows/kcp-test-image.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 # Build and push the kcp test image, tagged with the commit SHA and the branch name. - uses: imjasonh/setup-ko@v0.6 diff --git a/.github/workflows/syncer-image.yaml b/.github/workflows/syncer-image.yaml index bf77cde5006..18eb083d60e 100644 --- a/.github/workflows/syncer-image.yaml +++ b/.github/workflows/syncer-image.yaml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: v1.18 + go-version: v1.19 # Build and push multi-arch supported syncer image, tagged with the commit SHA and the branch name. - uses: imjasonh/setup-ko@v0.6 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d27c078d81f..1559b3ffbf3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,7 +17,7 @@ contribution. See the [DCO](DCO) file for details. ### Prerequisites 1. Clone this repository. -2. [Install Go](https://golang.org/doc/install) (1.18+). +2. [Install Go](https://golang.org/doc/install) (1.19+). 3. Install [kubectl](https://kubernetes.io/docs/tasks/tools/#kubectl). ### Build & verify diff --git a/Dockerfile b/Dockerfile index 5a8f5e9c829..0f53a764cd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the binary -FROM golang:1.18 AS builder +FROM golang:1.19 AS builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/cmd/sharded-test-server/doc.go b/cmd/sharded-test-server/doc.go index edc7a4ef311..2df585a834a 100644 --- a/cmd/sharded-test-server/doc.go +++ b/cmd/sharded-test-server/doc.go @@ -17,29 +17,29 @@ limitations under the License. // sharded-test-server starts the kcp-front-proxy and one or more (in the future) kcp shard. // It also sets up the required certificates and keys for the front-proxy to connect to the shards: // -// ┌────────────────┐ ┌────────────────┐ ┌────────────────┐ -// │ │ │ │ │ │ All accept .kcp/client-ca.crt client certs. -// │ Root shard │ │ Shard 1 │ │ Shard 2 │ All accept .kcp/requestheader.crt requests with user/group headers. -// │ │ │ │ │ │ All use .kcp/serving-ca.crt compatible serving certs. -// │ .kcp-0/kcp.log │ │ .kcp-1/kcp.log │ │ .kcp-2/kcp.log │ -// │ │ │ │ │ │ -// └────────────────┘ └────────────────┘ └────────────────┘ -// ▲ ▲ ▲ ▲ -// Watches │ │ Redirects traffic │ ┌────────────┘ -// shards │ │ to correct shard │ │ -// │ └─────────┐ │ │ -// │ │.kcp-front-proxy/requestheader.crt/key -// │ ┌──┴──────────────┐ -// └────────┤ │ -// .kcp/root.kubeconfig │ │ -// │ kcp-front-proxy │ -// │ │ -// │ │ -// └─────────────────┘ -// ▲ -// .kcp/admin.kubeconfig │ -// │ -// e2e test or kubectl +// ┌────────────────┐ ┌────────────────┐ ┌────────────────┐ +// │ │ │ │ │ │ All accept .kcp/client-ca.crt client certs. +// │ Root shard │ │ Shard 1 │ │ Shard 2 │ All accept .kcp/requestheader.crt requests with user/group headers. +// │ │ │ │ │ │ All use .kcp/serving-ca.crt compatible serving certs. +// │ .kcp-0/kcp.log │ │ .kcp-1/kcp.log │ │ .kcp-2/kcp.log │ +// │ │ │ │ │ │ +// └────────────────┘ └────────────────┘ └────────────────┘ +// ▲ ▲ ▲ ▲ +// Watches │ │ Redirects traffic │ ┌────────────┘ +// shards │ │ to correct shard │ │ +// │ └─────────┐ │ │ +// │ │.kcp-front-proxy/requestheader.crt/key +// │ ┌──┴──────────────┐ +// └────────┤ │ +// .kcp/root.kubeconfig │ │ +// │ kcp-front-proxy │ +// │ │ +// │ │ +// └─────────────────┘ +// ▲ +// .kcp/admin.kubeconfig │ +// │ +// e2e test or kubectl // // Invocation: cmd/sharded-test-server --v=3 --proxy-v=4 --shard-v=5 // diff --git a/docs/content/en/main/concepts/syncer.md b/docs/content/en/main/concepts/syncer.md index 6b729dce505..7c1e11d691a 100644 --- a/docs/content/en/main/concepts/syncer.md +++ b/docs/content/en/main/concepts/syncer.md @@ -163,7 +163,7 @@ To build, make the root kcp folder your current working directory and run: make build-all install build-kind-images ``` -If your go version is not 1.18, which is the expected version, you need to run +If your go version is not 1.19, which is the expected version, you need to run ```bash IGNORE_GO_VERSION=1 make build-all install build-kind-images @@ -215,7 +215,7 @@ You can run the syncer in a kind cluster for development. ```sh kubectl kcp workload sync kind --syncer-image -o syncer.yaml ``` - + 1. Create a second workspace for your workloads and immediately enter it: ```sh @@ -225,7 +225,7 @@ You can run the syncer in a kind cluster for development. Workspace "my-workloads" (type root:organization) is ready to use. Current workspace is "root:my-workloads" (type "root:organization"). ``` - + 1. Bind it to the `my-locations` workspace with the synctarget: ```bash @@ -258,7 +258,7 @@ You can run the syncer in a kind cluster for development. ```bash kubectl wait --for=condition=Ready synctarget/ ``` - + 1. Add a deployment to the my-workloads workspace and check the p-cluster to see if the workload has been created there: ```bash diff --git a/docs/go.mod b/docs/go.mod index b607d86c56e..c50060cb574 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,5 +1,5 @@ module github.com/kcp-dev/kcp/docs -go 1.18 +go 1.19 require github.com/google/docsy v0.4.0 // indirect diff --git a/go.mod b/go.mod index 15660199add..15cf18c2831 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/kcp-dev/kcp -go 1.18 +go 1.19 require ( github.com/MakeNowJust/heredoc v1.0.0 diff --git a/pkg/apis/go.mod b/pkg/apis/go.mod index 17fed7b9b98..342cc818c00 100644 --- a/pkg/apis/go.mod +++ b/pkg/apis/go.mod @@ -1,6 +1,6 @@ module github.com/kcp-dev/kcp/pkg/apis -go 1.18 +go 1.19 require ( github.com/google/go-cmp v0.5.5 diff --git a/pkg/reconciler/cache/replication/replication_reconcile_unstructured.go b/pkg/reconciler/cache/replication/replication_reconcile_unstructured.go index 93312e446ac..c17abb74bbf 100644 --- a/pkg/reconciler/cache/replication/replication_reconcile_unstructured.go +++ b/pkg/reconciler/cache/replication/replication_reconcile_unstructured.go @@ -41,9 +41,9 @@ import ( // - the localObject was deleted // 3. modification of the object to match the original/local object // happens when either of the following is true: -// - the localObject's metadata doesn't match the cacheObject -// - the localObject's spec doesn't match the cacheObject -// - the localObject's status doesn't match the cacheObject +// - the localObject's metadata doesn't match the cacheObject +// - the localObject's spec doesn't match the cacheObject +// - the localObject's status doesn't match the cacheObject func (c *controller) reconcileUnstructuredObjects(ctx context.Context, cluster logicalcluster.Name, gvr *schema.GroupVersionResource, cacheObject *unstructured.Unstructured, localObject *unstructured.Unstructured) error { if localObject == nil { return c.handleObjectDeletion(ctx, cluster, gvr, cacheObject) diff --git a/pkg/virtual/framework/dynamic/apiserver/handler.go b/pkg/virtual/framework/dynamic/apiserver/handler.go index 3e9a353630a..2afaaceb652 100644 --- a/pkg/virtual/framework/dynamic/apiserver/handler.go +++ b/pkg/virtual/framework/dynamic/apiserver/handler.go @@ -43,7 +43,7 @@ import ( dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" ) -// resourceHandler serves the `/apis` and `/api`` endpoints. +// resourceHandler serves the `/apis` and `/api“ endpoints. type resourceHandler struct { apiSetRetriever apidefinition.APIDefinitionSetGetter versionDiscoveryHandler *versionDiscoveryHandler diff --git a/pkg/virtual/framework/dynamic/doc.go b/pkg/virtual/framework/dynamic/doc.go index 47f4791a935..4c815f64def 100644 --- a/pkg/virtual/framework/dynamic/doc.go +++ b/pkg/virtual/framework/dynamic/doc.go @@ -18,7 +18,7 @@ limitations under the License. // required to build virtual workspaces which can dynamically serve resources, // based on API definitions (including an OpenAPI v3 schema), and a Rest storage provider. // -// Main idea +// # Main idea // // APIs served by the virtual workspace are partitioned in API domains. Each API domain // is defined by an api domain key and will expose a set of APIs @@ -27,7 +27,7 @@ limitations under the License. // // APIs are served by an apiserver.DynamicAPIServer which is setup in the virtual workspace Register() method. // -// Typical operation +// # Typical operation // // The RootPathResolver() method would usually interpret the URL sub-path, extract the API domain key from it, // and pass the request to the apiserver.DynamicAPIServer, along with the API domain key, if the API domain key contains APIs. diff --git a/pkg/virtual/syncer/doc.go b/pkg/virtual/syncer/doc.go index 45409f83af8..673d29255c5 100644 --- a/pkg/virtual/syncer/doc.go +++ b/pkg/virtual/syncer/doc.go @@ -32,5 +32,4 @@ limitations under the License. // // The builder package is the place where all these components are combined together, especially in the // BuildVirtualWorkspace() function. -// package syncer diff --git a/pkg/virtual/syncer/transformations/types.go b/pkg/virtual/syncer/transformations/types.go index 87a2b2c66f6..fafe8697b20 100644 --- a/pkg/virtual/syncer/transformations/types.go +++ b/pkg/virtual/syncer/transformations/types.go @@ -31,6 +31,7 @@ import ( // In addition to the upstream resource to transform, the transformation parameters // also involve: // - the overriding values of Syncer View summarized fields (the fields that the +// // Syncer previously overrode, typically when updating the status, but this could // also contain specific Spec fields) // - the requested syncing intents for all SyncTargets. From 3de739220e47c2b1dc2acf847f18abef1f97607a Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Thu, 8 Dec 2022 14:49:12 -0800 Subject: [PATCH 2/3] Add GOMEMLIMIT to kcp.yaml Signed-off-by: Vince Prignano --- manifest/kcp.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest/kcp.yaml b/manifest/kcp.yaml index 95fff65ef19..c3cdeae5177 100644 --- a/manifest/kcp.yaml +++ b/manifest/kcp.yaml @@ -175,6 +175,10 @@ spec: env: - name: EXTERNAL_HOSTNAME value: kcp + - name: GOMEMLIMIT + valueFrom: + resourceFieldRef: + resource: requests.memory livenessProbe: failureThreshold: 3 httpGet: From a6a5ad8716bd052641903651eb33f77465ed35dd Mon Sep 17 00:00:00 2001 From: Vince Prignano Date: Thu, 8 Dec 2022 14:54:53 -0800 Subject: [PATCH 3/3] Update codegen and imports Signed-off-by: Vince Prignano --- .../conditions/util/conditions/merge.go | 1 + pkg/client/clientset/versioned/fake/register.go | 14 +++++++------- pkg/client/clientset/versioned/scheme/register.go | 14 +++++++------- pkg/virtual/framework/dynamic/apiserver/handler.go | 2 +- .../client/clientset/versioned/fake/register.go | 14 +++++++------- .../client/clientset/versioned/scheme/register.go | 14 +++++++------- 6 files changed, 30 insertions(+), 29 deletions(-) diff --git a/pkg/apis/third_party/conditions/util/conditions/merge.go b/pkg/apis/third_party/conditions/util/conditions/merge.go index 9c17836d899..10508de0e85 100644 --- a/pkg/apis/third_party/conditions/util/conditions/merge.go +++ b/pkg/apis/third_party/conditions/util/conditions/merge.go @@ -44,6 +44,7 @@ type localizedCondition struct { // - P2 - Status=False, Severity=Info // - P3 - Status=True // - P4 - Status=Unknown +// // 3. The group with highest priority is used to determine status, severity and other info of the target condition. // // Please note that the last operation includes also the task of computing the Reason and the Message for the target diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go index 4cbe30a5f9a..d8fa7d45c55 100644 --- a/pkg/client/clientset/versioned/fake/register.go +++ b/pkg/client/clientset/versioned/fake/register.go @@ -50,14 +50,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go index dfcba91018f..8f7c501d595 100644 --- a/pkg/client/clientset/versioned/scheme/register.go +++ b/pkg/client/clientset/versioned/scheme/register.go @@ -50,14 +50,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/virtual/framework/dynamic/apiserver/handler.go b/pkg/virtual/framework/dynamic/apiserver/handler.go index 2afaaceb652..fff9a98e98d 100644 --- a/pkg/virtual/framework/dynamic/apiserver/handler.go +++ b/pkg/virtual/framework/dynamic/apiserver/handler.go @@ -43,7 +43,7 @@ import ( dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" ) -// resourceHandler serves the `/apis` and `/api“ endpoints. +// resourceHandler serves the `/apis` and `/api` endpoints. type resourceHandler struct { apiSetRetriever apidefinition.APIDefinitionSetGetter versionDiscoveryHandler *versionDiscoveryHandler diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/fake/register.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/fake/register.go index fe28c8c9d8e..7f3bf2f8406 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/fake/register.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/fake/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme/register.go b/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme/register.go index b73cccccb13..2bc6965e73e 100644 --- a/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme/register.go +++ b/test/e2e/fixtures/wildwest/client/clientset/versioned/scheme/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly.