Commit Graph

72678 Commits

Author SHA1 Message Date
Antoine Pelisse
e140ecbd75 kubectl-diff: Use server-side apply
Add a new flag, similar to the flag for apply, to request server-side
apply on diff. Also add the force-conflicts flag from apply so that you
can see what happens when you re-acquire the ownership of fields.
2018-12-19 10:49:29 -08:00
Antoine Pelisse
ca9b4e9de9 Make diff more like other commands
The way the options are built and the command is run is much more
consistent with other commands now.
2018-12-19 10:49:29 -08:00
Kubernetes Prow Robot
cb1ab7fde6 Merge pull request #72133 from apelisse/small-integration-fixes
[FEATURE-SERVERSIDE-APPLY] Small integration fixes
2018-12-19 10:41:13 -08:00
Antoine Pelisse
5184900ca8 Make toleration warning into errors 2018-12-19 08:54:11 -08:00
Antoine Pelisse
66d24d607b Remove ManagedFields after changing the version
But before we transform it into a typed object, so that it doesn't
appear in the typed object for proper operations, but also so that we
don't remove it from the original object that we receive as an argument.
2018-12-18 14:38:07 -08:00
Antoine Pelisse
fd342b5faa fix toleration of FieldManager errors
We were updating the object to nil, so even though we tolerate errors,
we were creating errors further down the process.
2018-12-18 14:37:55 -08:00
Antoine Pelisse
00dd33d333 FieldManager: use hub version everywhere 2018-12-18 11:33:05 -08:00
Antoine Pelisse
ce014899b1 VersionConverter: Convert through internal version
One can't convert from external version to external version, so we
should go through internal version. Also make errors more explicit by
adding a little bit more info.
2018-12-17 15:53:40 -08:00
Antoine Pelisse
7d926dbe55 FieldManager: Fix little bug/omission
This has been moved to a different method but was not removed.
2018-12-17 15:53:12 -08:00
Kubernetes Prow Robot
e36cd4c9f8 Merge pull request #72083 from apelisse/toleration-and-modifying
[FEATURE-SERVERSIDE-APPLY] Toleration and modifying
2018-12-16 23:28:52 -08:00
Antoine Pelisse
e5699325cd FieldManager: Use new object field manager, and fallback on live
We first try to decode the managed fields from the new object, so that
user can have a chance to change it (and even remove it, but they have
to at least keep a field in so that we can disambiguate from client that
just drop the whole thing). If there is an error decoding (maybe the
structure has been malformed), then we just fallback on the live object
field set.
2018-12-16 12:14:35 -08:00
Antoine Pelisse
19ab44dbe9 FieldManager: Use actual version object rather than "v1"
Currently, the version is hard-coded to v1, let's use the actual version
of the object so that conversion will happen properly.
2018-12-16 12:10:31 -08:00
Antoine Pelisse
d9cb621aef Ignore FIeldManager errors on traditional path
We don't want to fail requests on traditional path like Update, Create
or Patch because we can't add the fields. In that case, just log a
warning and keep going without updating the managed fields. The only
consequence of that is that fields won't be stolen/acquired, which is a
very safe and reasonable mitigation.
2018-12-16 12:08:56 -08:00
Kubernetes Prow Robot
eb0a3ec58e Merge pull request #71858 from jennybuckley/field-to-set
[FEATURE BRANCH] Reduce the size of managedFields
2018-12-14 20:40:34 -08:00
jennybuckley
70f5256f67 add reminder to remove approvers 2018-12-14 18:35:36 -08:00
jennybuckley
7b92bfc608 Fix api and update vendored smd 2018-12-14 18:33:36 -08:00
Antoine Pelisse
e96b1cb5a1 Add --force-conflicts flag to kubectl
The flag allows force on apply so that you can re-acquire ownership of
fields when you have a conflict.
2018-12-14 18:33:36 -08:00
Antoine Pelisse
7cbb87802e Make server side apply flag consistent with dry-run 2018-12-14 18:33:36 -08:00
Antoine Pelisse
d7e626ebdd Remove managed fields before we set them
That's going to prevent recursively inserting managed fields in managed
fields...
2018-12-14 18:33:35 -08:00
Antoine Pelisse
e2eb87597e Add managed fields on create 2018-12-14 18:33:35 -08:00
jennybuckley
de05363151 Add owners for feature branch only 2018-12-14 18:33:35 -08:00
jennybuckley
1acba7d812 Fix rebase 2018-12-14 18:33:35 -08:00
jennybuckley
468b7c88e0 Update generated 2018-12-14 18:33:35 -08:00
jennybuckley
5a7d84f566 Finish implementation 2018-12-14 18:33:35 -08:00
jennybuckley
e070f0842f Add Field to Set conversion functions (apelisse) 2018-12-14 18:33:35 -08:00
Antoine Pelisse
df76269a30 Encode/Decode PathElement to/from strings 2018-12-14 18:33:35 -08:00
jennybuckley
16df5bb7bb Refactor 2018-12-14 18:33:35 -08:00
Antoine Pelisse
bc2aa3745c Remove commented file that shouldn't be commeted 2018-12-14 18:33:35 -08:00
Antoine Pelisse
952522c15a Refactor FieldManager code into single class 2018-12-14 18:33:35 -08:00
Kubernetes Prow Robot
55bd22f713 Merge pull request #72069 from apelisse/add-api-approvers
[FEATURE-SERVERSIDE-APPLY] Add us to api-approvers
2018-12-14 18:29:01 -08:00
Antoine Pelisse
c804f3a13a Add us to api-approvers 2018-12-14 15:40:50 -08:00
Kubernetes Prow Robot
ee6c9d2c1d Merge pull request #71583 from kwiesmueller/feature-serverside-apply
Glue K8s and SMD
2018-12-12 16:12:49 -08:00
Kevin Wiesmüller
b3b778f6f6 update godeps 2018-12-12 22:15:02 +01:00
Kevin Wiesmüller
1b5c60bb3c glue smd and k8s together
based on glue code from @apelisse

update godeps

fix glue code

remove TypeParser and gvkParser from handlers

add managed fields conversion in apply.go

refactor ManagedFields access into helpers

fix variable names

cleanup and remove unrequired code

remove outdated comment

add force flag to apply

fix wrong variable access

revert changes to patchMechanism and add YAMLToTyped conversion

remove unused code

fix pr review

use new VersionPatcher in patch.go

remove outdated comment

respond to nits

add YAMLToTyped test

check for nil models when creating TypeConverter

skip on missing models

remove misplaced error

fix bazel

refactor

add feature flag

experimental fixes for failing tests

More fixes

Signed-off-by: Kevin Wiesmüller <kwiesmueller@seibert-media.net>

fix bazel
2018-12-12 20:31:36 +01:00
Kubernetes Prow Robot
c4e292da42 Merge pull request #71972 from apelisse/update-kube-openapi
Update kube-openapi to fix schema parsing
2018-12-12 08:53:46 -08:00
Antoine Pelisse
60b8b79e55 Run update-staging-godeps.sh 2018-12-11 14:27:37 -08:00
Antoine Pelisse
0e0b2ad56b Update kube-openapi to fix schema parsing
There is a bug with the Time type that it doesn't accept null, which is
inconvenient because creationTimeStamp should always be set to null.
2018-12-11 13:26:33 -08:00
Daniel Smith
3c2224c798 Merge pull request #71626 from apelisse/sync-master
[FEATURE-SERVERSIDE-APPLY] Sync master
2018-12-05 16:25:14 -08:00
Kubernetes Prow Robot
fa6e207727 Merge pull request #71481 from jennybuckley/apply-convertr
[FEATURE BRANCH] Add Version Converter for serverside apply
2018-12-04 10:52:46 -08:00
Antoine Pelisse
0cc653be11 Comment broken RBAC test 2018-12-03 15:05:42 -08:00
Antoine Pelisse
a02b3d55f3 Run update-staging-godeps 2018-12-03 15:04:57 -08:00
Antoine Pelisse
0c9660a458 Update gofuzz and fix meta test 2018-12-03 13:22:58 -08:00
Antoine Pelisse
7812b3eb6f Merge feature-serverside-apply into master 2018-12-03 11:25:07 -08:00
k8s-ci-robot
d8f428225e Merge pull request #70824 from apelisse/add-force-option
[FEATURE-SERVER-SIDE] Add force option
2018-11-30 15:23:11 -08:00
k8s-ci-robot
30d61f2f71 Merge pull request #71558 from luxas/kubeadm_owners
Update kubeadm OWNERS file
2018-11-30 15:09:55 -08:00
k8s-ci-robot
08706ea29f Merge pull request #71540 from mauilion/kubeadm_1287
Add conntrack as a dependency of kubelet
2018-11-30 15:09:45 -08:00
k8s-ci-robot
51453a3131 Merge pull request #71576 from MrHohn/e2e-ingress-resp-new
[e2e ingress] actually assign value to resp
2018-11-30 12:09:28 -08:00
k8s-ci-robot
06cc355b76 Merge pull request #71574 from msau42/remove-events-e2e
Check for subpath error in container status instead of pod events
2018-11-30 12:09:18 -08:00
jennybuckley
12425c4adb update generated 2018-11-30 11:36:03 -08:00
jennybuckley
21332930cf add versionconverter 2018-11-30 11:36:03 -08:00