Make network diagnostic pod image configurable

Author: Ravi Sankar Penta

pkg/cmd/admin/diagnostics/client.go

@@ -62,6 +62,7 @@ func (o DiagnosticsOptions) buildClientDiagnostics(rawConfig *clientcmdapi.Confi
 				Factory:             o.Factory,
 				PreventModification: o.PreventModification,
 				LogDir:              o.NetworkDiagLogDir,
+				PodImage:            o.NetworkDiagPodImage,
 			})
 		default:
 			return nil, false, fmt.Errorf("unknown diagnostic: %v", diagnosticName)

pkg/cmd/admin/diagnostics/diagnostics.go

@@ -44,6 +44,8 @@ type DiagnosticsOptions struct {
 	PreventModification bool
 	// Path to store network diagnostic results in case of errors
 	NetworkDiagLogDir string
+	// Image to use for network diagnostic pod
+	NetworkDiagPodImage string
 	// We need a factory for creating clients. Creating a factory
 	// creates flags as a byproduct, most of which we don't want.
 	// The command creates these and binds only the flags we want.
@@ -133,6 +135,7 @@ func NewCmdDiagnostics(name string, fullName string, out io.Writer) *cobra.Comma
 	cmd.Flags().BoolVar(&o.ImageTemplate.Latest, options.FlagLatestImageName, false, "If true, when expanding the image template, use latest version, not release version")
 	cmd.Flags().BoolVar(&o.PreventModification, options.FlagPreventModificationName, false, "If true, may be set to prevent diagnostics making any changes via the API")
 	cmd.Flags().StringVar(&o.NetworkDiagLogDir, options.FlagNetworkDiagLogDir, netutil.NetworkDiagDefaultLogDir, "Path to store network diagnostic results in case of errors")
+	cmd.Flags().StringVar(&o.NetworkDiagPodImage, options.FlagNetworkDiagPodImage, netutil.NetworkDiagDefaultPodImage, "Image to use for network diagnostic pod")
 	flagtypes.GLog(cmd.Flags())
 	options.BindLoggerOptionFlags(cmd.Flags(), o.LogOptions, options.RecommendedLoggerOptionFlags())
 

pkg/cmd/admin/diagnostics/options/flaginfo.go

@@ -54,4 +54,5 @@ const (
 	FlagLatestImageName         = "latest-images"
 	FlagPreventModificationName = "prevent-modification"
 	FlagNetworkDiagLogDir       = "network-logdir"
+	FlagNetworkDiagPodImage     = "network-pod-image"
 )

pkg/diagnostics/network/objects.go

@@ -13,15 +13,14 @@ import (
 )
 
 const (
-	diagnosticsImage           = "openshift/origin"
 	networkDiagTestPodSelector = "network-diag-pod-name"
 
 	testPodImage   = "docker.io/openshift/hello-openshift"
 	testPodPort    = 9876
 	testTargetPort = 8080
 )
 
-func GetNetworkDiagnosticsPod(command, podName, nodeName string) *kapi.Pod {
+func GetNetworkDiagnosticsPod(diagnosticsImage, command, podName, nodeName string) *kapi.Pod {
 	privileged := true
 	hostRootVolName := "host-root-dir"
 	secretVolName := "kconfig-secret"

pkg/diagnostics/network/run_pod.go

@@ -31,6 +31,7 @@ type NetworkDiagnostic struct {
 	Factory             *osclientcmd.Factory
 	PreventModification bool
 	LogDir              string
+	PodImage            string
 
 	pluginName    string
 	nodes         []kapi.Node
@@ -94,6 +95,9 @@ func (d *NetworkDiagnostic) Check() types.DiagnosticResult {
 	if len(d.LogDir) == 0 {
 		d.LogDir = util.NetworkDiagDefaultLogDir
 	}
+	if len(d.PodImage) == 0 {
+		d.PodImage = util.NetworkDiagDefaultPodImage
+	}
 	d.runNetworkDiagnostic()
 	return d.res
 }
@@ -172,7 +176,7 @@ func (d *NetworkDiagnostic) runNetworkPod(command string) error {
 	for _, node := range d.nodes {
 		podName := kapi.SimpleNameGenerator.GenerateName(fmt.Sprintf("%s-", util.NetworkDiagPodNamePrefix))
 
-		pod := GetNetworkDiagnosticsPod(command, podName, node.Name)
+		pod := GetNetworkDiagnosticsPod(d.PodImage, command, podName, node.Name)
 		_, err := d.KubeClient.Core().Pods(d.nsName1).Create(pod)
 		if err != nil {
 			return fmt.Errorf("Creating network diagnostic pod %q on node %q with command %q failed: %v", podName, node.Name, command, err)

pkg/diagnostics/networkpod/util/util.go

@@ -31,6 +31,8 @@ const (
 	NetworkDiagNodeLogDirPrefix      = "/nodes"
 	NetworkDiagMasterLogDirPrefix    = "/master"
 	NetworkDiagPodLogDirPrefix       = "/pods"
+
+	NetworkDiagDefaultPodImage = "openshift/origin"
 )
 
 func GetOpenShiftNetworkPlugin(osClient *osclient.Client) (string, bool, error) {