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 <sanketsudake@gmail.com>

* Update golangci-lint version and timeout

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2021-06-24 12:07:14 +05:30
committed by GitHub
parent 8b57a035ee
commit cc0400bdd4
56 changed files with 69 additions and 63 deletions
+2 -2
View File
@@ -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
+8 -2
View File
@@ -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)
@./hack/release-tag.sh $(VERSION)
+10
View File
@@ -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
+3 -9
View File
@@ -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/
@@ -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"
@@ -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"
@@ -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"
@@ -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"
)
@@ -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"
@@ -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"
)
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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.
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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.
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
+1 -1
View File
@@ -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 (
-4
View File
@@ -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?