kubernetes/kubernetes merge conflicts on 2020-03-04

k-k-conflicts.txt

* kubernetes/kubernetes/pull/88474:
pkg/controller/cloud/BUILD
pkg/controller/cloud/node_controller.go
* kubernetes/kubernetes/pull/87182:
hack/.staticcheck_failures
pkg/volume/rbd/rbd.go
pkg/volume/rbd/rbd_util.go
* kubernetes/kubernetes/pull/86357:
pkg/kubelet/apis/config/types.go
* kubernetes/kubernetes/pull/86304:
staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go
* kubernetes/kubernetes/pull/86201:
pkg/apis/core/v1/conversion_test.go
* kubernetes/kubernetes/pull/86083:
go.mod
go.sum
pkg/registry/core/pod/BUILD
staging/src/k8s.io/api/go.sum
staging/src/k8s.io/apiextensions-apiserver/go.sum
staging/src/k8s.io/apimachinery/go.sum
staging/src/k8s.io/apiserver/go.sum
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/BUILD
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/buildmanagerinfo.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/capmanagers.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/fields_test.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/typeconverter.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/skipnonapplied.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/skipnonapplied_test.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/stripmeta.go
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/structuredmerge.go
staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go
staging/src/k8s.io/cli-runtime/go.sum
staging/src/k8s.io/client-go/go.sum
staging/src/k8s.io/cloud-provider/go.sum
staging/src/k8s.io/cluster-bootstrap/go.sum
staging/src/k8s.io/code-generator/go.sum
staging/src/k8s.io/component-base/go.sum
staging/src/k8s.io/csi-translation-lib/go.sum
staging/src/k8s.io/kube-aggregator/go.sum
staging/src/k8s.io/kube-controller-manager/go.sum
staging/src/k8s.io/kube-proxy/go.sum
staging/src/k8s.io/kube-scheduler/go.sum
staging/src/k8s.io/kubectl/go.sum
staging/src/k8s.io/kubelet/go.sum
staging/src/k8s.io/legacy-cloud-providers/go.sum
staging/src/k8s.io/metrics/go.sum
staging/src/k8s.io/node-api/go.mod
staging/src/k8s.io/node-api/go.sum
staging/src/k8s.io/sample-apiserver/go.sum
staging/src/k8s.io/sample-cli-plugin/go.sum
staging/src/k8s.io/sample-controller/go.sum
vendor/modules.txt
vendor/sigs.k8s.io/structured-merge-diff/fieldpath/element.go
vendor/sigs.k8s.io/structured-merge-diff/fieldpath/fromvalue.go
vendor/sigs.k8s.io/structured-merge-diff/fieldpath/managers.go
vendor/sigs.k8s.io/structured-merge-diff/fieldpath/pathelementmap.go
vendor/sigs.k8s.io/structured-merge-diff/fieldpath/serialize-pe.go
vendor/sigs.k8s.io/structured-merge-diff/merge/update.go
vendor/sigs.k8s.io/structured-merge-diff/typed/BUILD
vendor/sigs.k8s.io/structured-merge-diff/typed/helpers.go
vendor/sigs.k8s.io/structured-merge-diff/typed/merge.go
vendor/sigs.k8s.io/structured-merge-diff/typed/parser.go
vendor/sigs.k8s.io/structured-merge-diff/typed/remove.go
vendor/sigs.k8s.io/structured-merge-diff/typed/typed.go
vendor/sigs.k8s.io/structured-merge-diff/typed/union.go
vendor/sigs.k8s.io/structured-merge-diff/typed/validate.go
vendor/sigs.k8s.io/structured-merge-diff/value/BUILD
vendor/sigs.k8s.io/structured-merge-diff/value/value.go
* kubernetes/kubernetes/pull/86004:
staging/src/k8s.io/kubectl/pkg/describe/versioned/describe.go
* kubernetes/kubernetes/pull/85785:
api/openapi-spec/swagger.json
* kubernetes/kubernetes/pull/85724:
staging/src/k8s.io/apimachinery/pkg/util/wait/wait.go
* kubernetes/kubernetes/pull/85518:
staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition/BUILD
* kubernetes/kubernetes/pull/84899:
test/e2e/apimachinery/BUILD
test/e2e/apimachinery/etcd_failure.go
test/e2e/apps/BUILD
test/e2e/apps/daemon_restart.go
test/e2e/cloud/gcp/BUILD
test/e2e/cloud/gcp/addon_update.go
test/e2e/cloud/gcp/reboot.go
test/e2e/framework/BUILD
test/e2e/framework/get-kubemark-resource-usage.go
test/e2e/framework/log_size_monitoring.go
test/e2e/framework/profile_gatherer.go
test/e2e/framework/service/BUILD
test/e2e/framework/service/hostname.go
test/e2e/framework/skip.go
test/e2e/framework/ssh/ssh.go
test/e2e/framework/util.go
test/e2e/network/BUILD
test/e2e/network/kube_proxy.go
test/e2e/network/networking.go
test/e2e/network/service.go
test/e2e/node/BUILD
test/e2e/node/crictl.go
test/e2e/node/kubelet.go
test/e2e/node/node_problem_detector.go
test/e2e/node/ssh.go
test/e2e/storage/BUILD
test/e2e/storage/flexvolume.go
test/e2e/storage/vsphere/BUILD
* kubernetes/kubernetes/pull/84104:
pkg/kubelet/prober/worker_test.go
* kubernetes/kubernetes/pull/84056:
pkg/controller/cloud/node_lifecycle_controller.go
pkg/controller/nodelifecycle/node_lifecycle_controller_test.go
pkg/controller/testutil/test_utils.go
* kubernetes/kubernetes/pull/82981:
staging/src/k8s.io/kubectl/pkg/cmd/label/label.go
* kubernetes/kubernetes/pull/82677:
pkg/kubelet/kubelet.go
pkg/kubelet/prober/prober.go
* kubernetes/kubernetes/pull/82334:
build/lib/release.sh
cluster/common.sh
hack/.shellcheck_failures
* kubernetes/kubernetes/pull/81892:
hack/.staticcheck_failures
pkg/volume/azure_file/azure_file.go
pkg/volume/csi/csi_client.go
pkg/volume/flocker/flocker.go
pkg/volume/rbd/rbd.go
pkg/volume/rbd/rbd_util.go
* kubernetes/kubernetes/pull/81784:
pkg/controller/volume/persistentvolume/util/util.go
pkg/kubelet/BUILD
pkg/volume/util/BUILD
pkg/volume/util/util.go
* kubernetes/kubernetes/pull/81688:
hack/.staticcheck_failures
pkg/volume/util/fsquota/quota_linux.go
pkg/volume/util/operationexecutor/operation_generator.go
* kubernetes/kubernetes/pull/81082:
cmd/kubeadm/app/componentconfigs/defaults.go
* kubernetes/kubernetes/pull/80976:
pkg/kubelet/kubelet_getters.go
pkg/kubelet/lifecycle/predicate.go
* kubernetes/kubernetes/pull/80909:
build/debian-hyperkube-base/Makefile
* kubernetes/kubernetes/pull/80799:
build/dependencies.yaml
* kubernetes/kubernetes/pull/80744:
pkg/api/pod/util.go
* kubernetes/kubernetes/pull/80618:
pkg/apis/apps/v1/conversion.go
pkg/apis/apps/v1beta2/conversion.go
pkg/apis/extensions/v1beta1/conversion.go
pkg/apis/extensions/v1beta1/zz_generated.conversion.go
pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go
* kubernetes/kubernetes/pull/80438:
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/internal/managedfields.go
* kubernetes/kubernetes/pull/79925:
pkg/kubelet/kuberuntime/kuberuntime_manager.go
* kubernetes/kubernetes/pull/79649:
pkg/api/pod/util.go
* kubernetes/kubernetes/pull/79015:
test/e2e/storage/testsuites/BUILD
test/e2e/storage/testsuites/snapshottable.go
* kubernetes/kubernetes/pull/78928:
pkg/kubectl/cmd/cp/cp.go
test/e2e/kubectl/kubectl.go
* kubernetes/kubernetes/pull/76990:
pkg/controller/.import-restrictions
pkg/kubelet/eviction/BUILD
pkg/kubelet/eviction/helpers.go
pkg/scheduler/BUILD
pkg/scheduler/algorithm/predicates/BUILD
pkg/scheduler/algorithm/predicates/metadata.go
pkg/scheduler/algorithm/predicates/predicates.go
pkg/scheduler/algorithm/priorities/BUILD
pkg/scheduler/algorithm/priorities/even_pods_spread.go
pkg/scheduler/algorithm/priorities/interpod_affinity.go
pkg/scheduler/core/BUILD
pkg/scheduler/core/extender_test.go
pkg/scheduler/core/generic_scheduler.go
pkg/scheduler/framework/v1alpha1/BUILD
pkg/scheduler/framework/v1alpha1/framework.go
pkg/scheduler/internal/heap/BUILD
pkg/scheduler/internal/heap/heap.go
pkg/scheduler/internal/heap/heap_test.go
pkg/scheduler/internal/queue/BUILD
pkg/scheduler/internal/queue/scheduling_queue.go
pkg/scheduler/internal/queue/scheduling_queue_test.go
pkg/scheduler/util/BUILD
pkg/scheduler/util/utils.go
pkg/scheduler/util/utils_test.go
test/test_owners.csv
* kubernetes/kubernetes/pull/76443:
test/conformance/testdata/conformance.txt
test/e2e/network/service.go
* kubernetes/kubernetes/pull/75840:
test/e2e/network/ingress.go
* kubernetes/kubernetes/pull/75111:
test/e2e/apps/statefulset.go
test/e2e/common/init_container.go
test/e2e/framework/deployment/BUILD
test/e2e/framework/deployment/fixtures.go
test/e2e/framework/util.go
test/e2e/kubectl/BUILD
test/e2e/kubectl/kubectl.go
test/e2e_node/BUILD
test/e2e_node/apparmor_test.go
* kubernetes/kubernetes/pull/71741:
cmd/kubeadm/app/discovery/https/https.go
pkg/cloudprovider/providers/openstack/openstack.go
pkg/kubeapiserver/admission/config.go
pkg/kubectl/proxy/proxy_server.go
pkg/kubelet/client/kubelet_client.go
pkg/probe/http/http.go
staging/src/k8s.io/apimachinery/pkg/util/net/http.go
staging/src/k8s.io/apiserver/pkg/util/webhook/authentication.go
staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go
staging/src/k8s.io/kube-aggregator/pkg/controllers/status/available_controller.go
test/images/netexec/netexec.go
* kubernetes/kubernetes/pull/69719:
pkg/scheduler/algorithm/predicates/predicates.go
pkg/scheduler/algorithm/predicates/predicates_test.go
* kubernetes/kubernetes/pull/68719:
api/openapi-spec/swagger.json
test/e2e/framework/statefulset/rest.go
* kubernetes/kubernetes/pull/65262:
pkg/kubelet/lifecycle/BUILD