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.

Sign up for GitHub

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

use correct ObjectReference #62

Merged
merged 1 commit into from
Jun 15, 2017
Merged

use correct ObjectReference #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 glide.lock
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions pkg/describer/k8sdb_describer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ func (d *humanReadableDescriber) describeElastic(item *tapi.Elastic, describerSe

var events *kapi.EventList
if describerSettings.ShowEvents {
if ref, err := apiv1.GetReference(api.Scheme, item); err != nil {
if ref, err := kapi.GetReference(api.Scheme, item); err != nil {
glog.Errorf("Unable to construct reference to '%#v': %v", item, err)
} else {
ref.Kind = ""
ref.Kind = tapi.ResourceKindElastic
events, err = clientSet.Core().Events(item.Namespace).Search(api.Scheme, ref)
if err != nil {
return "", err
Expand Down Expand Up @@ -107,10 +107,10 @@ func (d *humanReadableDescriber) describePostgres(item *tapi.Postgres, describer

var events *kapi.EventList
if describerSettings.ShowEvents {
if ref, err := apiv1.GetReference(api.Scheme, item); err != nil {
if ref, err := kapi.GetReference(api.Scheme, item); err != nil {
glog.Errorf("Unable to construct reference to '%#v': %v", item, err)
} else {
ref.Kind = ""
ref.Kind = tapi.ResourceKindPostgres
events, err = clientSet.Core().Events(item.Namespace).Search(api.Scheme, ref)
if err != nil {
return "", err
Expand Down Expand Up @@ -165,10 +165,10 @@ func (d *humanReadableDescriber) describeSnapshot(item *tapi.Snapshot, describer

var events *kapi.EventList
if describerSettings.ShowEvents {
if ref, err := apiv1.GetReference(api.Scheme, item); err != nil {
if ref, err := kapi.GetReference(api.Scheme, item); err != nil {
glog.Errorf("Unable to construct reference to '%#v': %v", item, err)
} else {
ref.Kind = ""
ref.Kind = tapi.ResourceKindSnapshot
events, err = clientSet.Core().Events(item.Namespace).Search(api.Scheme, ref)
if err != nil {
return "", err
Expand Down Expand Up @@ -226,10 +226,10 @@ func (d *humanReadableDescriber) describeDormantDatabase(item *tapi.DormantDatab

var events *kapi.EventList
if describerSettings.ShowEvents {
if ref, err := apiv1.GetReference(api.Scheme, item); err != nil {
if ref, err := kapi.GetReference(api.Scheme, item); err != nil {
glog.Errorf("Unable to construct reference to '%#v': %v", item, err)
} else {
ref.Kind = ""
ref.Kind = tapi.ResourceKindDormantDatabase
events, err = clientSet.Core().Events(item.Namespace).Search(api.Scheme, ref)
if err != nil {
return "", err
Expand Down
37 changes: 28 additions & 9 deletions vendor/github.com/cpuguy83/go-md2man/md2man/roff.go
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion vendor/github.com/ghodss/yaml/fields.go
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions vendor/github.com/ghodss/yaml/yaml.go
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions vendor/github.com/k8sdb/apimachinery/api/register.go
View file
Open in desktop

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

2 changes: 0 additions & 2 deletions vendor/github.com/k8sdb/apimachinery/api/register_v1alpha1.go
View file
Open in desktop

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

Loading