do not merge: rebase 1.6.1#13875
Closed
ncdc wants to merge 147 commits intoopenshift:masterfrom
Closed
Conversation
ncdc
force-pushed
the
rebase-1.6.1
branch
2 times, most recently
from
826644d to
f73b2ff
Compare
openshift-bot
added
the
needs-rebase
Signed-off-by: Gladkov Alexey <agladkov@redhat.com>
Add support for custom routes and custom auth records per route.
…top-level package Let the options for `BlobStore.Create()` be modified in middleware wrappers. Signed-off-by: Michal Minar <miminar@redhat.com>
…te method during cross-repo mount
…rded headers Prefer non-standard headers like X-Forwarded-Proto, X-Forwarded-Host and X-Forwarded-Port over the standard Forwarded header to maintain backwards compatibility. If a port is not specified neither in Host nor in forwarded headers but it is specified just with X-Forwarded-Port, use its value in base urls for redirects. Forwarded header is defined in rfc7239. X-Forwarded-Port is a non-standard header. Here's a description copied from "HTTP Headers and Elastic Load Balancing" of AWS ELB docs: > The X-Forwarded-Port request header helps you identify the port that > an HTTP or HTTPS load balancer uses to connect to the client. Signed-off-by: Michal Minář <miminar@redhat.com>
…cker/docker: <carry>: WORD/DWORD changed
…led and getSelinuxMountPoint
…gistry S3 storage driver Signed-off-by: Michal Fojtik <mfojtik@redhat.com>
This is docker/docker PR 26718 because docker has reintegrated engine-api into the primary docker repo.
Use POSIX flags and do not expect bash 4.
Rewrite pkg/util/sets
Rewrite pkg/apimachinery/registered
Rewrite pkg/client/restclient
Rewrite pkg/client/typed/discovery
Rewrite pkg/apimachinery
Rewrite pkg/apimachinery/announced
Rewrite pkg/client/unversioned/clientcmd
Rewrite pkg/api/unversioned/validation
Rewrite pkg/apiserver/request
Rewrite pkg/util/diff
Rewrite pkg/util/strategicpatch
Rewrite pkg/util/validation
Rewrite apimachinery/pkg/apis/meta/v1/unstructured
Rewrite pkg/api/errors
Rewrite pkg/fields
Rewrite apimachinery/pkg/runtime/schema
Rewrite apimachinery meta packages
Rewrite metav1.ObjectMeta
Rewrite k8s.io/{kubernetes -> apimachinery}/pkg/util/runtime
Rewrite k8s.io/{kubernetes -> apimachinery}/pkg/util/intstr
Rewrite k8s.io/{kubernetes -> apimachinery}/pkg/util/wait
Rewrite k8s.io/{kubernetes -> apimachinery}/pkg/api/resource
Rewrite k8s.io/{kubernetes -> apimachinery}/pkg/util/errors
Rewrite k8s.io/{kubernetes -> apiserver}/pkg/storage/etcd/util
Rewrite k8s.io/{kubernetes -> apimachinery}/pkg/util/net
Rewrite k8s.io/apiserver/pkg/authentication/user
Rewrite k8s.io/client-go/util/flowcontrol
Rewrite k8s.io/apiserver/pkg/storage
Rewrite k8s.io/apiserver/pkg/registry/generic/registry
Rewrite k8s.io/apiserver/pkg/registry/rest
Rewrite meta*.*Options
In Kubernetes 1.6, the internal version objects lack the appropriate annotations to marshal, so we have to convert to versioned objects before marshaling when creating a patch in `oc idle`.
We had a copy of the userspace proxy sitting in pkg/proxy until the equivalent changes got merged upstream. Now that they are, remove pkg/proxy/userspace in favor of the upstream version.
The EventRecorder now only knows about "k8s.io/client-go/pkg/api/v1".ObjectReference, so we have to make sure to pass it that instead of "k8s.io/kubernetes/pkg/api".ObjectReference when signaling a "NeedPods" event.
This fixes the ClusterIP index used for reverse DNS lookups.
…rvicebroker tests
…g build forcePull test
It was running 'oc get builds -o name' and expecting "No resources found.", which doesn't output anything if the list is empty. Just running 'oc get builds' will return "No resources found." if there are no builds.
separate quota evaluation for admission versus reconciliation
… nodes for gce testing
openshift-bot
removed
the
needs-rebase
Member
|
@ncdc -- can we make sure we carry this opencontainers/runc#1124 it for some reason never got bumped in the kube dep tree, and its the reason some users are hitting kubernetes/kubernetes#43856 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.