Fix conflicts

api/swagger-spec/coordination.k8s.io_v1beta1.json

@@ -1148,6 +1148,10 @@
      "clusterName": {
       "type": "string",
       "description": "The name of the cluster which the object belongs to. This is used to distinguish resources with same name and namespace in different clusters. This field is not set anywhere right now and apiserver is going to ignore it if set in create or update request."
+     },
+     "lastApplied": {
+      "type": "object",
+      "description": "LastApplied is a map of workflow-id to last applied configuration. A workflow can be the user's name, a controller's name, or the name of a specific apply path like \"ci-cd\". It keeps track of the ownership of fields. The last applied configuration is always in the same version as the parent object. It's used to keep track of the intent of the workflow-id that submitted that configuration."
      }
     }
    },

docs/api-reference/coordination.k8s.io/v1beta1/definitions.html

@@ -1120,6 +1120,13 @@ When an object is created, the system will populate this list with the current s
 <td class="tableblock halign-left valign-top"><p class="tableblock">string</p></td>
 <td class="tableblock halign-left valign-top"></td>
 </tr>
+<tr>
+<td class="tableblock halign-left valign-top"><p class="tableblock">lastApplied</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">LastApplied is a map of workflow-id to last applied configuration. A workflow can be the user&#8217;s name, a controller&#8217;s name, or the name of a specific apply path like "ci-cd". It keeps track of the ownership of fields. The last applied configuration is always in the same version as the parent object. It&#8217;s used to keep track of the intent of the workflow-id that submitted that configuration.</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
+<td class="tableblock halign-left valign-top"><p class="tableblock">object</p></td>
+<td class="tableblock halign-left valign-top"></td>
+</tr>
 </tbody>
 </table>
 

pkg/kubectl/cmd/BUILD

@@ -101,6 +101,8 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply/parse:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply/strategy:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
@@ -144,51 +146,6 @@ go_library(
         "//vendor/github.com/renstrom/dedent:go_default_library",
         "//vendor/github.com/spf13/cobra:go_default_library",
         "//vendor/github.com/spf13/pflag:go_default_library",
-<<<<<<< HEAD
-        "//vendor/k8s.io/api/apps/v1:go_default_library",
-        "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructuredscheme:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply/parse:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply/strategy:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/json:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/jsonmergepatch:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/mergepatch:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/validation:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/flag:go_default_library",
-        "//vendor/k8s.io/client-go/discovery:go_default_library",
-        "//vendor/k8s.io/client-go/dynamic:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
-        "//vendor/k8s.io/client-go/rest:go_default_library",
-        "//vendor/k8s.io/client-go/scale:go_default_library",
-        "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
-        "//vendor/k8s.io/client-go/tools/portforward:go_default_library",
-        "//vendor/k8s.io/client-go/tools/remotecommand:go_default_library",
-        "//vendor/k8s.io/client-go/transport/spdy:go_default_library",
-=======
->>>>>>> upstream/master
         "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
         "//vendor/k8s.io/utils/exec:go_default_library",
     ],

staging/BUILD

@@ -11,194 +11,7 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-<<<<<<< HEAD
-        "//staging/src/k8s.io/api:all-srcs",
-        "//staging/src/k8s.io/apiextensions-apiserver:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/api/equality:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/api/errors:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/api/meta:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/api/resource:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/api/testing:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/api/validation:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/apply:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/conversion:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/fields:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/labels:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/runtime:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/selection:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/test:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/types:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/cache:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/clock:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/diff:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/duration:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/errors:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/framer:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/httpstream:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/initialization:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/intstr:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/json:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/jsonmergepatch:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/mergepatch:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/net:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/proxy:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/rand:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/remotecommand:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/runtime:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/sets:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/uuid:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/validation:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/wait:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/waitgroup:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/util/yaml:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/version:all-srcs",
-        "//staging/src/k8s.io/apimachinery/pkg/watch:all-srcs",
-        "//staging/src/k8s.io/apimachinery/third_party/forked/golang/json:all-srcs",
-        "//staging/src/k8s.io/apimachinery/third_party/forked/golang/netutil:all-srcs",
-        "//staging/src/k8s.io/apimachinery/third_party/forked/golang/reflect:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/admission:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/apiserver:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/audit:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/example:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/apis/example2:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/audit:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/authenticator:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/authenticatorfactory:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/group:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/request/anonymous:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/request/bearertoken:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/request/headerrequest:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/request/union:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/request/websocket:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/request/x509:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/token/cache:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/token/tokenfile:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/token/union:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authentication/user:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authorization/authorizer:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authorization/authorizerfactory:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/authorization/union:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/endpoints:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/features:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/registry:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/server:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/storage:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/flag:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/flushwriter:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/logs:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/openapi:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/proxy:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/trace:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/webhook:all-srcs",
-        "//staging/src/k8s.io/apiserver/pkg/util/wsstream:all-srcs",
-        "//staging/src/k8s.io/apiserver/plugin/pkg/audit:all-srcs",
-        "//staging/src/k8s.io/apiserver/plugin/pkg/authenticator:all-srcs",
-        "//staging/src/k8s.io/apiserver/plugin/pkg/authorizer/webhook:all-srcs",
-        "//staging/src/k8s.io/client-go/deprecated-dynamic:all-srcs",
-        "//staging/src/k8s.io/client-go/discovery:all-srcs",
-        "//staging/src/k8s.io/client-go/dynamic:all-srcs",
-        "//staging/src/k8s.io/client-go/examples/create-update-delete-deployment:all-srcs",
-        "//staging/src/k8s.io/client-go/examples/in-cluster-client-configuration:all-srcs",
-        "//staging/src/k8s.io/client-go/examples/out-of-cluster-client-configuration:all-srcs",
-        "//staging/src/k8s.io/client-go/examples/workqueue:all-srcs",
-        "//staging/src/k8s.io/client-go/informers:all-srcs",
-        "//staging/src/k8s.io/client-go/kubernetes:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/admissionregistration/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/admissionregistration/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/apps/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/apps/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/apps/v1beta2:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/authentication/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/authentication/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/authorization/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/authorization/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/autoscaling/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/autoscaling/v2beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/batch/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/batch/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/batch/v2alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/certificates/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/core/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/events/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/extensions/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/imagepolicy/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/networking/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/policy/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/rbac/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/rbac/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/rbac/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/scheduling/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/scheduling/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/settings/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/storage/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/storage/v1alpha1:all-srcs",
-        "//staging/src/k8s.io/client-go/listers/storage/v1beta1:all-srcs",
-        "//staging/src/k8s.io/client-go/pkg/apis/clientauthentication:all-srcs",
-        "//staging/src/k8s.io/client-go/pkg/version:all-srcs",
-        "//staging/src/k8s.io/client-go/plugin/pkg/client/auth:all-srcs",
-        "//staging/src/k8s.io/client-go/rest:all-srcs",
-        "//staging/src/k8s.io/client-go/restmapper:all-srcs",
-        "//staging/src/k8s.io/client-go/scale:all-srcs",
-        "//staging/src/k8s.io/client-go/testing:all-srcs",
-        "//staging/src/k8s.io/client-go/third_party/forked/golang/template:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/auth:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/bootstrap/token/api:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/bootstrap/token/util:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/cache:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/clientcmd:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/leaderelection:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/metrics:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/pager:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/portforward:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/record:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/reference:all-srcs",
-        "//staging/src/k8s.io/client-go/tools/remotecommand:all-srcs",
-        "//staging/src/k8s.io/client-go/transport:all-srcs",
-        "//staging/src/k8s.io/client-go/util/buffer:all-srcs",
-        "//staging/src/k8s.io/client-go/util/cert:all-srcs",
-        "//staging/src/k8s.io/client-go/util/certificate:all-srcs",
-        "//staging/src/k8s.io/client-go/util/connrotation:all-srcs",
-        "//staging/src/k8s.io/client-go/util/exec:all-srcs",
-        "//staging/src/k8s.io/client-go/util/flowcontrol:all-srcs",
-        "//staging/src/k8s.io/client-go/util/homedir:all-srcs",
-        "//staging/src/k8s.io/client-go/util/integer:all-srcs",
-        "//staging/src/k8s.io/client-go/util/jsonpath:all-srcs",
-        "//staging/src/k8s.io/client-go/util/retry:all-srcs",
-        "//staging/src/k8s.io/client-go/util/testing:all-srcs",
-        "//staging/src/k8s.io/client-go/util/workqueue:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/client-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/conversion-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/deepcopy-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/defaulter-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/go-to-protobuf:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/import-boss:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/informer-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/lister-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/openapi-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/cmd/set-gen:all-srcs",
-        "//staging/src/k8s.io/code-generator/hack:all-srcs",
-        "//staging/src/k8s.io/code-generator/pkg/util:all-srcs",
-        "//staging/src/k8s.io/code-generator/third_party/forked/golang/reflect:all-srcs",
-        "//staging/src/k8s.io/kube-aggregator:all-srcs",
-        "//staging/src/k8s.io/metrics/pkg/apis/custom_metrics:all-srcs",
-        "//staging/src/k8s.io/metrics/pkg/apis/external_metrics:all-srcs",
-        "//staging/src/k8s.io/metrics/pkg/apis/metrics:all-srcs",
-        "//staging/src/k8s.io/metrics/pkg/client/clientset_generated/clientset:all-srcs",
-        "//staging/src/k8s.io/metrics/pkg/client/custom_metrics:all-srcs",
-        "//staging/src/k8s.io/metrics/pkg/client/external_metrics:all-srcs",
-        "//staging/src/k8s.io/sample-apiserver:all-srcs",
-        "//staging/src/k8s.io/sample-controller:all-srcs",
-=======
         "//staging/src:all-srcs",
->>>>>>> upstream/master
     ],
     tags = ["automanaged"],
 )

staging/src/BUILD

@@ -28,6 +28,7 @@ filegroup(
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:all-srcs",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:all-srcs",
         "//staging/src/k8s.io/apimachinery/pkg/apis/testapigroup:all-srcs",
+        "//staging/src/k8s.io/apimachinery/pkg/apply:all-srcs",
         "//staging/src/k8s.io/apimachinery/pkg/conversion:all-srcs",
         "//staging/src/k8s.io/apimachinery/pkg/fields:all-srcs",
         "//staging/src/k8s.io/apimachinery/pkg/labels:all-srcs",

staging/src/k8s.io/apimachinery/Godeps/Godeps.json

@@ -304,15 +304,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
-<<<<<<< HEAD
-			"Rev": "8a9b82f00b3a86eac24681da3f9fe6c34c01cea2"
+			"Rev": "91cfa479c814065e420cee7ed227db0f63a5854e"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto/testing",
-			"Rev": "8a9b82f00b3a86eac24681da3f9fe6c34c01cea2"
-=======
 			"Rev": "91cfa479c814065e420cee7ed227db0f63a5854e"
->>>>>>> upstream/master
 		}
 	]
 }

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/meta.go

@@ -168,7 +168,8 @@ func (meta *ObjectMeta) GetOwnerReferences() []OwnerReference         { return m
 func (meta *ObjectMeta) SetOwnerReferences(references []OwnerReference) {
 	meta.OwnerReferences = references
 }
-<<<<<<< HEAD
+func (meta *ObjectMeta) GetClusterName() string            { return meta.ClusterName }
+func (meta *ObjectMeta) SetClusterName(clusterName string) { meta.ClusterName = clusterName }
 
 func (meta *ObjectMeta) GetLastApplied() map[string]string {
 	return meta.LastApplied
@@ -180,7 +181,3 @@ func (meta *ObjectMeta) SetLastApplied(lastApplied map[string]string) {
 		meta.LastApplied[key] = value
 	}
 }
-=======
-func (meta *ObjectMeta) GetClusterName() string            { return meta.ClusterName }
-func (meta *ObjectMeta) SetClusterName(clusterName string) { meta.ClusterName = clusterName }
->>>>>>> upstream/master

staging/src/k8s.io/apimachinery/pkg/apply/BUILD

@@ -13,6 +13,7 @@ go_library(
         "type_element.go",
         "visitor.go",
     ],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apply",
     importpath = "k8s.io/apimachinery/pkg/apply",
     visibility = ["//visibility:public"],
 )

staging/src/k8s.io/apimachinery/pkg/apply/parse/BUILD

@@ -13,16 +13,11 @@ go_library(
         "util.go",
         "visitor.go",
     ],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apply/parse",
     importpath = "k8s.io/apimachinery/pkg/apply/parse",
     visibility = ["//visibility:public"],
     deps = [
-<<<<<<< HEAD:staging/src/k8s.io/apimachinery/pkg/apply/parse/BUILD
-        "//vendor/k8s.io/apimachinery/pkg/apply:go_default_library",
-=======
-        "//pkg/kubectl/apply:go_default_library",
-        "//pkg/kubectl/cmd/util/openapi:go_default_library",
-        "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
->>>>>>> upstream/master:pkg/kubectl/apply/parse/BUILD
+        "//staging/src/k8s.io/apimachinery/pkg/apply:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
     ],
 )

staging/src/k8s.io/apimachinery/pkg/apply/strategy/BUILD

@@ -10,9 +10,10 @@ go_library(
         "retain_keys_visitor.go",
         "strategic_visitor.go",
     ],
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apply/strategy",
     importpath = "k8s.io/apimachinery/pkg/apply/strategy",
     visibility = ["//visibility:public"],
-    deps = ["//vendor/k8s.io/apimachinery/pkg/apply:go_default_library"],
+    deps = ["//staging/src/k8s.io/apimachinery/pkg/apply:go_default_library"],
 )
 
 go_test(
@@ -36,28 +37,16 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
-<<<<<<< HEAD:staging/src/k8s.io/apimachinery/pkg/apply/strategy/BUILD
-=======
-        "//pkg/kubectl/apply:go_default_library",
-        "//pkg/kubectl/apply/parse:go_default_library",
-        "//pkg/kubectl/cmd/util/openapi:go_default_library",
-        "//pkg/kubectl/cmd/util/openapi/testing:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply/parse:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
->>>>>>> upstream/master:pkg/kubectl/apply/strategy/BUILD
         "//vendor/github.com/ghodss/yaml:go_default_library",
         "//vendor/github.com/onsi/ginkgo:go_default_library",
         "//vendor/github.com/onsi/ginkgo/config:go_default_library",
         "//vendor/github.com/onsi/ginkgo/types:go_default_library",
         "//vendor/github.com/onsi/gomega:go_default_library",
-<<<<<<< HEAD:staging/src/k8s.io/apimachinery/pkg/apply/strategy/BUILD
-        "//vendor/k8s.io/apimachinery/pkg/apply:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply/parse:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply/strategy:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/util/proto/testing:go_default_library",
-=======
->>>>>>> upstream/master:pkg/kubectl/apply/strategy/BUILD
     ],
 )
 

staging/src/k8s.io/apiserver/pkg/endpoints/BUILD

@@ -49,48 +49,12 @@ go_test(
         "//staging/src/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/endpoints/testing:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/features:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server/filters:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
         "//vendor/golang.org/x/net/websocket:go_default_library",
-<<<<<<< HEAD
-        "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/testing/fuzzer:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/admission:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/apis/audit:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/apis/example:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/apis/example/fuzzer:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/apis/example/v1:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/audit:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/audit/policy:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/filters:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/testing:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/features:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/server/filters:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
-=======
->>>>>>> upstream/master
     ],
 )
 
@@ -116,30 +80,12 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/endpoints/handlers:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/endpoints/handlers/negotiation:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/endpoints/metrics:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/features:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/server/filters:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/openapi:go_default_library",
         "//vendor/github.com/emicklei/go-restful:go_default_library",
-<<<<<<< HEAD
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/conversion:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/admission:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/discovery:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/negotiation:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/metrics:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/features:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/server/filters:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/feature:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/openapi:go_default_library",
-=======
->>>>>>> upstream/master
         "//vendor/k8s.io/kube-openapi/pkg/builder:go_default_library",
         "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
     ],

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/BUILD

@@ -27,33 +27,13 @@ go_test(
         "//staging/src/k8s.io/apimachinery/pkg/util/diff:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
+        "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/apis/example:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/apis/example/v1:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/registry/rest:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/trace:go_default_library",
         "//vendor/github.com/evanphx/json-patch:go_default_library",
-<<<<<<< HEAD
-        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/diff:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/admission:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/apis/example:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/apis/example/v1:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/trace:go_default_library",
-=======
->>>>>>> upstream/master
     ],
 )
 
@@ -79,7 +59,11 @@ go_library(
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply/parse:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apply/strategy:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/fields:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -105,39 +89,6 @@ go_library(
         "//vendor/github.com/ghodss/yaml:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/golang.org/x/net/websocket:go_default_library",
-<<<<<<< HEAD
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply/parse:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/apply/strategy:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer/streaming:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/json:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/mergepatch:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/util/strategicpatch:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/admission:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/audit:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/negotiation:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/metrics:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/trace:go_default_library",
-        "//vendor/k8s.io/apiserver/pkg/util/wsstream:go_default_library",
-=======
->>>>>>> upstream/master
         "//vendor/k8s.io/kube-openapi/pkg/util/proto:go_default_library",
     ],
 )

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go

@@ -399,15 +399,10 @@ func (p *patcher) patchResource(ctx context.Context, scope RequestScope) (runtim
 
 	wasCreated := false
 	p.updatedObjectInfo = rest.DefaultUpdatedObjectInfo(nil, p.applyPatch, p.applyAdmission)
-<<<<<<< HEAD
 	result, err := finishRequest(p.timeout, func() (runtime.Object, error) {
 		// TODO: Pass in UpdateOptions to override UpdateStrategy.AllowUpdateOnCreate
-		updateObject, created, updateErr := p.restPatcher.Update(ctx, p.name, p.updatedObjectInfo, p.createValidation, p.updateValidation)
+		updateObject, created, updateErr := p.restPatcher.Update(ctx, p.name, p.updatedObjectInfo, p.createValidation, p.updateValidation, false)
 		wasCreated = created
-=======
-	return finishRequest(p.timeout, func() (runtime.Object, error) {
-		updateObject, _, updateErr := p.restPatcher.Update(ctx, p.name, p.updatedObjectInfo, p.createValidation, p.updateValidation, false)
->>>>>>> upstream/master
 		return updateObject, updateErr
 	})
 	return result, wasCreated, err