From 51dea8283aea691f5b6e777350657b2b102b7650 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 27 Oct 2016 10:41:34 -0400 Subject: [PATCH] transformers: add Opt variable as object data This is so you can set Opts on instance creation of kubernetes.Kubernetes and openshift.Openshift. This is useful so that we can pass option information arround without having to do it on the call stack every time. --- cli/app/app.go | 6 +++--- pkg/transformer/kubernetes/kubernetes.go | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/app/app.go b/cli/app/app.go index 1205070e..bb2052d1 100644 --- a/cli/app/app.go +++ b/cli/app/app.go @@ -233,12 +233,12 @@ func Down(c *cli.Context) { func getTransformer(opt kobject.ConvertOptions) transformer.Transformer { var t transformer.Transformer if opt.Provider == "kubernetes" { - // Create/Init new Kubernetes object - t = &kubernetes.Kubernetes{} + // Create/Init new Kubernetes object with CLI opts + t = &kubernetes.Kubernetes{Opt: opt} } else { // Create/Init new OpenShift object that is initialized with a newly // created Kubernetes object. Openshift inherits from Kubernetes - t = &openshift.OpenShift{kubernetes.Kubernetes{}} + t = &openshift.OpenShift{kubernetes.Kubernetes{Opt: opt}} } return t } diff --git a/pkg/transformer/kubernetes/kubernetes.go b/pkg/transformer/kubernetes/kubernetes.go index 236b644a..45761cea 100644 --- a/pkg/transformer/kubernetes/kubernetes.go +++ b/pkg/transformer/kubernetes/kubernetes.go @@ -43,6 +43,8 @@ import ( ) type Kubernetes struct { + // the user provided options from the command line + Opt kobject.ConvertOptions } // timeout is how long we'll wait for the termination of kubernetes resource to be successful