Skip to content

rebase to 1.7 #15100

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

Closed
wants to merge 82 commits into from
Closed

rebase to 1.7 #15100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
35d81a4
update godeps.json to run bump checkers
deads2k Jul 6, 2017
3f866f9
bump(github.com/openshift/source-to-image): 7da3d3e97565e652a59fd8128…
Jul 12, 2017
514adcf
use revamped source-to-image git url parser
Jul 11, 2017
d2538d6
bump(k8s.io/kubernetes): 695b5616baa050ac185abdddb3c750205a08a19b
deads2k Jul 6, 2017
7418f10
UPSTREAM: <drop>: squash to bump, copy
deads2k Jul 12, 2017
3decef4
UPSTREAM: <drop>: generated updates
deads2k Jul 6, 2017
1ba2df0
BREAK logstash formatting
deads2k Jul 5, 2017
f01ad84
UPSTREAM: docker/distribution: <carry>: custom routes/auth
May 8, 2015
8d8e0a9
UPSTREAM: docker/distribution: 1757: Export storage.CreateOptions in …
Jul 6, 2016
d5f37c3
UPSTREAM: docker/distribution: 1857: Provide stat descriptor for Crea…
liggitt Jul 20, 2016
fc90e99
UPSTREAM: docker/distribution: <carry>: Update dependencies
legionus Sep 8, 2016
27bbe6e
UPSTREAM: docker/distribution: 2008: Honor X-Forwarded-Port and Forwa…
Nov 7, 2016
98079d1
UPSTREAM: opencontainers/runc: 1216: Fix thread safety of SelinuxEnab…
pmorie Dec 9, 2016
a216478
UPSTREAM: docker/distribution: 2140: Add 'ca-central-1' region for re…
mfojtik Jan 11, 2017
1aa28e8
UPSTREAM: docker/engine-api: 26718: Add Logs to ContainerAttachOptions
Jan 24, 2017
fc8b4b7
UPSTREAM: coreos/etcd: <carry>: vendor grpc v1.0.4 locally
Mar 21, 2017
2ef79a0
UPSTREAM: 45894: Export BaseControllerRefManager
deads2k Jul 6, 2017
52bbe14
UPSTREAM: <carry>: allow to use * as a capability in Security Context…
php-coder Feb 8, 2017
fc8d22e
UPSTREAM: 00000: TODO regenerated openapi because it's not commited
deads2k Jul 6, 2017
b7e5324
UPSTREAM: <drop>: keep old pod available
deads2k Jul 6, 2017
6b10cee
UPSTREAM: 00000: expose RegisterAllAdmissionPlugins
deads2k Jul 6, 2017
cf4241f
UPSTREAM: 00000: expose direct from config new scheduler method
deads2k Jul 6, 2017
074cfd8
UPSTREAM: 00000: make a union categoryexpander
deads2k Jul 7, 2017
8e9b38e
UPSTREAM: <carry>: make wiring in kubeproxy easy until we sort out co…
deads2k Jul 10, 2017
a323e9c
UPSTREAM: <carry>: compensate for poor printer behavior
deads2k Jul 11, 2017
00f5353
UPSTREAM: 00000: increase wait in kubecontrollers
deads2k Jul 10, 2017
aecdd54
UPSTREAM: 00000: update permissions to allow block owner deletion
deads2k Jul 11, 2017
7206847
UPSTREAM: 00000: tolerate missing template
deads2k Jul 11, 2017
870515b
UPSTREAM: 00000: don't mutate printers after creation
deads2k Jul 11, 2017
ae0cc1e
UPSTREAM: <drop>: hack out portworx to avoid double proto registration
deads2k Jul 11, 2017
134a760
UPSTREAM: 45294: Fix protobuf generator for aliases to repeated types
deads2k Jul 11, 2017
18f6aeb
UPSTREAM: <carry>: generator updates
deads2k Jul 10, 2017
062f6bc
UPSTREAM: <carry>: squash to SCC
deads2k Jul 11, 2017
64e1f56
UPSTREAM: 00000: proxier is it really nil
deads2k Jul 12, 2017
81b1f03
UPSTREAM: 00000: allow separate mapping fo kind
deads2k Jul 12, 2017
24a2903
UPSTREAM: <drop>: disable suspicously failing tests
deads2k Jul 14, 2017
0e09656
UPSTREAM: <drop>: restore normal alias test
deads2k Jul 14, 2017
881cd8d
UPSTREAM: 00000: expose proxy default
deads2k Jul 13, 2017
8209cab
boring: simple method moves
deads2k Jul 5, 2017
7948abd
boring: fake client update
deads2k Jul 6, 2017
2cf77a3
update generators to work again
deads2k Jul 6, 2017
af350b9
update build for 1.8
deads2k Jul 6, 2017
bede224
update defaulting to handle new kube
deads2k Jul 6, 2017
dbf879e
rewire controllers
deads2k Jul 6, 2017
af83cdf
ROOTFS: separate with controllers: storage controller changes
deads2k Jul 6, 2017
245990e
remove NodeLegacyHostIP per https://github.com/kubernetes/kubernetes/…
deads2k Jul 6, 2017
631cff7
update admission plugins
deads2k Jul 6, 2017
e390140
FFRANZ: separate: client factory fitting
deads2k Jul 7, 2017
047f417
handle printer changes
deads2k Jul 7, 2017
9a90d25
react to upstream command changes in wrappers
deads2k Jul 7, 2017
61452e7
React to upstream NewBuilder changes
deads2k Jul 7, 2017
9fb02ef
proxy command changed a lot. This may be a wrapper now
deads2k Jul 7, 2017
f7bf5d5
directly depend on the scc admission plugin
deads2k Jul 10, 2017
e45d3ee
router metrics changed/disabled!
deads2k Jul 6, 2017
4d7b013
adjust to new systemd library
deads2k Jul 10, 2017
15d3035
DISABLE UNIDLER
deads2k Jul 10, 2017
7b7183b
endpointsconfighandler changes, can't remove from history
deads2k Jul 7, 2017
d57891e
sdn: update for CNI changes
dcbw Jul 7, 2017
19e2f5a
wire up new kubeproxy
deads2k Jul 10, 2017
cc22aa9
Port SDN proxy filter to new EndpointsHandler
danwinship Jul 11, 2017
5f82fd2
fix pkg/sdn/plugin unit tests for CNI bump
danwinship Jul 14, 2017
b69608c
Update default enabled ciphers for go1.8
liggitt Jul 13, 2017
246be3d
rewire openshift start
deads2k Jul 10, 2017
f3b38b3
minor API updates to allow generation
deads2k Jul 10, 2017
f7ba51d
react to upstream flag changes: api-version was removed
deads2k Jul 11, 2017
df46cf4
new openshift permissions
deads2k Jul 11, 2017
bf52537
remove old hpa serialization tests
deads2k Jul 12, 2017
e09b481
storage changes in 3.7
deads2k Jul 12, 2017
ea12d2b
remove dead volume source migrator
deads2k Jul 12, 2017
5affe2e
boring: generated
deads2k Jul 6, 2017
40d1f3f
disable go version checking
deads2k Jul 13, 2017
4ce0724
squash to admission change
deads2k Jul 13, 2017
b270ac5
STTTS: squash to api server wiring
deads2k Jul 13, 2017
141f1b0
MFOJTIK: squash to wiring: create SA needed for recycling
deads2k Jul 14, 2017
d10d4c7
MFOJTIK: disable registry url validation in prune
deads2k Jul 13, 2017
86af1c6
node default config value changes
deads2k Jul 13, 2017
fa59793
Fix cross-platform compile of pod manager
liggitt Jul 13, 2017
ddbc566
sdn: additional kube-1.7 rebase fixup
dcbw Jul 13, 2017
1830fb9
add FSStorageOS to SCC
deads2k Jul 14, 2017
264d870
FFRANZ: separate: defer adding new commands until after the rebase
deads2k Jul 14, 2017
8c876d5
disable projectrequest unit test because the fake client is weird
deads2k Jul 14, 2017
fe8b4e7
disable a few failing e2e tests
deads2k Jul 17, 2017
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
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
6,966 changes: 4,032 additions & 2,934 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_authorization_apis_authorization_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_build_apis_build_v1.proto
View file
Open in desktop

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

5 changes: 3 additions & 2 deletions api/protobuf-spec/github_com_openshift_origin_pkg_deploy_apis_apps_v1.proto
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 api/protobuf-spec/github_com_openshift_origin_pkg_image_apis_image_v1.proto
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_oauth_apis_oauth_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_project_apis_project_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_quota_apis_quota_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_route_apis_route_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_sdn_apis_network_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_security_apis_security_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_template_apis_template_v1.proto
View file
Open in desktop

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

1 change: 0 additions & 1 deletion api/protobuf-spec/github_com_openshift_origin_pkg_user_apis_user_v1.proto
View file
Open in desktop

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

Loading