Skip to content

Commit

Permalink
Update build release and vendor (knative#2183)
Browse files Browse the repository at this point in the history
* Update build release and vendor

* Fix tests
  • Loading branch information
imjasonh authored and knative-prow-robot committed Oct 8, 2018
1 parent faeb5dc commit 182cd35
Show file tree
Hide file tree
Showing 16 changed files with 191 additions and 81 deletions.
4 changes: 2 additions & 2 deletions 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 Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ required = [

[[constraint]]
name = "github.com/knative/build"
# HEAD as of 2018-10-01
revision = "96c363748e2a57d357f6c7f7be0614fe0f473b2d"
# HEAD as of 2018-10-08
revision = "cc4451408f52b86fec87f6b7e4bc88848d3b1088"

[[override]]
name = "github.com/knative/pkg"
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/serving/v1alpha1/build_compat_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestMarshal(t *testing.T) {
},
},
// TODO(mattmoor): This should not include Status.
want: `{"build":{"kind":"Build","apiVersion":"build.knative.dev","metadata":{"creationTimestamp":null},"spec":{"steps":[{"name":"","image":"busybox","resources":{}}],"timeout":"0s"},"status":{"startTime":null,"completionTime":null,"stepStates":null,"stepsCompleted":null}}}`,
want: `{"build":{"kind":"Build","apiVersion":"build.knative.dev","metadata":{"creationTimestamp":null},"spec":{"steps":[{"name":"","image":"busybox","resources":{}}]},"status":{"startTime":null,"completionTime":null,"stepStates":null,"stepsCompleted":null}}}`,
}, {
name: "raw extension with buildspec",
obj: &Enclosing{
Expand All @@ -87,7 +87,7 @@ func TestMarshal(t *testing.T) {
},
},
},
want: `{"build":{"steps":[{"name":"","image":"busybox","resources":{}}],"timeout":"0s"}}`,
want: `{"build":{"steps":[{"name":"","image":"busybox","resources":{}}]}}`,
}}

for _, test := range tests {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/serving/v1alpha1/configuration_validation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestConfigurationSpecValidation(t *testing.T) {
},
},
},
want: apis.ErrInvalidValue("Object 'Kind' is missing in '{\"metadata\":{\"creationTimestamp\":null},\"spec\":{\"steps\":[{\"name\":\"\",\"image\":\"foo\",\"resources\":{}}],\"timeout\":\"0s\"},\"status\":{\"startTime\":null,\"completionTime\":null,\"stepStates\":null,\"stepsCompleted\":null}}'", "build"),
want: apis.ErrInvalidValue("Object 'Kind' is missing in '{\"metadata\":{\"creationTimestamp\":null},\"spec\":{\"steps\":[{\"name\":\"\",\"image\":\"foo\",\"resources\":{}}]},\"status\":{\"startTime\":null,\"completionTime\":null,\"stepStates\":null,\"stepsCompleted\":null}}'", "build"),
}, {
name: "build is not an object",
c: &ConfigurationSpec{
Expand Down
2 changes: 0 additions & 2 deletions pkg/reconciler/v1alpha1/configuration/resources/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ func TestBuilds(t *testing.T) {
"image": "busybox",
"resources": map[string]interface{}{},
}},
"timeout": "0s",
},
"status": map[string]interface{}{
"startTime": nil,
Expand Down Expand Up @@ -157,7 +156,6 @@ func TestBuilds(t *testing.T) {
"value": "bar",
}},
},
"timeout": "0s",
},
"status": map[string]interface{}{
"startTime": nil,
Expand Down
26 changes: 16 additions & 10 deletions third_party/config/build/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ metadata:
name: creds-init
namespace: knative-build
spec:
image: gcr.io/knative-releases/github.com/knative/build/cmd/creds-init@sha256:770b411f241159d71210bdee7d51a608bc77ae1542dbc3e9ca9465316413b680
image: gcr.io/knative-releases/github.com/knative/build/cmd/creds-init@sha256:a5eddd139e71e17fed7ba685844607f9fc715823e57a9aa81a815a376deb63eb
---
apiVersion: caching.internal.knative.dev/v1alpha1
kind: Image
metadata:
name: git-init
namespace: knative-build
spec:
image: gcr.io/knative-releases/github.com/knative/build/cmd/git-init@sha256:b5128bc1e7c476c1036f9a2c45d499bf6a0c132ef1baa75d1fee155ae23421a6
image: gcr.io/knative-releases/github.com/knative/build/cmd/git-init@sha256:0f1b45b2cbb842b51d5499c0235fab759b7550052f12e825d376f4d159ab3634
---
apiVersion: caching.internal.knative.dev/v1alpha1
kind: Image
Expand All @@ -248,7 +248,7 @@ metadata:
name: nop
namespace: knative-build
spec:
image: gcr.io/knative-releases/github.com/knative/build/cmd/nop@sha256:b674b5c252deeae84b9e65d55f2da4ee63fbb6f123ebe481709e6f9c14faa4e1
image: gcr.io/knative-releases/github.com/knative/build/cmd/nop@sha256:c1a3869762368500dd8b763c8033108f44d7fd490d4ea2ee4564b2b840760324
---
apiVersion: v1
data:
Expand Down Expand Up @@ -286,13 +286,16 @@ metadata:
name: config-logging
namespace: knative-build
---
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: build-controller
namespace: knative-build
spec:
replicas: 1
selector:
matchLabels:
app: build-controller
template:
metadata:
labels:
Expand All @@ -304,12 +307,12 @@ spec:
- -stderrthreshold
- INFO
- -creds-image
- gcr.io/knative-releases/github.com/knative/build/cmd/creds-init@sha256:770b411f241159d71210bdee7d51a608bc77ae1542dbc3e9ca9465316413b680
- gcr.io/knative-releases/github.com/knative/build/cmd/creds-init@sha256:a5eddd139e71e17fed7ba685844607f9fc715823e57a9aa81a815a376deb63eb
- -git-image
- gcr.io/knative-releases/github.com/knative/build/cmd/git-init@sha256:b5128bc1e7c476c1036f9a2c45d499bf6a0c132ef1baa75d1fee155ae23421a6
- gcr.io/knative-releases/github.com/knative/build/cmd/git-init@sha256:0f1b45b2cbb842b51d5499c0235fab759b7550052f12e825d376f4d159ab3634
- -nop-image
- gcr.io/knative-releases/github.com/knative/build/cmd/nop@sha256:b674b5c252deeae84b9e65d55f2da4ee63fbb6f123ebe481709e6f9c14faa4e1
image: gcr.io/knative-releases/github.com/knative/build/cmd/controller@sha256:04fa3a155337c65db154083e3240ea3b309093f377536466a222b3e8d774ae08
- gcr.io/knative-releases/github.com/knative/build/cmd/nop@sha256:c1a3869762368500dd8b763c8033108f44d7fd490d4ea2ee4564b2b840760324
image: gcr.io/knative-releases/github.com/knative/build/cmd/controller@sha256:5d12da76b8ba36548a97b07866fdc9c13c1cb0e499dfdcca97af731b1ad2c488
name: build-controller
volumeMounts:
- mountPath: /etc/config-logging
Expand All @@ -320,13 +323,16 @@ spec:
name: config-logging
name: config-logging
---
apiVersion: apps/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: build-webhook
namespace: knative-build
spec:
replicas: 1
selector:
matchLabels:
app: build-webhook
template:
metadata:
labels:
Expand All @@ -338,7 +344,7 @@ spec:
- -logtostderr
- -stderrthreshold
- INFO
image: gcr.io/knative-releases/github.com/knative/build/cmd/webhook@sha256:4f6458cafbe29413bf5187ca560c0e68f004080f123afe32dcd2c8c6b27ed3d3
image: gcr.io/knative-releases/github.com/knative/build/cmd/webhook@sha256:1e63c38c6d653698973bd8c8320d4db2bdcb1b46130b33949f848c67034fe6f8
name: build-webhook
volumeMounts:
- mountPath: /etc/config-logging
Expand Down

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

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

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

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

Loading

0 comments on commit 182cd35

Please sign in to comment.