pkg/webhook: use v1 type for both v1 and v1beta1 webhook config generation

.run-controller-gen.sh: fix readlink check

*: update testdata with v1.19.2 deps, regenerate, fix tests

Author: estroz

.run-controller-gen.sh

@@ -11,7 +11,9 @@ set -o pipefail
 readlink=$(command -v readlink)
 
 check_readlink() {
-    if ! ${readlink} -f &>/dev/null; then
+    local test_file="$(mktemp)"
+    trap "rm -f $test_file" EXIT
+    if ! ${readlink} -f "$test_file" &>/dev/null; then
         if [[ "${OSTYPE}" == "darwin"* ]]; then
             if command -v greadlink; then
                 readlink=$(command -v greadlink)

pkg/crd/gen_integration_test.go

@@ -21,6 +21,7 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 
 	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo"
@@ -33,13 +34,18 @@ import (
 )
 
 var _ = Describe("CRD Generation proper defaulting", func() {
-	var ctx *genall.GenerationContext
-	var out *outputRule
+	var (
+		ctx *genall.GenerationContext
+		out *outputRule
+
+		genDir = filepath.Join("testdata", "gen")
+	)
+
 	BeforeEach(func() {
 		By("switching into testdata to appease go modules")
 		cwd, err := os.Getwd()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(os.Chdir("./testdata/gen")).To(Succeed()) // go modules are directory-sensitive
+		Expect(os.Chdir(genDir)).To(Succeed()) // go modules are directory-sensitive
 		defer func() { Expect(os.Chdir(cwd)).To(Succeed()) }()
 
 		By("loading the roots")
@@ -69,8 +75,9 @@ var _ = Describe("CRD Generation proper defaulting", func() {
 		Expect(gen.Generate(ctx)).NotTo(HaveOccurred())
 
 		By("loading the desired YAML")
-		expectedFile, err := ioutil.ReadFile("./testdata/gen/foo_crd_v1beta1.yaml")
+		expectedFile, err := ioutil.ReadFile(filepath.Join(genDir, "bar.example.com_foos.v1beta1.yaml"))
 		Expect(err).NotTo(HaveOccurred())
+		expectedFile = fixAnnotations(expectedFile)
 
 		By("comparing the two")
 		Expect(out.buf.String()).To(Equal(string(expectedFile)), cmp.Diff(out.buf.String(), string(expectedFile)))
@@ -85,14 +92,20 @@ var _ = Describe("CRD Generation proper defaulting", func() {
 		Expect(gen.Generate(ctx)).NotTo(HaveOccurred())
 
 		By("loading the desired YAML")
-		expectedFile, err := ioutil.ReadFile("./testdata/gen/foo_crd_v1.yaml")
+		expectedFile, err := ioutil.ReadFile(filepath.Join(genDir, "bar.example.com_foos.yaml"))
 		Expect(err).NotTo(HaveOccurred())
+		expectedFile = fixAnnotations(expectedFile)
 
 		By("comparing the two")
 		Expect(out.buf.String()).To(Equal(string(expectedFile)), cmp.Diff(out.buf.String(), string(expectedFile)))
 	})
 })
 
+// fixAnnotations fixes the attribution annotation for tests.
+func fixAnnotations(crdBytes []byte) []byte {
+	return bytes.Replace(crdBytes, []byte("(devel)"), []byte("(unknown)"), 1)
+}
+
 type outputRule struct {
 	buf *bytes.Buffer
 }

pkg/crd/testdata/cronjob_types.go

@@ -16,7 +16,7 @@ limitations under the License.
 // TODO(directxman12): test this across both versions (right now we're just
 // trusting k/k conversion, which is probably fine though)
 
-//go:generate ../../../.run-controller-gen.sh paths=. output:dir=.
+//go:generate ../../../.run-controller-gen.sh crd paths=. output:dir=.
 
 // +groupName=testdata.kubebuilder.io
 // +versionName=v1
@@ -159,9 +159,10 @@ type CronJobSpec struct {
 // +kubebuilder:validation:Type=object
 // +kubebuilder:pruning:PreserveUnknownFields
 type Preserved struct {
-	ConcreteField string `json:"concreteField"`
-	Rest map[string]interface{} `json:"-"`
+	ConcreteField string                 `json:"concreteField"`
+	Rest          map[string]interface{} `json:"-"`
 }
+
 func (p *Preserved) UnmarshalJSON(data []byte) error {
 	if err := json.Unmarshal(data, &p.Rest); err != nil {
 		return err
@@ -303,7 +304,3 @@ type CronJobList struct {
 	metav1.ListMeta `json:"metadata,omitempty"`
 	Items           []CronJob `json:"items"`
 }
-
-func init() {
-	SchemeBuilder.Register(&CronJob{}, &CronJobList{})
-}

pkg/crd/testdata/gen/foo_crd_v1beta1.yaml renamed to pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: (unknown)
+    controller-gen.kubebuilder.io/version: (devel)
   creationTimestamp: null
   name: foos.bar.example.com
 spec:
@@ -19,10 +19,10 @@ spec:
     openAPIV3Schema:
       properties:
         apiVersion:
-          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+          description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
           type: string
         kind:
-          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+          description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
           type: string
         metadata:
           type: object

pkg/crd/testdata/gen/foo_crd_v1.yaml renamed to pkg/crd/testdata/gen/bar.example.com_foos.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: (unknown)
+    controller-gen.kubebuilder.io/version: (devel)
   creationTimestamp: null
   name: foos.bar.example.com
 spec:
@@ -21,10 +21,10 @@ spec:
       openAPIV3Schema:
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object

pkg/crd/testdata/gen/foo_types.go

@@ -13,7 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-//go:generate ../../../../.run-controller-gen.sh paths=. output:dir=.
+//go:generate ../../../../.run-controller-gen.sh crd:crdVersions=v1beta1 paths=. output:dir=.
+//go:generate mv bar.example.com_foos.yaml bar.example.com_foos.v1beta1.yaml
+//go:generate ../../../../.run-controller-gen.sh crd:crdVersions=v1 paths=. output:dir=.
+
 // +groupName=bar.example.com
 package foo
 

pkg/crd/testdata/go.mod

@@ -1,8 +1,8 @@
 module testdata.kubebuilder.io/cronjob
 
-go 1.13
+go 1.15
 
 require (
-	k8s.io/api v0.0.0-20190615205754-1d1b8b084b30
-	k8s.io/apimachinery v0.0.0-20190612125636-6a5db36e93ad
+	k8s.io/api v0.19.2
+	k8s.io/apimachinery v0.19.2
 )