🌱 Update dependencies to v1.19.2 #501
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,11 +4,25 @@ | |
| # it's the equivalent of `go run sigs.k8s.io/controller-tools/cmd/controller-gen` | ||
| # if you could somehow do that without modifying your go.mod. | ||
|
|
||
| set -o errexit | ||
| set -o nounset | ||
| set -o pipefail | ||
|
|
||
| readlink=$(command -v readlink) | ||
|
|
||
| check_readlink() { | ||
| if ! ${readlink} -f &>/dev/null; then | ||
| if [[ "${OSTYPE}" == "darwin"* ]]; then | ||
| if command -v greadlink; then | ||
| readlink=$(command -v greadlink) | ||
| return | ||
| fi | ||
| fi | ||
| echo "you're probably on OSX. Please install gnu readlink -- otherwise you're missing the most useful readlink flag." | ||
| exit 1 | ||
| fi | ||
| } | ||
| current_dir=$(pwd) | ||
| check_readlink | ||
| cd $(dirname $(${readlink} -f ${BASH_SOURCE[0]})) | ||
| go run -v -exec "./.run-in.sh ${current_dir} " ./cmd/controller-gen $@ | ||
|
Comment on lines
+7
to
28
There was a problem hiding this comment. @DirectXMan12 Made some changes to support gnu readlink on OSX when it's not linked (usually installed with brew install coreutils) |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,20 @@ | ||
| module sigs.k8s.io/controller-tools | ||
|
|
||
| go 1.15 | ||
|
|
||
| require ( | ||
| github.com/fatih/color v1.9.0 | ||
| github.com/gobuffalo/flect v0.2.2 | ||
| github.com/google/go-cmp v0.5.2 | ||
| github.com/mattn/go-colorable v0.1.8 // indirect | ||
| github.com/onsi/ginkgo v1.14.1 | ||
| github.com/onsi/gomega v1.10.2 | ||
| github.com/spf13/cobra v1.0.0 | ||
| github.com/spf13/pflag v1.0.5 | ||
| golang.org/x/tools v0.0.0-20201007032633-0806396f153e | ||
| gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 | ||
| k8s.io/api v0.19.2 | ||
| k8s.io/apiextensions-apiserver v0.19.2 | ||
| k8s.io/apimachinery v0.19.2 | ||
|
Comment on lines
+16
to
+18
There was a problem hiding this comment. @DirectXMan12 It seems that a test is now failing after updating to v0.19.2 From 1.19 changelog: Change came in: kubernetes/kubernetes#90018 It seems we're relying on scheme.Convert to convert webhooks, and I can't seem to find where/how to register the conversion functions in the admission APIs 🤔, I might be missing something here, although just registering the types with There was a problem hiding this comment. Conversions from v1 directly to v1beta1 AdmissionReview objects are not defined, even internally in kube-apiserver. The API server would convert from one to the other by way of the internal (unversioned) AdmissionReview type: This conversions and the internal AdmissionReview type are registered in https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/admission/install/install.go but are not exported for use outside the kube-apiserver The reflect-based conversion controller-tools was depending on previously was closer to decoding v1beta1 JSON into the v1 struct and hoping all the field names stayed the same. There was a problem hiding this comment.
It looks like this happens to be the case: diff staging/src/k8s.io/api/admission/{v1,v1beta1}/types.go2c2
< Copyright 2019 The Kubernetes Authors.
---
> Copyright 2017 The Kubernetes Authors.
17c17
< package v1
---
> package v1beta1
26a27,31
> // +k8s:prerelease-lifecycle-gen:introduced=1.9
> // +k8s:prerelease-lifecycle-gen:deprecated=1.19
> // This API is never server served. It is used for outbound requests from apiservers. This will ensure it never gets served accidentally
> // and having the generator against this group will protect future APIs which may be served.
> // +k8s:prerelease-lifecycle-gen:replacement=admission.k8s.io,v1,AdmissionReview
118c123
< // This must be copied over from the corresponding AdmissionRequest.
---
> // This should be copied over from the corresponding AdmissionRequest.but the fact that the structs happened to be identical between versions was luck, and doesn't mean this is a correct way to convert between them There was a problem hiding this comment. Thanks Jordan, it seems the removal of the default reflection-based conversion was definitely a good step, things might have failed silently. For this codebase, I think the best way is to add support for both types, or deprecate one, or write our own conversion functions. @DirectXMan12 @alvaroaleman what do you all think? There was a problem hiding this comment. Why do we have a need to convert? APIServers should still serve both or not? There was a problem hiding this comment. AdmissionReview is not a served API, it is the API sent by the API server to admission webhooks and expected in response. I'm not sure why this component is converting... is it trying to unify v1 and v1beta1 AdmissionReview handling to a single type? There was a problem hiding this comment. IIRC, we have a single interface that represents "webhook" that can interact with whatever the hook sends, and we autoconvert from whatever the server sends to the version the interface uses. Part of it was simplifying the writing of the webhook while still giving folks access to the underlying information. We should be able to paper over it, I think, but I haven't looked at this bit in a while. |
||
| sigs.k8s.io/yaml v1.2.0 | ||
| ) | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will always fail with no file argument.
To fix: