mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
fix imported package names to not use under_scores
This commit is contained in:
parent
f3e0bb0d41
commit
569035f2d2
@ -29,7 +29,7 @@ import (
|
|||||||
_ "k8s.io/kubernetes/pkg/api/v1"
|
_ "k8s.io/kubernetes/pkg/api/v1"
|
||||||
_ "k8s.io/kubernetes/pkg/apis/extensions"
|
_ "k8s.io/kubernetes/pkg/apis/extensions"
|
||||||
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
|
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
|
||||||
pkg_runtime "k8s.io/kubernetes/pkg/runtime"
|
kruntime "k8s.io/kubernetes/pkg/runtime"
|
||||||
"k8s.io/kubernetes/pkg/util/sets"
|
"k8s.io/kubernetes/pkg/util/sets"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
@ -89,7 +89,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
versionPath := pkgPath(group, version)
|
versionPath := pkgPath(group, version)
|
||||||
generator := pkg_runtime.NewConversionGenerator(api.Scheme.Raw(), versionPath)
|
generator := kruntime.NewConversionGenerator(api.Scheme.Raw(), versionPath)
|
||||||
apiShort := generator.AddImport(path.Join(pkgBase, "api"))
|
apiShort := generator.AddImport(path.Join(pkgBase, "api"))
|
||||||
generator.AddImport(path.Join(pkgBase, "api/resource"))
|
generator.AddImport(path.Join(pkgBase, "api/resource"))
|
||||||
// TODO(wojtek-t): Change the overwrites to a flag.
|
// TODO(wojtek-t): Change the overwrites to a flag.
|
||||||
|
@ -29,7 +29,7 @@ import (
|
|||||||
_ "k8s.io/kubernetes/pkg/api/v1"
|
_ "k8s.io/kubernetes/pkg/api/v1"
|
||||||
_ "k8s.io/kubernetes/pkg/apis/extensions"
|
_ "k8s.io/kubernetes/pkg/apis/extensions"
|
||||||
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
|
_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
|
||||||
pkg_runtime "k8s.io/kubernetes/pkg/runtime"
|
kruntime "k8s.io/kubernetes/pkg/runtime"
|
||||||
"k8s.io/kubernetes/pkg/util/sets"
|
"k8s.io/kubernetes/pkg/util/sets"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
@ -109,7 +109,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
versionPath := pkgPath(group, version)
|
versionPath := pkgPath(group, version)
|
||||||
generator := pkg_runtime.NewDeepCopyGenerator(api.Scheme.Raw(), versionPath, sets.NewString("k8s.io/kubernetes"))
|
generator := kruntime.NewDeepCopyGenerator(api.Scheme.Raw(), versionPath, sets.NewString("k8s.io/kubernetes"))
|
||||||
generator.AddImport(path.Join(pkgBase, "api"))
|
generator.AddImport(path.Join(pkgBase, "api"))
|
||||||
|
|
||||||
if len(*overwrites) > 0 {
|
if len(*overwrites) > 0 {
|
||||||
|
@ -22,7 +22,7 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"runtime"
|
"runtime"
|
||||||
|
|
||||||
pkg_runtime "k8s.io/kubernetes/pkg/runtime"
|
kruntime "k8s.io/kubernetes/pkg/runtime"
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
flag "github.com/spf13/pflag"
|
flag "github.com/spf13/pflag"
|
||||||
@ -54,10 +54,10 @@ func main() {
|
|||||||
funcOut = file
|
funcOut = file
|
||||||
}
|
}
|
||||||
|
|
||||||
docsForTypes := pkg_runtime.ParseDocumentationFrom(*typeSrc)
|
docsForTypes := kruntime.ParseDocumentationFrom(*typeSrc)
|
||||||
|
|
||||||
if *verify == true {
|
if *verify == true {
|
||||||
rc, err := pkg_runtime.VerifySwaggerDocsExist(docsForTypes, funcOut)
|
rc, err := kruntime.VerifySwaggerDocsExist(docsForTypes, funcOut)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "Error in verification process: %s\n", err)
|
fmt.Fprintf(os.Stderr, "Error in verification process: %s\n", err)
|
||||||
}
|
}
|
||||||
@ -65,7 +65,7 @@ func main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if docsForTypes != nil && len(docsForTypes) > 0 {
|
if docsForTypes != nil && len(docsForTypes) > 0 {
|
||||||
if err := pkg_runtime.WriteSwaggerDocFunc(docsForTypes, funcOut); err != nil {
|
if err := kruntime.WriteSwaggerDocFunc(docsForTypes, funcOut); err != nil {
|
||||||
fmt.Fprintf(os.Stderr, "Error when writing swagger documentation functions: %s\n", err)
|
fmt.Fprintf(os.Stderr, "Error when writing swagger documentation functions: %s\n", err)
|
||||||
os.Exit(-1)
|
os.Exit(-1)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user