deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Merge pull request #937 from hangyan/fix-code-style

Browse Source 
Variable name should not be the same as imported package name
This commit is contained in:
Charlie Drage 2018-02-23 10:30:53 -05:00 committed by GitHub
commit bccc56373c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/transformer/openshift/openshift.go
View File

@ -421,11 +421,11 @@ func (o *OpenShift) getOpenShiftClient() (*oclient.Client, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
oclient := oclient.NewOrDie(oclientConfig) oc := oclient.NewOrDie(oclientConfig)
return oclient, nil return oc, nil
} }
// Deploy transofrms and deploys kobject to OpenShift // Deploy transforms and deploys kobject to OpenShift
func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) error { func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.ConvertOptions) error {
//Convert komposeObject //Convert komposeObject
objects, err := o.Transform(komposeObject, opt) objects, err := o.Transform(komposeObject, opt)
@ -441,7 +441,7 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
log.Info("We are going to create OpenShift DeploymentConfigs, Services" + pvcStr + "for your Dockerized application. \n" + log.Info("We are going to create OpenShift DeploymentConfigs, Services" + pvcStr + "for your Dockerized application. \n" +
"If you need different kind of resources, use the 'kompose convert' and 'oc create -f' commands instead. \n") "If you need different kind of resources, use the 'kompose convert' and 'oc create -f' commands instead. \n")
oclient, err := o.getOpenShiftClient() oc, err := o.getOpenShiftClient()
if err != nil { if err != nil {
return err return err
} }
@ -459,19 +459,19 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
for _, v := range objects { for _, v := range objects {
switch t := v.(type) { switch t := v.(type) {
case *imageapi.ImageStream: case *imageapi.ImageStream:
_, err := oclient.ImageStreams(namespace).Create(t) _, err := oc.ImageStreams(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
log.Infof("Successfully created ImageStream: %s", t.Name) log.Infof("Successfully created ImageStream: %s", t.Name)
case *buildapi.BuildConfig: case *buildapi.BuildConfig:
_, err := oclient.BuildConfigs(namespace).Create(t) _, err := oc.BuildConfigs(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
log.Infof("Successfully created BuildConfig: %s", t.Name) log.Infof("Successfully created BuildConfig: %s", t.Name)
case *deployapi.DeploymentConfig: case *deployapi.DeploymentConfig:
_, err := oclient.DeploymentConfigs(namespace).Create(t) _, err := oc.DeploymentConfigs(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
@ -489,7 +489,7 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
} }
log.Infof("Successfully created PersistentVolumeClaim: %s of size %s. If your cluster has dynamic storage provisioning, you don't have to do anything. Otherwise you have to create PersistentVolume to make PVC work", t.Name, kubernetes.PVCRequestSize) log.Infof("Successfully created PersistentVolumeClaim: %s of size %s. If your cluster has dynamic storage provisioning, you don't have to do anything. Otherwise you have to create PersistentVolume to make PVC work", t.Name, kubernetes.PVCRequestSize)
case *routeapi.Route: case *routeapi.Route:
_, err := oclient.Routes(namespace).Create(t) _, err := oc.Routes(namespace).Create(t)
if err != nil { if err != nil {
return err return err
} }
@ -523,7 +523,7 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
errorList = append(errorList, err) errorList = append(errorList, err)
return errorList return errorList
} }
oclient, err := o.getOpenShiftClient() oc, err := o.getOpenShiftClient()
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
return errorList return errorList
@ -547,14 +547,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
switch t := v.(type) { switch t := v.(type) {
case *imageapi.ImageStream: case *imageapi.ImageStream:
//delete imageStream //delete imageStream
imageStream, err := oclient.ImageStreams(namespace).List(options) imageStream, err := oc.ImageStreams(namespace).List(options)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
break break
} }
for _, l := range imageStream.Items { for _, l := range imageStream.Items {
if reflect.DeepEqual(l.Labels, komposeLabel) { if reflect.DeepEqual(l.Labels, komposeLabel) {
err = oclient.ImageStreams(namespace).Delete(t.Name) err = oc.ImageStreams(namespace).Delete(t.Name)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
break break
@ -564,14 +564,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
} }
case *buildapi.BuildConfig: case *buildapi.BuildConfig:
buildConfig, err := oclient.BuildConfigs(namespace).List(options) buildConfig, err := oc.BuildConfigs(namespace).List(options)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
break break
} }
for _, l := range buildConfig.Items { for _, l := range buildConfig.Items {
if reflect.DeepEqual(l.Labels, komposeLabel) { if reflect.DeepEqual(l.Labels, komposeLabel) {
bcreaper := buildconfigreaper.NewBuildConfigReaper(oclient) bcreaper := buildconfigreaper.NewBuildConfigReaper(oc)
err := bcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) err := bcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
@ -583,14 +583,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
case *deployapi.DeploymentConfig: case *deployapi.DeploymentConfig:
// delete deploymentConfig // delete deploymentConfig
deploymentConfig, err := oclient.DeploymentConfigs(namespace).List(options) deploymentConfig, err := oc.DeploymentConfigs(namespace).List(options)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
break break
} }
for _, l := range deploymentConfig.Items { for _, l := range deploymentConfig.Items {
if reflect.DeepEqual(l.Labels, komposeLabel) { if reflect.DeepEqual(l.Labels, komposeLabel) {
dcreaper := deploymentconfigreaper.NewDeploymentConfigReaper(oclient, kclient) dcreaper := deploymentconfigreaper.NewDeploymentConfigReaper(oc, kclient)
err := dcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil) err := dcreaper.Stop(namespace, t.Name, TIMEOUT*time.Second, nil)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
@ -644,14 +644,14 @@ func (o *OpenShift) Undeploy(komposeObject kobject.KomposeObject, opt kobject.Co
case *routeapi.Route: case *routeapi.Route:
// delete route // delete route
route, err := oclient.Routes(namespace).List(options) route, err := oc.Routes(namespace).List(options)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
break break
} }
for _, l := range route.Items { for _, l := range route.Items {
if reflect.DeepEqual(l.Labels, komposeLabel) { if reflect.DeepEqual(l.Labels, komposeLabel) {
err = oclient.Routes(namespace).Delete(t.Name) err = oc.Routes(namespace).Delete(t.Name)
if err != nil { if err != nil {
errorList = append(errorList, err) errorList = append(errorList, err)
break break