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 shipwright-io/build to v0.5.0 #19

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
15 changes: 8 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ go 1.15
require (
github.com/onsi/gomega v1.10.3
github.com/pkg/errors v0.9.1
github.com/shipwright-io/build v0.4.0
github.com/shipwright-io/build v0.5.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/texttheater/golang-levenshtein/levenshtein v0.0.0-20200805054039-cae8b0eaed6c
k8s.io/api v0.19.7
k8s.io/apimachinery v0.19.7
k8s.io/cli-runtime v0.19.7
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/cli-runtime v0.20.2
k8s.io/client-go v12.0.0+incompatible
)

replace k8s.io/client-go => k8s.io/client-go v0.19.7

replace github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3 // Needed, otherwise we will hit this https://github.com/knative/client/pull/1207#issuecomment-770845105
replace (
github.com/go-openapi/spec => github.com/go-openapi/spec v0.19.3 // Needed, otherwise we will hit this https://github.com/knative/client/pull/1207#issuecomment-770845105
k8s.io/client-go => k8s.io/client-go v0.20.2
)
140 changes: 48 additions & 92 deletions go.sum

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions pkg/shp/cmd/buildrun/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import (
"os"
"text/tabwriter"

buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
"github.com/spf13/cobra"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/cli-runtime/pkg/genericclioptions"

buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"

"github.com/shipwright-io/cli/pkg/shp/cmd/runner"
"github.com/shipwright-io/cli/pkg/shp/params"
"github.com/shipwright-io/cli/pkg/shp/resource"
Expand Down Expand Up @@ -72,7 +74,13 @@ func (c *ListCommand) Run(params *params.Params, io *genericclioptions.IOStreams

for _, br := range brs.Items {
name := br.Name
status := br.Status.Reason
status := string(metav1.ConditionUnknown)
for _, condition := range br.Status.Conditions {
if condition.Type == buildv1alpha1.Succeeded {
status = condition.Reason
break
}
}

fmt.Fprintf(writer, columnTemplate, name, status)
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/shp/resource/resource_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ func TestResource(t *testing.T) {
})

t.Run("Resource List", func(t *testing.T) {
// See https://github.com/kubernetes/client-go/issues/983
t.Skip("k8s 1.20: resource.List fails, can't assign or convert unstructured.Unstructured into v1alpha1.Build")
var buildList buildv1alpha1.BuildList
err = buildResource.List(context.TODO(), &buildList)

Expand Down
3 changes: 3 additions & 0 deletions vendor/github.com/imdario/mergo/.travis.yml

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

69 changes: 39 additions & 30 deletions vendor/github.com/imdario/mergo/README.md

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

141 changes: 120 additions & 21 deletions vendor/github.com/imdario/mergo/doc.go

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

5 changes: 5 additions & 0 deletions vendor/github.com/imdario/mergo/go.mod

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

4 changes: 4 additions & 0 deletions vendor/github.com/imdario/mergo/go.sum

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

Loading