forked from kubernetes/kubernetes
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.
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
Move upstream 05 #38
Merged
deads2k
merged 22 commits into
openshift:openshift-1.6-20170501
from
deads2k:move-upstream-05
Jul 5, 2017
Merged
Move upstream 05 #38
deads2k
merged 22 commits into
openshift:openshift-1.6-20170501
from
deads2k:move-upstream-05
Jul 5, 2017
Conversation
This file contains 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
…se VolumeInUse :100644 100644 bd5a485cd1... eb02fe4c64... M pkg/cloudprovider/providers/aws/aws.go
…sed in proxy_test :100644 100644 b8efbd13cf... 7aefd2bf06... M staging/src/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper_test.go
…tests :100644 100644 18abfeb04d... cde802e7f5... M pkg/controller/deployment/util/deployment_util_test.go :100644 100644 f4a64984ec... af9e97d6d4... M pkg/probe/tcp/tcp_test.go :100644 100644 a2d53cc998... 883f3422d4... M pkg/util/env/env_test.go :100644 100644 90d09f9edc... a70b7f9b6d... M staging/src/k8s.io/apimachinery/pkg/runtime/embedded_test.go :100644 100644 1896a3e3e7... cd0c18bb2e... M staging/src/k8s.io/apimachinery/pkg/util/json/json_test.go :100644 100644 c2c711fd92... 30cbb6edc4... M staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go
…g up localhostCert pool :100644 100644 0f126cf9d0... 84c3e4f843... M staging/src/k8s.io/apiserver/pkg/endpoints/proxy_test.go :100644 100644 f761e8afe0... 96ebed4d0b... M staging/src/k8s.io/apiserver/pkg/registry/generic/rest/proxy_test.go :100644 100644 fb6791a072... ee143b1e24... M staging/src/k8s.io/apiserver/pkg/util/proxy/dial_test.go
:100644 100644 b2ae164fa1... 4629e4159e... M pkg/master/master_openapi_test.go
…aggregating (part 2) :100644 100644 73305af424... ecfc8b0ea9... M staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go :100644 100644 20a4ee8be8... 416374de4c... M staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go
It's the only way to see resources in a particular group :100644 100644 4c2d434f1f... cfbe6fda9e... M pkg/kubectl/cmd/explain.go
:100644 100644 e80faa5ef8... 0548c735c6... M pkg/controller/garbagecollector/garbagecollector.go
Use Clone() for the implementation of CloneTLSConfig when golang version is 1.8, otherwise continue to use existing implementation. This avoids issues related Clone() calling serverInit on the source object if it was not already previously run. This ensures that CloneTLSConfig is able to be used consistently for both golang 1.7 and golang 1.8. This commit can be dropped when rebased on k8s 1.7, which will require golang 1.8. Alternatively, this commit can be dropped if we move to golang 1.8 exclusively and the related upstream Clone() changes are backported. :000000 100644 0000000000... f1f6193f9c... A staging/src/k8s.io/apimachinery/pkg/util/net/clone.go :000000 100644 0000000000... 49a2597b94... A staging/src/k8s.io/apimachinery/pkg/util/net/clone_17.go :000000 100644 0000000000... 77d40f4ac7... A staging/src/k8s.io/apimachinery/pkg/util/net/clone_17_test.go :000000 100644 0000000000... 66eafcaede... A staging/src/k8s.io/apimachinery/pkg/util/net/clone_test.go :100644 100644 3842ca0eeb... c081bd0892... M staging/src/k8s.io/apimachinery/pkg/util/net/http.go :100644 100644 30cbb6edc4... 8b0e858c1d... M staging/src/k8s.io/apimachinery/pkg/util/net/http_test.go :100644 100644 ee143b1e24... 9b2e0c93ed... M staging/src/k8s.io/apiserver/pkg/util/proxy/dial_test.go
:100644 100644 5262b74ccb... b2f31c5275... M staging/src/k8s.io/apiserver/pkg/util/trace/trace.go
… AWS SDK :100644 100644 2132ccc0ee... cf98df8d88... M pkg/cloudprovider/providers/aws/aws.go :100644 100644 af3ff541a0... 6bf63ae6fe... M pkg/cloudprovider/providers/aws/aws_instancegroups.go :100644 100644 2c33e708f6... 87e30122a0... M pkg/cloudprovider/providers/aws/aws_loadbalancer.go :100644 100644 4246849e8c... d0972f7b5a... M pkg/cloudprovider/providers/aws/aws_routes.go :100644 100644 33c2719e99... d9859ac408... M pkg/cloudprovider/providers/aws/tags.go
:100644 100644 1ccdc5eac2... a666e8373c... M pkg/kubectl/cmd/config/create_cluster.go
:100644 100644 8c456e6b5c... 0d70cd1f37... M staging/src/k8s.io/client-go/tools/record/event_test.go :100644 100644 b0aadec3fa... 11dff23eb1... M staging/src/k8s.io/client-go/tools/record/events_cache.go :100644 100644 dc4e6af658... c64f58ad66... M staging/src/k8s.io/client-go/tools/record/events_cache_test.go :100644 100644 881a2f57d7... c45169c40f... M staging/src/k8s.io/client-go/util/flowcontrol/throttle.go
…vailable in the Cluster Backport of K8s PR kubernetes#46771. Cinder provisioner chooses a zone from the list of zones available in the cluster in case no zone is specified in the corresponding Storage Class. However, currently the provisioner (persistent-volume-binder) does not have right to get the list of nodes/zones available in the cluster. That's why the persistent-volume-binder is being given permission to list and watch nodes in the cluster. Note: the above problem was fixed in openshift/ose@54b994c however, the fix was mistakenly "deleted" in openshift/ose@8c7065f :100644 100644 f82ab0fe3c... fb3501d849... M plugin/pkg/auth/authorizer/rbac/bootstrappolicy/controller_policy.go :100644 100644 72c5d81d84... d06e2271f7... M plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml
… it can't find parent :100644 100644 d8e3b72494... 28ea12af8b... M pkg/controller/cronjob/utils.go
:100644 100644 7c6cc7e4b6... 276f2327ff... M pkg/controller/garbagecollector/operations.go
…aped :100644 100644 38c063253b... 27f8857f41... M pkg/serviceaccount/jwt.go
This commit only sends updates if the status has actually changed. Since the HPA runs at a regular interval, this should reduce the volume of writes, especially on short HPA intervals with relatively constant metrics. :100644 100644 7cb334762c... de5dcf41b5... M pkg/controller/podautoscaler/horizontal.go :100644 100644 62354f5c2c... e80980e684... M pkg/controller/podautoscaler/horizontal_test.go
:100644 100644 7f24adabbc... 3bd17c0228... M staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi.go :100644 100644 c29f226bc8... f9b52c28e3... M staging/src/k8s.io/apiserver/pkg/endpoints/openapi/openapi_test.go
:100644 100644 924dc795ee... ce3ffd37ca... M pkg/registry/core/event/strategy.go :100644 100644 7934dc0c85... 298994235b... M staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go :100644 100644 ace4bab59b... 58788f3c2d... M staging/src/k8s.io/apiserver/pkg/registry/rest/delete.go
…aggregating :100644 100644 ecfc8b0ea9... d5986cc2bb... M staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go :100644 100644 416374de4c... 20a4ee8be8... M staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller_test.go
:100644 100644 63c7f971c9... 4a13de6be1... M staging/src/k8s.io/apiserver/pkg/storage/etcd3/store.go
Verified list manually. Lgtm. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
UPSTREAM_REPO_LOCATION=/home/deads/workspaces/kube/src/k8s.io/kubernetes/ hack/move-upstream.sh 3aad4e2246ac85575c7e6008cb1bfe3bedcb32b7..master