From 129c6d488169ba4ce514e17d99fddc26da2cd4ef Mon Sep 17 00:00:00 2001 From: denis-tingaikin Date: Thu, 29 Jun 2023 15:39:59 +0300 Subject: [PATCH] fix diff in go generate Signed-off-by: denis-tingaikin --- .github/workflows/ci.yaml | 2 +- .../client/clientset/versioned/fake/register.go | 16 ++++++++-------- .../clientset/versioned/scheme/register.go | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3354ce7..a391cae 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -45,7 +45,7 @@ jobs: path: ${{ github.workspace }}/src/github.com/${{ github.repository }} - uses: actions/setup-go@v1 with: - go-version: 1.18.1 + go-version: 1.20 - name: Generate files run: | go generate ./pkg/tools/k8s/gen.go diff --git a/pkg/tools/k8s/client/clientset/versioned/fake/register.go b/pkg/tools/k8s/client/clientset/versioned/fake/register.go index 5b32e57..e28f3b3 100644 --- a/pkg/tools/k8s/client/clientset/versioned/fake/register.go +++ b/pkg/tools/k8s/client/clientset/versioned/fake/register.go @@ -42,14 +42,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" -// ) -// -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.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) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/tools/k8s/client/clientset/versioned/scheme/register.go b/pkg/tools/k8s/client/clientset/versioned/scheme/register.go index 0447acd..cbd9066 100644 --- a/pkg/tools/k8s/client/clientset/versioned/scheme/register.go +++ b/pkg/tools/k8s/client/clientset/versioned/scheme/register.go @@ -42,14 +42,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" -// ) -// -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.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) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly.