Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump api-controller image #3143

Closed
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions components/api-controller/Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions components/api-controller/Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ required = [
version = "kubernetes-1.10.1"

[[constraint]]
name = "github.com/satori/go.uuid"
version = "1.2.0"
name = "github.com/gofrs/uuid"
version = "3.2.0"

[[constraint]]
name = "github.com/smartystreets/goconvey"
Expand Down
13 changes: 8 additions & 5 deletions components/api-controller/pkg/controller/commons/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ package commons
import (
"fmt"

"github.com/satori/go.uuid"
"github.com/gofrs/uuid"
log "github.com/sirupsen/logrus"
)

// Logs root cause and returns new error to hide implementation details
//HandleError Logs root cause and returns new error to hide implementation details
func HandleError(rootCause error, msg string) error {
errId := uuid.NewV4()
log.Errorf("[Error '%s']: %v", errId, rootCause)
return fmt.Errorf("%s (error code = '%s')", msg, errId)
errID, err := uuid.NewV4()
if err != nil {
log.Fatalf("failed to generate UUID: %v", err)
}
log.Errorf("[Error '%s']: %v", errID, rootCause)
return fmt.Errorf("%s (error code = '%s')", msg, errID)
}
4 changes: 2 additions & 2 deletions resources/core/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ global:
dir: develop/
version: e12b49fc
api_controller:
dir: develop/
version: bc120200
dir: pr/
version: "PR-3141"
api_controller_acceptance_tests:
dir: develop/
version: 736988df
Expand Down