Bump controller-tools #2497
Bump controller-tools #2497
Conversation
| @@ -36,11 +36,11 @@ func Test_podsToUpgrade(t *testing.T) { | |||
| args: args{ | |||
| statefulSets: sset.StatefulSetList{ | |||
| sset.TestSset{ | |||
| Name: "masters", Replicas: 2, Master: true, | |||
| Name: "masters", Namespace: TestEsNamespace, Replicas: 2, Master: true, | |||
There was a problem hiding this comment.
I'm surprised to see that in the PR.
Does it fail if not set, or is it completely unrelated?
There was a problem hiding this comment.
Yeah, it was surprising to me that this ever passed. The NS was added in
9d3aaa8 so if you check out any of the ones before that you should be able to see.
|
We may want to wait for kubernetes-sigs/controller-tools#392 to be resolved first? |
|
Ah I missed that issue somehow, yes that would definitely make the kustomize part of this PR simpler. I could see this going either way though -- we could merge this as is then use the flag once it is available, or we could just close this and wait for the flag. |
|
Jenkins test this please |
|
This is pending #2611 as there are some oddities in the license generator on OSX vs Linux that should be resolved in that PR. Right now the CI check is failing for the notice file |
Fix #2490
Controller tools 0.2.5 includes k8s 1.17 deps, and also includes some of the new openapi properties to support new CRD features. This causes a few issues:
x-kubernetes-int-or-stringseems to cause the 1.15 api server to interpret the schema as structural, and so is sad that there is notype: objectproperty (which we intentionally remove for Openshift 3.11 support). Removing thex-kubernetes-int-or-stringproperty allows the API server to accept the manifests on both 1.11 and 1.15, though kubectl validation fails so you need to pass it--validation=false.Kubectl validation fails because there are other new properties that are added (
x-kubernetes-list-typeandx-kubernetes-list-map-keys). I removed these properties too to make applying the CRDs easier, even though they are not strictly required by the API server.I believe these properties will be required in k8s 1.19 when v1beta1 CRD support is removed and structural schema is required, but that is a bit away. All of this stems from supporting 1.11 which has a bug that requires us to remove
type:objectfrom the root. Once we stop supporting 1.11 this all becomes much simpler.Other options than the approach in this PR that may be worthwhile:
Also added the namespace to some unit tests that were passing but don't seem like they should have been in older versions (and were failing now).
It's also not clear to me if we should target v1.0.1 with this.