Skip to content

Rebase 1.8.1 #17115

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

Merged
liggitt merged 83 commits into from
Nov 20, 2017
Merged

Rebase 1.8.1 #17115

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
4e13893
interesting: remove registry as it now lives in external repo
liggitt Nov 15, 2017
2d6f162
lock pkg/build/builder to github.com/Sirupsen/logrus aaf92c9571210431…
soltysh Oct 19, 2017
8810d6a
lock pkg/build/builder to github.com/Azure/go-ansiterm 7e0a0b69f76673…
liggitt Nov 15, 2017
92dfbcb
lock pkg/build/builder to github.com/docker/engine-api dea108d3aa0c67…
mfojtik Oct 31, 2017
1c21d0f
lock pkg/build/builder to github.com/docker/distribution 1e2bbed6e09c…
liggitt Nov 16, 2017
246a98a
lock pkg/build/builder to github.com/openshift/source-to-image e3140d…
liggitt Nov 18, 2017
2643422
shim pkg/build/builder source-to-image types
liggitt Nov 18, 2017
d713725
Update godep-save.sh to current state
soltysh Oct 17, 2017
577786d
Update copy-kube-artifacts
soltysh Nov 6, 2017
2cccea0
bump(github.com/openshift/source-to-image): e3140d019517368c7c3f72476…
soltysh Oct 17, 2017
f3d3ed7
bump(github.com/openshift/imagebuilder): b6a142b9d7f3d57a2bf86ae9c934…
soltysh Oct 19, 2017
3cd8746
bump(github.com/aws/aws-sdk-go): 63ce630574a5ec05ecd8e8de5cea16332a5a…
soltysh Oct 19, 2017
61bfa8f
bump(github.com/docker/distribution): edc3ab29cdff8694dd6feb85cfeb4b5…
soltysh Oct 19, 2017
0fc137b
bump(github.com/docker/docker): 4f3616fb1c112e206b88cb7a9922bf49067a7…
soltysh Oct 19, 2017
830e6f1
bump(github.com/google/cadvisor): cda62a43857256fbc95dd31e7c810888f00…
soltysh Nov 6, 2017
50ea9f0
bump(github.com/containers/image): 8df46f076f47521cef216839d04202e894…
soltysh Oct 19, 2017
d7ae6fa
bump(github.com/Sirupsen/logrus) - drop in favor of github.com/sirups…
soltysh Oct 19, 2017
c4b40b3
bump(k8s.io/kubernetes): 0d5291cc63b7b3655b11bc15e8afb9a078049d09 - v…
liggitt Nov 14, 2017
d95f394
UPSTREAM: <drop>: run hack/copy-kube-artifacts.sh
liggitt Nov 14, 2017
cf421af
UPSTREAM: containers/image: <carry>: Disable gpgme on windows/mac
smarterclayton May 23, 2017
dc43e88
UPSTREAM: docker/distribution: 2382: Don't double add scopes
smarterclayton Jun 5, 2017
82e5b4f
UPSTREAM: docker/distribution: 2402: Allow manifest specification
smarterclayton Sep 20, 2017
b8366d5
UPSTREAM: docker/distribution: 2384: Fallback to GET for manifest
smarterclayton Sep 20, 2017
983f68d
UPSTREAM: google/cadvisor: 1766: adaptive longOp for du operation
sjenning Oct 5, 2017
ccca1bb
UPSTREAM: google/cadvisor: 1785: fix long du duration message
sjenning Oct 30, 2017
a8c9430
UPSTREAM: 55248: increase iptables max wait from 2 seconds to 5 (fix)
knobunc Nov 7, 2017
08010b3
UPSTREAM: 55704: Return original error instead of negotiation one
soltysh Nov 14, 2017
dbd693f
UPSTREAM: 55703: use full gopath for externalTypes
soltysh Nov 14, 2017
dd36dd6
UPSTREAM: 53576: Revert "Validate if service has duplicate targetPort"
liggitt Nov 15, 2017
9a1e9ac
UPSTREAM: 55772: Only attempt to construct GC informers for watchable…
liggitt Nov 15, 2017
8d5430f
UPSTREAM: 55974: Allow constructing spdy executor from existing trans…
liggitt Nov 17, 2017
085c81a
UPSTREAM: <carry>: switch back to use encode/json to avoid serializat…
mfojtik Oct 30, 2017
c8ea17a
UPSTREAM: <carry>: allow multiple containers to union for swagger
soltysh Oct 24, 2017
9176245
UPSTREAM: <carry>: allow controller context injection to share informers
liggitt Nov 16, 2017
ffb2172
UPSTREAM: <drop>: etcd testing
soltysh Oct 26, 2017
aa2e343
UPSTREAM: <drop>: disable flaky InitFederation unit test
deads2k Jul 14, 2017
193611f
UPSTREAM: k8s.io/gengo: 73: handle aliases
soltysh Oct 24, 2017
a49e40f
gendeepcopy: omit k8s packages
soltysh Oct 20, 2017
0c43e0b
genconversion: add k8s.io/api/core/v1
liggitt Nov 14, 2017
e263cbd
hack/update-generated-protobuf.sh: reuse upstream proto generator
soltysh Oct 23, 2017
4efb04f
hack/update-generated-clientsets.sh: remove shortGroup and version fr…
mfojtik Oct 27, 2017
d7708ea
boring: k8s.io/api import restrictions changes
liggitt Nov 14, 2017
63cad53
boring
soltysh Nov 15, 2017
b57530e
boring: deepcopy calls
liggitt Nov 15, 2017
71c7f11
boring: docker API changes
liggitt Nov 15, 2017
ad67199
boring: update clientgen type annotations
soltysh Oct 20, 2017
7b37727
boring: Admission interface changes
soltysh Oct 31, 2017
61aac66
boring: quota conversions error return
soltysh Nov 15, 2017
b1d33a2
boring: exclude new alpha kubectl command
soltysh Oct 31, 2017
409d7af
boring: regenerate policy
soltysh Nov 15, 2017
682ac88
boring: test-cmd fixes
soltysh Nov 15, 2017
be64d51
boring: define localSchemeBuilder, ensure LegacySchemeBuilder has Reg…
liggitt Nov 15, 2017
9bf441d
boring: govet fixes
soltysh Nov 14, 2017
417fe70
boring: Update registered aggregated APIs with new versions
liggitt Nov 15, 2017
73070ec
boring: update TestRootRedirect paths, re-enable openapi in integrati…
liggitt Nov 15, 2017
c60dc74
boring: fix error messages in authorization test
mfojtik Nov 15, 2017
aa3ec7b
boring: update integration tests to check hpa permissions in autoscal…
liggitt Nov 16, 2017
f707ecb
boring: avoid spurious diff of nil/[] in extended test
liggitt Nov 16, 2017
8473fc8
interesting: errors are structured now, fixup TestFrontProxy test
liggitt Nov 15, 2017
364615d
interesting: NetworkPolicy moved from extensions to networking
soltysh Oct 31, 2017
c57a65b
interesting: HPA v2alpha1 removed
liggitt Nov 15, 2017
951bf64
interesting: oc: fix forwarder
mfojtik Oct 27, 2017
4e7d68e
interesting: drop scheduled jobs support
soltysh Nov 2, 2017
02a9029
interesting: switch dockerutils to deal with two auth config types
liggitt Nov 15, 2017
10fd1a0
interesting: replace ParseNormalizedNamed with reference.WithName
soltysh Nov 9, 2017
eaf102a
interesting: default the triggers in dc integration test
liggitt Nov 13, 2017
ac05001
interesting: ignore authorization.openshift.io role/binding objects f…
liggitt Nov 15, 2017
d1cd05f
interesting: add cohabitating resources for daemonsets/replicasets, b…
liggitt Nov 15, 2017
63a6cb2
interesting: etcd_storage_path test updates
soltysh Nov 15, 2017
1ca85cb
interesting: ApproximatePodTemplateForObject
liggitt Nov 15, 2017
92be7a1
interesting: make 'oc registry' generate valid DaemonSet
liggitt Nov 16, 2017
a44a001
interesting: run reflectors in a goroutine
soltysh Nov 3, 2017
d710c22
interesting: bump reconcile qps
liggitt Nov 16, 2017
29fa8d2
interesting: remove bad tests from test/cmd/certs.sh
mfojtik Nov 16, 2017
8652c72
interesting: generate canonical temporary build tag
liggitt Nov 17, 2017
df42d5a
interesting: fixup template data types
liggitt Nov 17, 2017
4eaf2c6
interesting: API server changes
soltysh Nov 16, 2017
4a494ef
interesting: Master and node changes
soltysh Nov 15, 2017
5240af8
interesting: remove double printer handler registration
mfojtik Nov 8, 2017
424fa05
interesting: buildconfig/instantiate spdy executor change
soltysh Oct 31, 2017
bd1da08
interesting: restore ability to start with swap on by default
liggitt Nov 17, 2017
1252cce
Generated files
liggitt Nov 14, 2017
614724c
fixme: use openshift/origin-docker-registry:latest as registry image
mfojtik Nov 16, 2017
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
Prev Previous commit
Next Next commit
UPSTREAM: 55248: increase iptables max wait from 2 seconds to 5 (fix) 
There were a few more places that had a different form of the wait argument.  This catches those places and makes them use the same constant.

https://bugzilla.redhat.com/show_bug.cgi?id=1506396

Upstream PR kubernetes/kubernetes#55248
  • Loading branch information
@knobunc @liggitt
knobunc authored and liggitt committed Nov 20, 2017
commit a8c94305bf0a6f70ac4b4accc7bee0366cfb7305
2 changes: 1 addition & 1 deletion vendor/k8s.io/kubernetes/pkg/util/iptables/iptables.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/k8s.io/kubernetes/pkg/util/iptables/iptables_test.go
View file
Open in desktop

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