github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-20 07:56:02 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflicts

Browse Source
This commit is contained in:
jennybuckley
2018-07-02 16:03:40 -07:00
parent 0f9f0907d6
commit eb1dca3a06
13 changed files with 34 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/swagger-spec/coordination.k8s.io_v1beta1.json generated
View File

@@ -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."
}
}
},