From cc0400bdd4638f4c1c8775b3fe5bc1b64f1b028f Mon Sep 17 00:00:00 2001 From: Sanket Sudake Date: Thu, 24 Jun 2021 12:07:14 +0530 Subject: [PATCH] Move clientset,listers,informers to pkg/client from pkg/apis (#2090) * Move clientset,listers,informers to pkg/client from pkg/apis Signed-off-by: Sanket Sudake * Update golangci-lint version and timeout Signed-off-by: Sanket Sudake --- .github/workflows/lint.yaml | 4 ++-- Makefile | 10 ++++++++-- hack/codegen.sh | 10 ++++++++++ pkg/apis/README.md | 12 +++--------- .../clientset/versioned/clientset.go | 2 +- .../genclient => client}/clientset/versioned/doc.go | 0 .../clientset/versioned/fake/clientset_generated.go | 6 +++--- .../clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 0 .../clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 0 .../versioned/typed/core/v1/canaryconfig.go | 2 +- .../clientset/versioned/typed/core/v1/core_client.go | 2 +- .../clientset/versioned/typed/core/v1/doc.go | 0 .../clientset/versioned/typed/core/v1/environment.go | 2 +- .../clientset/versioned/typed/core/v1/fake/doc.go | 0 .../typed/core/v1/fake/fake_canaryconfig.go | 0 .../versioned/typed/core/v1/fake/fake_core_client.go | 2 +- .../versioned/typed/core/v1/fake/fake_environment.go | 0 .../versioned/typed/core/v1/fake/fake_function.go | 0 .../versioned/typed/core/v1/fake/fake_httptrigger.go | 0 .../core/v1/fake/fake_kuberneteswatchtrigger.go | 0 .../typed/core/v1/fake/fake_messagequeuetrigger.go | 0 .../versioned/typed/core/v1/fake/fake_package.go | 0 .../versioned/typed/core/v1/fake/fake_timetrigger.go | 0 .../clientset/versioned/typed/core/v1/function.go | 2 +- .../versioned/typed/core/v1/generated_expansion.go | 0 .../clientset/versioned/typed/core/v1/httptrigger.go | 2 +- .../typed/core/v1/kuberneteswatchtrigger.go | 2 +- .../versioned/typed/core/v1/messagequeuetrigger.go | 2 +- .../clientset/versioned/typed/core/v1/package.go | 2 +- .../clientset/versioned/typed/core/v1/timetrigger.go | 2 +- .../informers/externalversions/core/interface.go | 4 ++-- .../externalversions/core/v1/canaryconfig.go | 6 +++--- .../externalversions/core/v1/environment.go | 6 +++--- .../informers/externalversions/core/v1/function.go | 6 +++--- .../externalversions/core/v1/httptrigger.go | 6 +++--- .../informers/externalversions/core/v1/interface.go | 2 +- .../core/v1/kuberneteswatchtrigger.go | 6 +++--- .../externalversions/core/v1/messagequeuetrigger.go | 6 +++--- .../informers/externalversions/core/v1/package.go | 6 +++--- .../externalversions/core/v1/timetrigger.go | 6 +++--- .../informers/externalversions/factory.go | 6 +++--- .../informers/externalversions/generic.go | 0 .../internalinterfaces/factory_interfaces.go | 2 +- .../listers/core/v1/canaryconfig.go | 0 .../listers/core/v1/environment.go | 0 .../listers/core/v1/expansion_generated.go | 0 .../genclient => client}/listers/core/v1/function.go | 0 .../listers/core/v1/httptrigger.go | 0 .../listers/core/v1/kuberneteswatchtrigger.go | 0 .../listers/core/v1/messagequeuetrigger.go | 0 .../genclient => client}/listers/core/v1/package.go | 0 .../listers/core/v1/timetrigger.go | 0 pkg/crd/client.go | 2 +- pkg/storagesvc/localstorage.go | 4 ---- 56 files changed, 69 insertions(+), 63 deletions(-) create mode 100755 hack/codegen.sh rename pkg/{apis/genclient => client}/clientset/versioned/clientset.go (96%) rename pkg/{apis/genclient => client}/clientset/versioned/doc.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/fake/clientset_generated.go (90%) rename pkg/{apis/genclient => client}/clientset/versioned/fake/doc.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/fake/register.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/scheme/doc.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/scheme/register.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/canaryconfig.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/core_client.go (97%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/doc.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/environment.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/doc.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_canaryconfig.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_core_client.go (95%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_environment.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_function.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_httptrigger.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_kuberneteswatchtrigger.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_messagequeuetrigger.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_package.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/fake/fake_timetrigger.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/function.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/generated_expansion.go (100%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/httptrigger.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/messagequeuetrigger.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/package.go (98%) rename pkg/{apis/genclient => client}/clientset/versioned/typed/core/v1/timetrigger.go (98%) rename pkg/{apis/genclient => client}/informers/externalversions/core/interface.go (87%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/canaryconfig.go (92%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/environment.go (92%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/function.go (92%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/httptrigger.go (92%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/interface.go (97%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/kuberneteswatchtrigger.go (93%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/messagequeuetrigger.go (93%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/package.go (92%) rename pkg/{apis/genclient => client}/informers/externalversions/core/v1/timetrigger.go (92%) rename pkg/{apis/genclient => client}/informers/externalversions/factory.go (95%) rename pkg/{apis/genclient => client}/informers/externalversions/generic.go (100%) rename pkg/{apis/genclient => client}/informers/externalversions/internalinterfaces/factory_interfaces.go (94%) rename pkg/{apis/genclient => client}/listers/core/v1/canaryconfig.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/environment.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/expansion_generated.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/function.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/httptrigger.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/kuberneteswatchtrigger.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/messagequeuetrigger.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/package.go (100%) rename pkg/{apis/genclient => client}/listers/core/v1/timetrigger.go (100%) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 8cd32d04..ad96e481 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -35,7 +35,7 @@ jobs: go mod verify go mod download - LINT_VERSION=1.39.0 + LINT_VERSION=1.41.1 curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \ tar xz --strip-components 1 --wildcards \*/golangci-lint mkdir -p bin && mv golangci-lint bin/ @@ -56,7 +56,7 @@ jobs: assert-nothing-changed go fmt ./... assert-nothing-changed go mod tidy - bin/golangci-lint run --out-format=github-actions --timeout=3m || STATUS=$? + bin/golangci-lint run --out-format=github-actions --timeout=5m || STATUS=$? exit $STATUS diff --git a/Makefile b/Makefile index 1014fec3..9550112c 100644 --- a/Makefile +++ b/Makefile @@ -103,6 +103,10 @@ reporter-multiarch-img: cmd/reporter/Dockerfile.reporter --build-arg BUILDVERSION=$(VERSION) \ $(DOCKER_FLAGS) -f $< . +### Codegen +codegen: + @./hack/codegen.sh + ### CRDs generate-crds: controller-gen crd:trivialVersions=false,preserveUnknownFields=false \ @@ -131,6 +135,8 @@ clean: generate-swagger-doc: @cd pkg/apis/core/v1/tool && ./update-generated-swagger-docs.sh -make release: +all-generators: codegen generate-crds generate-swagger-doc + +release: @./hack/release.sh $(VERSION) - @./hack/releas-tag.sh $(VERSION) \ No newline at end of file + @./hack/release-tag.sh $(VERSION) \ No newline at end of file diff --git a/hack/codegen.sh b/hack/codegen.sh new file mode 100755 index 00000000..5458a211 --- /dev/null +++ b/hack/codegen.sh @@ -0,0 +1,10 @@ +if [ ! -d "../code-generator" ]; then + echo "Please get code-generator from fission org" + exit 1 +fi + +export GOPATH=$(go env GOPATH) +../code-generator/generate-groups.sh all \ + github.com/fission/fission/pkg/client \ + github.com/fission/fission/pkg/apis "core:v1" \ + --go-header-file ./pkg/apis/boilerplate.txt diff --git a/pkg/apis/README.md b/pkg/apis/README.md index 43e39478..775a32fa 100644 --- a/pkg/apis/README.md +++ b/pkg/apis/README.md @@ -1,18 +1,12 @@ # Fission CRD generation -* Clone https://github.com/fission/code-generator to generate fission CRD object deepcopy and client methods. +* Clone [code-generator](https://github.com/fission/code-generator) to generate fission CRD object deepcopy and client methods. * MUST run code-generator in the fission root directory. ``` bash -$ cd $GOPATH/src/github.com/fission/fission/ -$ bash $GOPATH/src/k8s.io/code-generator/generate-groups.sh \ - all \ - github.com/fission/fission/pkg/apis/genclient \ - github.com/fission/fission/pkg/apis \ - "core:v1" \ - --go-header-file $GOPATH/src/github.com/fission/fission/pkg/apis/boilerplate.txt +$ make codgen ``` -# Reference +## Reference * https://blog.openshift.com/kubernetes-deep-dive-code-generation-customresources/ diff --git a/pkg/apis/genclient/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go similarity index 96% rename from pkg/apis/genclient/clientset/versioned/clientset.go rename to pkg/client/clientset/versioned/clientset.go index 95da3402..4de2c088 100644 --- a/pkg/apis/genclient/clientset/versioned/clientset.go +++ b/pkg/client/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ package versioned import ( "fmt" - corev1 "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/typed/core/v1" + corev1 "github.com/fission/fission/pkg/client/clientset/versioned/typed/core/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/pkg/apis/genclient/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/doc.go rename to pkg/client/clientset/versioned/doc.go diff --git a/pkg/apis/genclient/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 90% rename from pkg/apis/genclient/clientset/versioned/fake/clientset_generated.go rename to pkg/client/clientset/versioned/fake/clientset_generated.go index d218adfc..7f880c08 100644 --- a/pkg/apis/genclient/clientset/versioned/fake/clientset_generated.go +++ b/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - corev1 "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/typed/core/v1" - fakecorev1 "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake" + clientset "github.com/fission/fission/pkg/client/clientset/versioned" + corev1 "github.com/fission/fission/pkg/client/clientset/versioned/typed/core/v1" + fakecorev1 "github.com/fission/fission/pkg/client/clientset/versioned/typed/core/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/pkg/apis/genclient/clientset/versioned/fake/doc.go b/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/fake/doc.go rename to pkg/client/clientset/versioned/fake/doc.go diff --git a/pkg/apis/genclient/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/fake/register.go rename to pkg/client/clientset/versioned/fake/register.go diff --git a/pkg/apis/genclient/clientset/versioned/scheme/doc.go b/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/scheme/doc.go rename to pkg/client/clientset/versioned/scheme/doc.go diff --git a/pkg/apis/genclient/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/scheme/register.go rename to pkg/client/clientset/versioned/scheme/register.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/canaryconfig.go b/pkg/client/clientset/versioned/typed/core/v1/canaryconfig.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/canaryconfig.go rename to pkg/client/clientset/versioned/typed/core/v1/canaryconfig.go index 61606c98..bed07469 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/canaryconfig.go +++ b/pkg/client/clientset/versioned/typed/core/v1/canaryconfig.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/core_client.go b/pkg/client/clientset/versioned/typed/core/v1/core_client.go similarity index 97% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/core_client.go rename to pkg/client/clientset/versioned/typed/core/v1/core_client.go index a9d682d7..5910a33d 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/core_client.go +++ b/pkg/client/clientset/versioned/typed/core/v1/core_client.go @@ -20,7 +20,7 @@ package v1 import ( v1 "github.com/fission/fission/pkg/apis/core/v1" - "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + "github.com/fission/fission/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/doc.go b/pkg/client/clientset/versioned/typed/core/v1/doc.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/doc.go rename to pkg/client/clientset/versioned/typed/core/v1/doc.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/environment.go b/pkg/client/clientset/versioned/typed/core/v1/environment.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/environment.go rename to pkg/client/clientset/versioned/typed/core/v1/environment.go index cbf6ac02..9edf98af 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/environment.go +++ b/pkg/client/clientset/versioned/typed/core/v1/environment.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/doc.go b/pkg/client/clientset/versioned/typed/core/v1/fake/doc.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/doc.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/doc.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_canaryconfig.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_canaryconfig.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_canaryconfig.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_canaryconfig.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_core_client.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_core_client.go similarity index 95% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_core_client.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_core_client.go index 076f3f9b..f89d07da 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_core_client.go +++ b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_core_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1 "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/typed/core/v1" + v1 "github.com/fission/fission/pkg/client/clientset/versioned/typed/core/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_environment.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_environment.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_environment.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_environment.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_function.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_function.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_function.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_function.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_httptrigger.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_httptrigger.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_httptrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_httptrigger.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_kuberneteswatchtrigger.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_kuberneteswatchtrigger.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_kuberneteswatchtrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_kuberneteswatchtrigger.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_messagequeuetrigger.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_messagequeuetrigger.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_messagequeuetrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_messagequeuetrigger.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_package.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_package.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_package.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_package.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_timetrigger.go b/pkg/client/clientset/versioned/typed/core/v1/fake/fake_timetrigger.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/fake/fake_timetrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/fake/fake_timetrigger.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/function.go b/pkg/client/clientset/versioned/typed/core/v1/function.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/function.go rename to pkg/client/clientset/versioned/typed/core/v1/function.go index 0ad19937..43409c9c 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/function.go +++ b/pkg/client/clientset/versioned/typed/core/v1/function.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/generated_expansion.go b/pkg/client/clientset/versioned/typed/core/v1/generated_expansion.go similarity index 100% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/generated_expansion.go rename to pkg/client/clientset/versioned/typed/core/v1/generated_expansion.go diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/httptrigger.go b/pkg/client/clientset/versioned/typed/core/v1/httptrigger.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/httptrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/httptrigger.go index e3fa4f98..5692ad15 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/httptrigger.go +++ b/pkg/client/clientset/versioned/typed/core/v1/httptrigger.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go b/pkg/client/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go index 6ce46e41..c8ff055e 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go +++ b/pkg/client/clientset/versioned/typed/core/v1/kuberneteswatchtrigger.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/messagequeuetrigger.go b/pkg/client/clientset/versioned/typed/core/v1/messagequeuetrigger.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/messagequeuetrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/messagequeuetrigger.go index 61680bb9..21e1bc7c 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/messagequeuetrigger.go +++ b/pkg/client/clientset/versioned/typed/core/v1/messagequeuetrigger.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/package.go b/pkg/client/clientset/versioned/typed/core/v1/package.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/package.go rename to pkg/client/clientset/versioned/typed/core/v1/package.go index 664a2c1e..3b2d937e 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/package.go +++ b/pkg/client/clientset/versioned/typed/core/v1/package.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/clientset/versioned/typed/core/v1/timetrigger.go b/pkg/client/clientset/versioned/typed/core/v1/timetrigger.go similarity index 98% rename from pkg/apis/genclient/clientset/versioned/typed/core/v1/timetrigger.go rename to pkg/client/clientset/versioned/typed/core/v1/timetrigger.go index 809fb7d3..98bdaf65 100644 --- a/pkg/apis/genclient/clientset/versioned/typed/core/v1/timetrigger.go +++ b/pkg/client/clientset/versioned/typed/core/v1/timetrigger.go @@ -23,7 +23,7 @@ import ( "time" v1 "github.com/fission/fission/pkg/apis/core/v1" - scheme "github.com/fission/fission/pkg/apis/genclient/clientset/versioned/scheme" + scheme "github.com/fission/fission/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/interface.go b/pkg/client/informers/externalversions/core/interface.go similarity index 87% rename from pkg/apis/genclient/informers/externalversions/core/interface.go rename to pkg/client/informers/externalversions/core/interface.go index 308a152a..fade04a8 100644 --- a/pkg/apis/genclient/informers/externalversions/core/interface.go +++ b/pkg/client/informers/externalversions/core/interface.go @@ -19,8 +19,8 @@ limitations under the License. package core import ( - v1 "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/core/v1" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/informers/externalversions/core/v1" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/canaryconfig.go b/pkg/client/informers/externalversions/core/v1/canaryconfig.go similarity index 92% rename from pkg/apis/genclient/informers/externalversions/core/v1/canaryconfig.go rename to pkg/client/informers/externalversions/core/v1/canaryconfig.go index 08d5d2c3..f4ccc66a 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/canaryconfig.go +++ b/pkg/client/informers/externalversions/core/v1/canaryconfig.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/environment.go b/pkg/client/informers/externalversions/core/v1/environment.go similarity index 92% rename from pkg/apis/genclient/informers/externalversions/core/v1/environment.go rename to pkg/client/informers/externalversions/core/v1/environment.go index 8b9840f5..4b9872bc 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/environment.go +++ b/pkg/client/informers/externalversions/core/v1/environment.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/function.go b/pkg/client/informers/externalversions/core/v1/function.go similarity index 92% rename from pkg/apis/genclient/informers/externalversions/core/v1/function.go rename to pkg/client/informers/externalversions/core/v1/function.go index eedcaab8..12fd8e07 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/function.go +++ b/pkg/client/informers/externalversions/core/v1/function.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/httptrigger.go b/pkg/client/informers/externalversions/core/v1/httptrigger.go similarity index 92% rename from pkg/apis/genclient/informers/externalversions/core/v1/httptrigger.go rename to pkg/client/informers/externalversions/core/v1/httptrigger.go index fa9fe670..91aa88b7 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/httptrigger.go +++ b/pkg/client/informers/externalversions/core/v1/httptrigger.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/interface.go b/pkg/client/informers/externalversions/core/v1/interface.go similarity index 97% rename from pkg/apis/genclient/informers/externalversions/core/v1/interface.go rename to pkg/client/informers/externalversions/core/v1/interface.go index 71c61bab..db676cd7 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/interface.go +++ b/pkg/client/informers/externalversions/core/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/kuberneteswatchtrigger.go b/pkg/client/informers/externalversions/core/v1/kuberneteswatchtrigger.go similarity index 93% rename from pkg/apis/genclient/informers/externalversions/core/v1/kuberneteswatchtrigger.go rename to pkg/client/informers/externalversions/core/v1/kuberneteswatchtrigger.go index 204ccca1..9d5e3a13 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/kuberneteswatchtrigger.go +++ b/pkg/client/informers/externalversions/core/v1/kuberneteswatchtrigger.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/messagequeuetrigger.go b/pkg/client/informers/externalversions/core/v1/messagequeuetrigger.go similarity index 93% rename from pkg/apis/genclient/informers/externalversions/core/v1/messagequeuetrigger.go rename to pkg/client/informers/externalversions/core/v1/messagequeuetrigger.go index 9a38c5b4..3b062323 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/messagequeuetrigger.go +++ b/pkg/client/informers/externalversions/core/v1/messagequeuetrigger.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/package.go b/pkg/client/informers/externalversions/core/v1/package.go similarity index 92% rename from pkg/apis/genclient/informers/externalversions/core/v1/package.go rename to pkg/client/informers/externalversions/core/v1/package.go index e4e8206e..d50d4ddd 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/package.go +++ b/pkg/client/informers/externalversions/core/v1/package.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/core/v1/timetrigger.go b/pkg/client/informers/externalversions/core/v1/timetrigger.go similarity index 92% rename from pkg/apis/genclient/informers/externalversions/core/v1/timetrigger.go rename to pkg/client/informers/externalversions/core/v1/timetrigger.go index 318e3351..36cebd3c 100644 --- a/pkg/apis/genclient/informers/externalversions/core/v1/timetrigger.go +++ b/pkg/client/informers/externalversions/core/v1/timetrigger.go @@ -23,9 +23,9 @@ import ( time "time" corev1 "github.com/fission/fission/pkg/apis/core/v1" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" - v1 "github.com/fission/fission/pkg/apis/genclient/listers/core/v1" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" + v1 "github.com/fission/fission/pkg/client/listers/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/pkg/apis/genclient/informers/externalversions/factory.go b/pkg/client/informers/externalversions/factory.go similarity index 95% rename from pkg/apis/genclient/informers/externalversions/factory.go rename to pkg/client/informers/externalversions/factory.go index c35193a9..619e8b6b 100644 --- a/pkg/apis/genclient/informers/externalversions/factory.go +++ b/pkg/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" - core "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/core" - internalinterfaces "github.com/fission/fission/pkg/apis/genclient/informers/externalversions/internalinterfaces" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" + core "github.com/fission/fission/pkg/client/informers/externalversions/core" + internalinterfaces "github.com/fission/fission/pkg/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/apis/genclient/informers/externalversions/generic.go b/pkg/client/informers/externalversions/generic.go similarity index 100% rename from pkg/apis/genclient/informers/externalversions/generic.go rename to pkg/client/informers/externalversions/generic.go diff --git a/pkg/apis/genclient/informers/externalversions/internalinterfaces/factory_interfaces.go b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 94% rename from pkg/apis/genclient/informers/externalversions/internalinterfaces/factory_interfaces.go rename to pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 9dacb07a..0ad6134f 100644 --- a/pkg/apis/genclient/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" + versioned "github.com/fission/fission/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/pkg/apis/genclient/listers/core/v1/canaryconfig.go b/pkg/client/listers/core/v1/canaryconfig.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/canaryconfig.go rename to pkg/client/listers/core/v1/canaryconfig.go diff --git a/pkg/apis/genclient/listers/core/v1/environment.go b/pkg/client/listers/core/v1/environment.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/environment.go rename to pkg/client/listers/core/v1/environment.go diff --git a/pkg/apis/genclient/listers/core/v1/expansion_generated.go b/pkg/client/listers/core/v1/expansion_generated.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/expansion_generated.go rename to pkg/client/listers/core/v1/expansion_generated.go diff --git a/pkg/apis/genclient/listers/core/v1/function.go b/pkg/client/listers/core/v1/function.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/function.go rename to pkg/client/listers/core/v1/function.go diff --git a/pkg/apis/genclient/listers/core/v1/httptrigger.go b/pkg/client/listers/core/v1/httptrigger.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/httptrigger.go rename to pkg/client/listers/core/v1/httptrigger.go diff --git a/pkg/apis/genclient/listers/core/v1/kuberneteswatchtrigger.go b/pkg/client/listers/core/v1/kuberneteswatchtrigger.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/kuberneteswatchtrigger.go rename to pkg/client/listers/core/v1/kuberneteswatchtrigger.go diff --git a/pkg/apis/genclient/listers/core/v1/messagequeuetrigger.go b/pkg/client/listers/core/v1/messagequeuetrigger.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/messagequeuetrigger.go rename to pkg/client/listers/core/v1/messagequeuetrigger.go diff --git a/pkg/apis/genclient/listers/core/v1/package.go b/pkg/client/listers/core/v1/package.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/package.go rename to pkg/client/listers/core/v1/package.go diff --git a/pkg/apis/genclient/listers/core/v1/timetrigger.go b/pkg/client/listers/core/v1/timetrigger.go similarity index 100% rename from pkg/apis/genclient/listers/core/v1/timetrigger.go rename to pkg/client/listers/core/v1/timetrigger.go diff --git a/pkg/crd/client.go b/pkg/crd/client.go index af4dcccc..1d91aad9 100644 --- a/pkg/crd/client.go +++ b/pkg/crd/client.go @@ -31,7 +31,7 @@ import ( "k8s.io/client-go/tools/clientcmd" metricsclient "k8s.io/metrics/pkg/client/clientset/versioned" - genClientset "github.com/fission/fission/pkg/apis/genclient/clientset/versioned" + genClientset "github.com/fission/fission/pkg/client/clientset/versioned" ) type ( diff --git a/pkg/storagesvc/localstorage.go b/pkg/storagesvc/localstorage.go index 484eaeee..efc38ed0 100644 --- a/pkg/storagesvc/localstorage.go +++ b/pkg/storagesvc/localstorage.go @@ -32,10 +32,6 @@ func (ls localStorage) getStorageType() StorageType { return ls.storageType } -func (ls localStorage) SetLocalPath(path string) { - ls.localPath = path -} - func (ls localStorage) getUploadFileName() string { // This is not the item ID (that's returned by Put) // should we just use handler.Filename? what are the constraints here?