Skip to content

Commit

Permalink
fix golint errors (kubernetes-retired#2737)
Browse files Browse the repository at this point in the history
Signed-off-by: sph <shepenghui1@huawei.com>
  • Loading branch information
bysph authored and k8s-ci-robot committed Oct 28, 2019
1 parent 432b710 commit 0b5180b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions test/upgrade/examiner/internal/readiness/readiness.go
Expand Up @@ -67,7 +67,7 @@ func (r *readiness) TestEnvironmentIsReady() error {

func (r *readiness) assertServiceCatalogIsReady() error {
klog.Info("Make sure ServiceCatalog ApiServer is up")
if err := r.assertServiceCatalogApiServerIsUp(); err != nil {
if err := r.assertServiceCatalogAPIServerIsUp(); err != nil {
return errors.Wrap(err, "failed during waiting for ServiceCatalog ApiServer")
}
klog.Info("ServiceCatalog ApiServer is ready")
Expand All @@ -81,9 +81,9 @@ func (r *readiness) assertServiceCatalogIsReady() error {
return nil
}

func (r *readiness) assertServiceCatalogApiServerIsUp() error {
func (r *readiness) assertServiceCatalogAPIServerIsUp() error {
return wait.Poll(waitInterval, timeoutInterval, func() (done bool, err error) {
deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogApiServerName, v1.GetOptions{})
deployment, err := r.client.AppsV1beta1().Deployments(r.cfg.ServiceCatalogNamespace).Get(r.cfg.ServiceCatalogAPIServerName, v1.GetOptions{})
if err != nil {
return false, err
}
Expand Down
2 changes: 1 addition & 1 deletion test/upgrade/examiner/internal/readiness/sc_config.go
Expand Up @@ -18,7 +18,7 @@ package readiness

// ServiceCatalogConfig collects all parameters from env variables required to run upgrade tests
type ServiceCatalogConfig struct {
ServiceCatalogApiServerName string `envconfig:"SC_APISERVER"`
ServiceCatalogAPIServerName string `envconfig:"SC_APISERVER"`
ServiceCatalogControllerServerName string `envconfig:"SC_CONTROLLER"`
ServiceCatalogNamespace string `envconfig:"SC_NAMESPACE"`
TestBrokerName string `envconfig:"TB_NAME"`
Expand Down

0 comments on commit 0b5180b

Please sign in to comment.