Skip to content

Commit

Permalink
fix imported package names to not use under_scores
Browse files Browse the repository at this point in the history
  • Loading branch information
mqliang committed Oct 16, 2015
1 parent f3e0bb0 commit 569035f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions cmd/genconversion/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
_ "k8s.io/kubernetes/pkg/api/v1"
_ "k8s.io/kubernetes/pkg/apis/extensions"
_ "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"

"github.com/golang/glog"
Expand Down Expand Up @@ -89,7 +89,7 @@ func main() {
}

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"))
generator.AddImport(path.Join(pkgBase, "api/resource"))
// TODO(wojtek-t): Change the overwrites to a flag.
Expand Down
4 changes: 2 additions & 2 deletions cmd/gendeepcopy/deep_copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
_ "k8s.io/kubernetes/pkg/api/v1"
_ "k8s.io/kubernetes/pkg/apis/extensions"
_ "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"

"github.com/golang/glog"
Expand Down Expand Up @@ -109,7 +109,7 @@ func main() {
}

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"))

if len(*overwrites) > 0 {
Expand Down
8 changes: 4 additions & 4 deletions cmd/genswaggertypedocs/swagger_type_docs.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"runtime"

pkg_runtime "k8s.io/kubernetes/pkg/runtime"
kruntime "k8s.io/kubernetes/pkg/runtime"

"github.com/golang/glog"
flag "github.com/spf13/pflag"
Expand Down Expand Up @@ -54,18 +54,18 @@ func main() {
funcOut = file
}

docsForTypes := pkg_runtime.ParseDocumentationFrom(*typeSrc)
docsForTypes := kruntime.ParseDocumentationFrom(*typeSrc)

if *verify == true {
rc, err := pkg_runtime.VerifySwaggerDocsExist(docsForTypes, funcOut)
rc, err := kruntime.VerifySwaggerDocsExist(docsForTypes, funcOut)
if err != nil {
fmt.Fprintf(os.Stderr, "Error in verification process: %s\n", err)
}
os.Exit(rc)
}

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)
os.Exit(-1)
}
Expand Down

0 comments on commit 569035f

Please sign in to comment.