Rename admission webhooks to avoid name collision (#725)

Dipta Das · tamalsaha · commit 859c4ee41acf · 2019-04-04T08:33:25.000-07:00
fixes #723
diff --git a/root.go b/root.go
@@ -16,6 +16,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"kmodules.xyz/client-go/logs"
 	"kmodules.xyz/client-go/tools/cli"
+	ocscheme "kmodules.xyz/openshift/client/clientset/versioned/scheme"
 )
 
 func NewRootCmd() *cobra.Command {
@@ -30,6 +31,8 @@ func NewRootCmd() *cobra.Command {
 
 			scheme.AddToScheme(clientsetscheme.Scheme)
 			scheme.AddToScheme(legacyscheme.Scheme)
+			ocscheme.AddToScheme(clientsetscheme.Scheme)
+			ocscheme.AddToScheme(legacyscheme.Scheme)
 			cli.LoggerOptions = golog.ParseFlags(c.Flags())
 		},
 	}

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`"k8s.io/kubernetes/pkg/api/legacyscheme"`
`17`	`17`	`"kmodules.xyz/client-go/logs"`
`18`	`18`	`"kmodules.xyz/client-go/tools/cli"`
	`19`	`+ ocscheme "kmodules.xyz/openshift/client/clientset/versioned/scheme"`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`func NewRootCmd() *cobra.Command {`
`@@ -30,6 +31,8 @@ func NewRootCmd() *cobra.Command {`
`30`	`31`
`31`	`32`	`scheme.AddToScheme(clientsetscheme.Scheme)`
`32`	`33`	`scheme.AddToScheme(legacyscheme.Scheme)`
	`34`	`+ ocscheme.AddToScheme(clientsetscheme.Scheme)`
	`35`	`+ ocscheme.AddToScheme(legacyscheme.Scheme)`
`33`	`36`	`cli.LoggerOptions = golog.ParseFlags(c.Flags())`
`34`	`37`	`},`
`35`	`38`	`}`