Skip to content
This repository was archived by the owner on Feb 14, 2022. It is now read-only.

Bump Kubernetes vendoring to 1.16.2 #149

Merged
merged 7 commits into from
Nov 7, 2019

Conversation

chris-crone
Copy link
Member

@chris-crone chris-crone commented Oct 9, 2019

Additional information:

  • Bumped kubernetes* to v1.16.2 in Gopkg.toml
  • Changed serializer.DirectCodecFactory to serializer.WithoutConversionCodecFactory in api/client/clientset/typed/compose/*/compose_client.go
  • Changed expected error in internal/registry/tableconvert_test.go
  • Removed bitbucket.org/ww/goautoneg as it is now included in Prometheus
  • Moved grpc to v1.23.1
  • Ran dep ensure -update sigs.k8s.io/structured-merge-diff
  • Ran dep ensure -update k8s.io/utils

Fixes #150 by not advertising protobuf support.

@@ -81,7 +81,7 @@ func TestConvertTable(t *testing.T) {
{
name: "not a stack",
object: &metav1beta1.Table{},
expectedError: "unexpected object type *v1beta1.Table",
expectedError: "unexpected object type *v1.Table",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewer that this change was needed

@@ -55,7 +55,7 @@ func setConfigDefaults(config *rest.Config) error {
gv := v1alpha3.SchemeGroupVersion
config.GroupVersion = &gv
config.APIPath = "/apis"
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
config.NegotiatedSerializer = serializer.WithoutConversionCodecFactory{CodecFactory: scheme.Codecs}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to reviewer: This change was based on this: kubernetes/kubernetes#76270

Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@chris-crone chris-crone force-pushed the kube-1.16-vendoring branch 3 times, most recently from b66d6c2 to 1c80fc7 Compare October 16, 2019 17:56
@simonferquel
Copy link
Contributor

We need the delete with forward policy to pass. It is a non-regression test related to a bug found in the UCP UI.

@silvin-lubecki silvin-lubecki force-pushed the kube-1.16-vendoring branch 2 times, most recently from f5706d1 to f487653 Compare October 30, 2019 20:43
@codecov-io
Copy link

codecov-io commented Oct 30, 2019

Codecov Report

Merging #149 into master will increase coverage by 0.22%.
The diff coverage is 82.14%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #149      +/-   ##
==========================================
+ Coverage   64.79%   65.02%   +0.22%     
==========================================
  Files          90       90              
  Lines       10940    10958      +18     
==========================================
+ Hits         7089     7125      +36     
+ Misses       3550     3537      -13     
+ Partials      301      296       -5
Impacted Files Coverage Δ
install/safe.go 0% <0%> (ø) ⬆️
install/install.go 0.35% <0%> (-0.01%) ⬇️
.../clientset/typed/compose/v1beta1/compose_client.go 41.37% <100%> (ø) ⬆️
...clientset/typed/compose/v1alpha3/compose_client.go 55.17% <100%> (ø) ⬆️
.../clientset/typed/compose/v1beta2/compose_client.go 55.17% <100%> (ø) ⬆️
cmd/api-server/main.go 73.68% <100%> (ø) ⬆️
cmd/compose-controller/main.go 67.3% <100%> (+11.18%) ⬆️
internal/apiserver/apiserver.go 79.48% <100%> (+2.67%) ⬆️
internal/controller/stackreconciler.go 79.78% <0%> (-3.2%) ⬇️
internal/controller/childrenstore.go 80.26% <0%> (-2.64%) ⬇️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0e9cd2f...68b8c8e. Read the comment docs.

chris-crone and others added 7 commits November 7, 2019 15:48
Primary action was bumping the Kubernetes vendoring, other operations
were to make it work.

* Kubernetes to 1.16.2
* Removed `bitbucket.org/ww/goautoneg` as it is now included in Prometheus
* Changed `serializer.DirectCodecFactory` to `serializer.WithoutConversionCodecFactory` in `api/client/clientset/typed/compose/*/compose_client.go`
* Moved grpc to v1.23.1
* Ran `dep ensure -update sigs.k8s.io/structured-merge-diff`
* Ran `dep ensure -update k8s.io/utils`

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
This fixes docker#150.

As the `Stack` struct does not support being serialized to protobuf, we
must not advertise that we support protobuf.

Signed-off-by: Christopher Crone <christopher.crone@docker.com>
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
@silvin-lubecki silvin-lubecki merged commit fb4b9b6 into docker:master Nov 7, 2019
@silvin-lubecki silvin-lubecki changed the title Bump Kubernetes vendoring to 1.16.1 Bump Kubernetes vendoring to 1.16.2 Nov 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

k8s 1.16: serialization issue, namespace deletion hangs
5 participants