Merge pull request #534 from estroz/chore/webhooks-v1

⚠️ update dependencies to v1.19.2

Author: k8s-ci-robot

.run-controller-gen.sh

@@ -4,11 +4,27 @@
 # 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.
 
-current_dir=$(pwd)
-if ! readlink -f . &>/dev/null; then
-    echo "you're probably on OSX.  Please install gnu readlink -- otherwise you're missing the most useful readlink flag."
-    exit 1
-fi
+set -o errexit
+set -o nounset
+set -o pipefail
+
+readlink=$(command -v readlink)
 
-cd $(dirname $(readlink -f ${BASH_SOURCE[0]}))
+check_readlink() {
+    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)
+                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 $@

go.mod

@@ -1,20 +1,20 @@
 module sigs.k8s.io/controller-tools
 
-go 1.13
+go 1.15
 
 require (
-	github.com/fatih/color v1.7.0
+	github.com/fatih/color v1.9.0
 	github.com/gobuffalo/flect v0.2.2
-	github.com/google/go-cmp v0.3.0
-	github.com/mattn/go-colorable v0.1.2 // indirect
-	github.com/onsi/ginkgo v1.11.0
-	github.com/onsi/gomega v1.8.1
+	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-20200616195046-dc31b401abb5
-	gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966
-	k8s.io/api v0.18.2
-	k8s.io/apiextensions-apiserver v0.18.2
-	k8s.io/apimachinery v0.18.2
+	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
 	sigs.k8s.io/yaml v1.2.0
 )

go.sum

@@ -21,7 +21,9 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 
+	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"sigs.k8s.io/controller-tools/pkg/crd"
@@ -32,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")
@@ -68,11 +75,12 @@ 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.Bytes()).To(Equal(expectedFile))
+		Expect(out.buf.String()).To(Equal(string(expectedFile)), cmp.Diff(out.buf.String(), string(expectedFile)))
 
 	})
 
@@ -84,15 +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.Bytes()).To(Equal(expectedFile))
-
+		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/gen_integration_test.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/cronjob_types.go

@@ -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,22 +19,17 @@ 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
         spec:
           properties:
             defaultedString:
-              description: This tests that defaulted fields are stripped for v1beta1,
-                but not for v1
+              description: This tests that defaulted fields are stripped for v1beta1, but not for v1
               type: string
           required:
           - defaultedString

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/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,23 +21,18 @@ 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
           spec:
             properties:
               defaultedString:
                 default: fooDefaultString
-                description: This tests that defaulted fields are stripped for v1beta1,
-                  but not for v1
+                description: This tests that defaulted fields are stripped for v1beta1, but not for v1
                 type: string
             required:
             - defaultedString

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

@@ -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/gen/foo_types.go

@@ -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
 )