Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
cea4c010
Commit
cea4c010
authored
Apr 16, 2016
by
Clayton Coleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strip the proto build guard
parent
3753e2bd
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
0 additions
and
16 deletions
+0
-16
update-generated-protobuf.sh
hack/after-build/update-generated-protobuf.sh
+0
-1
verify-all.sh
hack/verify-all.sh
+0
-1
quantity_proto.go
pkg/api/resource/quantity_proto.go
+0
-2
serialization_proto_test.go
pkg/api/serialization_proto_test.go
+0
-2
time_proto.go
pkg/api/unversioned/time_proto.go
+0
-2
protobuf.go
pkg/runtime/serializer/protobuf/protobuf.go
+0
-2
protobuf_test.go
pkg/runtime/serializer/protobuf/protobuf_test.go
+0
-2
protobuf_extension.go
pkg/runtime/serializer/protobuf_extension.go
+0
-2
types_proto.go
pkg/runtime/types_proto.go
+0
-2
No files found.
hack/after-build/update-generated-protobuf.sh
View file @
cea4c010
...
@@ -42,6 +42,5 @@ gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
...
@@ -42,6 +42,5 @@ gotoprotobuf=$(kube::util::find-binary "go-to-protobuf")
# satisfies import of github.com/gogo/protobuf/gogoproto/gogo.proto and the core Google protobuf types
# satisfies import of github.com/gogo/protobuf/gogoproto/gogo.proto and the core Google protobuf types
PATH
=
"
${
KUBE_ROOT
}
/_output/local/go/bin:
${
PATH
}
"
\
PATH
=
"
${
KUBE_ROOT
}
/_output/local/go/bin:
${
PATH
}
"
\
"
${
gotoprotobuf
}
"
\
"
${
gotoprotobuf
}
"
\
--conditional
=
"proto"
\
--proto-import
=
"
${
KUBE_ROOT
}
/Godeps/_workspace/src"
\
--proto-import
=
"
${
KUBE_ROOT
}
/Godeps/_workspace/src"
\
--proto-import
=
"
${
KUBE_ROOT
}
/third_party/protobuf"
--proto-import
=
"
${
KUBE_ROOT
}
/third_party/protobuf"
hack/verify-all.sh
View file @
cea4c010
...
@@ -26,7 +26,6 @@ SILENT=true
...
@@ -26,7 +26,6 @@ SILENT=true
# Excluded checks are always skipped.
# Excluded checks are always skipped.
EXCLUDED_CHECKS
=(
EXCLUDED_CHECKS
=(
"verify-linkcheck.sh"
# runs in separate Jenkins job once per day due to high network usage
"verify-linkcheck.sh"
# runs in separate Jenkins job once per day due to high network usage
"verify-generated-protobuf.sh"
# TODO(smarterclayton) add when protobuf is part of direct generation
)
)
function
is-excluded
{
function
is-excluded
{
...
...
pkg/api/resource/quantity_proto.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
...
...
pkg/api/serialization_proto_test.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
...
...
pkg/api/unversioned/time_proto.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
...
...
pkg/runtime/serializer/protobuf/protobuf.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
...
...
pkg/runtime/serializer/protobuf/protobuf_test.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
...
...
pkg/runtime/serializer/protobuf_extension.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2014 The Kubernetes Authors All rights reserved.
Copyright 2014 The Kubernetes Authors All rights reserved.
...
...
pkg/runtime/types_proto.go
View file @
cea4c010
// +build proto
/*
/*
Copyright 2015 The Kubernetes Authors All rights reserved.
Copyright 2015 The Kubernetes Authors All rights reserved.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment