Merge pull request #1812 from avorima/update_dependencies

⚠️ Update controller-runtime and client-go

Author: k8s-ci-robot

Makefile

@@ -172,18 +172,18 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 		paths=./api/... \
 		paths=./controllers/... \
 		paths=./bootstrap/kubeadm/controllers/... \
-		crd \
+		crd:preserveUnknownFields=false \
 		rbac:roleName=manager-role \
 		output:crd:dir=./config/crd/bases \
 		output:webhook:dir=./config/webhook \
 		webhook
 	$(CONTROLLER_GEN) \
 		paths=./bootstrap/kubeadm/api/... \
-		crd:trivialVersions=true \
+		crd:trivialVersions=true,preserveUnknownFields=false \
 		output:crd:dir=./config/crd/bases
 	$(CONTROLLER_GEN) \
 		paths=./cmd/clusterctl/api/... \
-		crd:trivialVersions=true \
+		crd:trivialVersions=true,preserveUnknownFields=false \
 		output:crd:dir=./cmd/clusterctl/config/crd/bases
 	## Copy files in CI folders.
 	cp -f ./config/rbac/*.yaml ./config/ci/rbac/

cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_providers.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.3
+    controller-gen.kubebuilder.io/version: v0.2.4
   creationTimestamp: null
   name: providers.clusterctl.cluster.x-k8s.io
 spec:
@@ -36,12 +36,12 @@ spec:
         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'
+            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'
+            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

cmd/clusterctl/config/crd_manifests.go

@@ -41,7 +41,7 @@ func bindata_read(data []byte, name string) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-var _cmd_clusterctl_config_manifest_clusterctl_api_yaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x55\x4d\x6f\xe3\x36\x10\xbd\xfb\x57\x0c\xb6\x87\xbd\xd4\x72\xd3\x5c\x0a\xdd\x16\x69\x0b\xa4\x1f\xdb\x60\x93\x66\x0f\x45\x0f\xb4\x38\xb6\xa7\xa1\x86\x2c\x67\xe8\x6c\x5a\xf4\xbf\x17\x24\x25\x59\x32\x90\xf5\x65\x7d\x32\x9f\x66\x38\x8f\x6f\xbe\x4c\xa0\x47\x8c\x42\x9e\x5b\x30\x81\xf0\x93\x22\xe7\x93\x34\x4f\xdf\x49\x43\x7e\x73\xbc\xda\xa2\x9a\xab\xd5\x13\xb1\x6d\xe1\x26\x89\xfa\xfe\x03\x8a\x4f\xb1\xc3\xef\x71\x47\x4c\x4a\x9e\x57\x3d\xaa\xb1\x46\x4d\xbb\x02\x30\xcc\x5e\x4d\x86\x25\x1f\x01\x3a\xcf\x1a\xbd\x73\x18\xd7\x7b\xe4\xe6\x29\x6d\x71\x9b\xc8\x59\x8c\x25\xc2\x18\xff\xf8\x4d\xf3\x6d\x73\xbd\x02\xe8\x22\x16\xf7\x07\xea\x51\xd4\xf4\xa1\x05\x4e\xce\xad\x00\xd8\xf4\xd8\x42\x88\xfe\x48\x16\xa3\x34\x9d\x4b\xa2\x18\x3b\x75\xe3\xdf\xe6\xd3\xba\x32\x5f\x49\xc0\xae\xd0\xb1\xb6\x70\x34\xee\x2e\x12\x2b\xc6\x1b\xef\x52\x5f\xb9\xad\xe1\xa7\xfb\xdf\xde\xdf\x19\x3d\xb4\xd0\xe8\x4b\xc0\xc2\xb7\x46\x79\x18\x8f\x19\x6f\x41\x34\x12\xef\xcf\x7d\x06\xf2\x33\xb7\xc7\x19\xf2\x39\xcf\x67\xa3\xdd\x01\xed\x7b\xd3\xa3\x04\xd3\xcd\x23\x7f\xcc\x9f\x60\xf9\xe5\xec\xaa\x7d\xf4\x29\xb4\xf0\xb9\xf7\xd7\xdb\xc6\x14\x18\xc5\xbd\x8f\x34\x9e\xd7\xa3\xeb\xda\x04\x2a\x48\x4d\xf0\xdd\x20\x6d\x81\x1c\x89\xfe\xbc\x80\x7f\x21\xd1\xf2\x29\xb8\x14\x8d\x9b\xa5\xa2\xa0\x42\xbc\x4f\xce\xc4\x13\xbe\x02\x08\x11\x05\xe3\x11\x7f\xe7\x27\xf6\xcf\xfc\x23\xa1\xb3\xd2\xc2\xce\x38\xc9\x4f\x93\xce\xe7\x97\x4d\xaf\xb5\x19\x4b\xdb\x38\xd4\x98\xb4\xf0\xef\x7f\x2b\x80\xa3\x71\x64\x4b\x55\xd4\x07\xf8\x80\xfc\xee\xee\xf6\xf1\xfa\xbe\x3b\x60\x6f\x2a\x08\x60\x51\xba\x48\xa1\xd8\x4d\xac\x81\x04\xf4\x80\x50\x4d\x61\xe7\x63\x39\x4e\xdc\xe1\xdd\xdd\xed\xe0\x1f\xa2\x0f\x18\x75\xd2\x29\xff\x66\x3d\x32\x61\x67\x91\xde\x66\x2a\xd5\x06\x6c\xee\x0a\xac\x11\x87\xf2\x40\x0b\x52\x63\xfb\x1d\xe8\x81\x04\x22\x16\x59\xb8\xf6\xc9\xec\x5a\xc8\x26\x86\xc1\x6f\xff\xc2\x4e\x1b\xb8\xcf\xd2\x45\x01\x39\xf8\xe4\x6c\x6e\xa5\x23\x46\x85\x88\x9d\xdf\x33\xfd\x33\xdd\x2c\xa0\xbe\x84\x74\x46\x71\x48\xd2\xf8\x2b\x55\xcf\xc6\x65\x11\x13\x7e\x0d\x86\x2d\xf4\xe6\x05\x22\xe6\x18\x90\x78\x76\x5b\x31\x91\x06\x7e\xf5\x11\x81\x78\xe7\x5b\x38\xa8\x06\x69\x37\x9b\x3d\xe9\x38\x15\x3a\xdf\xf7\x89\x49\x5f\x36\xa5\xb7\x69\x9b\xd4\x47\xd9\x58\x3c\xa2\xdb\x98\x40\xeb\xc2\x93\xcb\x0c\x68\x7a\xfb\xd5\x94\xcd\xb7\x33\x62\x67\x25\x5d\x7f\xa5\x0c\x5f\x95\x39\x57\x63\xce\xa6\x19\xdc\x2a\xdd\x93\x9a\x19\xca\x22\x7c\xf8\xe1\xfe\x01\xc6\xa0\x45\xf1\xa5\xc4\x45\xdc\x93\x9b\x9c\x74\xce\xba\x10\xef\x30\xd6\x3c\xed\xa2\xef\xcb\x8d\xc8\x36\x78\x62\x2d\x87\xce\x11\xf2\x52\x63\x49\xdb\x9e\x34\x27\xf6\xef\x84\xa2\x39\x1d\x0d\xdc\x94\x51\x08\x5b\x84\x14\xac\x51\xb4\x0d\xdc\x32\xdc\x98\x1e\xdd\x8d\x11\xfc\xd2\x2a\x67\x41\x65\x9d\x15\xbc\xac\xf3\x7c\x60\x2f\x0d\xab\x38\xab\x05\xf8\x5a\x42\xf2\x8c\x04\x62\x4b\x79\xbe\xd4\x92\xcf\xf6\xb5\xcc\x4f\x1d\x96\xe5\xc5\xa9\x1d\x8b\xd3\xce\xc7\x85\x7e\xa6\x4c\x9b\xec\x28\x29\x04\x1f\x75\xaa\xc5\x4b\x2f\x39\x5e\xe8\xcd\xb1\x2f\x97\x34\x3b\xdf\x07\xcf\xc8\x3a\xfa\x37\x97\xe2\x9c\x0f\xec\x57\x03\x7e\x3c\x33\x3c\x8b\xcc\x13\xfe\x7c\xc0\x88\x0b\xa1\x16\x92\x9c\xd6\x66\x2e\x79\x92\xca\x80\x78\xdf\x00\xed\x00\xfb\xa0\x2f\x0b\xe7\x33\x87\xd1\x7a\x71\x67\x9e\x7d\x35\xc1\x02\xc4\x60\x9c\x3b\xf1\x91\x0b\x12\x9c\x95\xc7\x69\x6f\x5f\x19\x17\x0e\xe6\xfa\x84\x0d\xbb\xb5\x6e\xb3\xd9\x67\x80\xb2\x09\x6c\x0b\x1a\x53\xdd\x6b\xa2\x3e\x9a\x3d\x0e\x88\xa8\xd1\x54\xbc\x4d\xd7\x61\xd0\x41\xc5\x76\xb6\xa1\xde\xbc\x59\x2c\xa0\x72\xec\x3c\xd7\x1d\x2f\x2d\xfc\xf1\xe7\xaa\xde\x8a\xf6\x71\x64\x93\xc1\xff\x03\x00\x00\xff\xff\x11\xe6\x59\xd7\xea\x08\x00\x00")
+var _cmd_clusterctl_config_manifest_clusterctl_api_yaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xb4\x56\x4d\x73\x23\x35\x10\xbd\xfb\x57\x74\x2d\x87\xbd\xe0\x31\xcb\x72\xa0\xe6\xb6\x15\xa0\x2a\x7c\x2c\xa9\x4d\xc8\x1e\x28\x0e\x6d\xa9\x6d\x37\xd1\x48\x42\xdd\x72\x36\x50\xfc\x77\x4a\x92\x67\x3c\xe3\xaa\x6c\x4e\xcc\xc9\x7a\xea\x56\x3f\xbd\xfe\x90\x31\xf2\x3d\x25\xe1\xe0\x7b\xc0\xc8\xf4\x49\xc9\x97\x95\x74\x0f\xdf\x4a\xc7\x61\x73\x7c\xb3\x25\xc5\x37\xab\x07\xf6\xb6\x87\xab\x2c\x1a\x86\x0f\x24\x21\x27\x43\xdf\xd1\x8e\x3d\x2b\x07\xbf\x1a\x48\xd1\xa2\x62\xbf\x02\x40\xef\x83\x62\x81\xa5\x2c\x01\x4c\xf0\x9a\x82\x73\x94\xd6\x7b\xf2\xdd\x43\xde\xd2\x36\xb3\xb3\x94\x6a\x84\x31\xfe\xf1\xab\xee\xeb\xee\x9b\x15\x80\x49\x54\xdd\xef\x78\x20\x51\x1c\x62\x0f\x3e\x3b\xb7\x02\xf0\x38\x50\x0f\x31\x85\x23\x5b\x4a\xd2\x19\x97\x45\x29\x19\x75\xe3\xcf\xee\xd3\xba\x31\x5f\x49\x24\x53\xe9\x58\x5b\x39\xa2\xbb\x49\xec\x95\xd2\x55\x70\x79\x68\xdc\xd6\xf0\xe3\xed\xaf\xef\x6f\x50\x0f\x3d\x74\xfa\x14\xa9\xf2\x6d\x51\xee\xc6\x65\xc1\x7b\x10\x4d\xec\xf7\x97\x3e\x27\xf2\x33\xb7\xfb\x19\xf2\x39\xcf\x47\x54\x73\x20\xfb\x1e\x07\x92\x88\x66\x1e\xf9\x63\xd9\x82\xe5\xce\xc5\x51\xfb\x14\x72\xec\xe1\x73\xf7\x6f\xa7\x8d\x29\x40\xa5\x7d\x48\x3c\xae\xd7\xa3\xeb\x1a\x23\x57\xa4\x25\xf8\xe6\x24\x6d\x85\x1c\x8b\xfe\xb4\x80\x7f\x66\xd1\xba\x15\x5d\x4e\xe8\x66\xa9\xa8\xa8\xb0\xdf\x67\x87\xe9\x8c\xaf\x00\x62\x22\xa1\x74\xa4\xdf\xfc\x83\x0f\x8f\xfe\x07\x26\x67\xa5\x87\x1d\x3a\x29\x57\x13\x13\xca\xcd\xa6\xdb\xda\x82\xe5\x6d\x3a\xd5\x98\xf4\xf0\xcf\xbf\x2b\x80\x23\x3a\xb6\xb5\x2a\xda\x05\x42\x24\xff\xee\xe6\xfa\xfe\xed\xad\x39\xd0\x80\x0d\x04\xb0\x24\x26\x71\xac\x76\x13\x6b\x60\x01\x3d\x10\x34\x53\xd8\x85\x54\x97\x13\x77\x78\x77\x73\x7d\xf2\x8f\x29\x44\x4a\x3a\xe9\x54\xbe\x59\x8f\x4c\xd8\x45\xa4\xd7\x85\x4a\xb3\x01\x5b\xba\x82\x5a\xc4\x53\x79\x90\x05\x69\xb1\xc3\x0e\xf4\xc0\x02\x89\xaa\x2c\xbe\xf5\xc9\xec\x58\x28\x26\xe8\x21\x6c\xff\x24\xa3\x1d\xdc\x16\xe9\x92\x80\x1c\x42\x76\xb6\xb4\xd2\x91\x92\x42\x22\x13\xf6\x9e\xff\x9e\x4e\x16\xd0\x50\x43\x3a\x54\x3a\x25\x69\xfc\x6a\xd5\x7b\x74\x45\xc4\x4c\x5f\x02\x7a\x0b\x03\x3e\x41\xa2\x12\x03\xb2\x9f\x9d\x56\x4d\xa4\x83\x5f\x42\x22\x60\xbf\x0b\x3d\x1c\x54\xa3\xf4\x9b\xcd\x9e\x75\x9c\x0a\x26\x0c\x43\xf6\xac\x4f\x9b\xda\xdb\xbc\xcd\x1a\x92\x6c\x2c\x1d\xc9\x6d\x84\xf7\x6b\x4c\xe6\xc0\x4a\x46\x73\xa2\x0d\x46\x5e\x57\xe2\xbe\x0e\x85\x6e\xb0\x5f\x4c\xe9\x7d\x3d\x63\x7a\x51\xe3\xed\xab\x75\xf9\xac\xee\xa5\x3c\x4b\x7a\xf1\xe4\xd6\xf8\x9f\xe5\x2d\x50\x51\xe5\xc3\xf7\xb7\x77\x30\x06\xad\x29\x58\x6a\x5e\xd5\x3e\xbb\xc9\x59\xf8\x22\x14\xfb\x1d\xa5\x96\xb8\x5d\x0a\x43\x3d\x91\xbc\x8d\x81\xbd\xd6\x85\x71\x4c\x7e\x29\xba\xe4\xed\xc0\x5a\x32\xfd\x57\x26\xd1\x92\x9f\x0e\xae\xea\x6c\x84\x2d\x41\x8e\x16\x95\x6c\x07\xd7\x1e\xae\x70\x20\x77\x85\x42\xff\xbb\xec\x45\x61\x59\x17\x49\x5f\x16\x7e\x3e\xd2\x97\x86\x4d\xad\xd5\x02\x7c\x2e\x43\x65\x8a\x02\x7b\xcb\x65\x02\xb5\xa6\x28\xf6\xad\x11\xce\x3d\x58\xf4\xa6\xa9\x61\xab\xd3\x2e\xa4\x85\xa0\x58\xe7\x51\x71\x94\x1c\x63\x48\x3a\x55\xeb\x4b\x37\x39\xbe\xd0\xbd\x63\xe7\x2e\x69\x9a\x30\xc4\xe0\xc9\xeb\xe8\xdf\xbd\x14\xe7\x72\xa4\x3f\x1b\xf0\xe3\x85\xe1\x45\x64\x3f\xe1\x8f\x07\x4a\xb4\x10\x6a\x21\xc9\xf9\x61\x2d\x3d\xc0\xd2\x18\xb0\xdf\x77\xc0\x3b\xa0\x21\xea\xd3\xc2\xf9\xc2\x61\xb4\x5e\x9c\x59\xa6\x63\x4b\xb0\x00\x7b\x40\xe7\xce\x7c\xe4\x05\x09\x2e\xca\xe3\xfc\xb2\xbf\x41\x17\x0f\xf8\xf6\x8c\x9d\x5e\xdf\xf6\xde\xcd\xb6\x01\xea\x5b\x61\x7b\xd0\x94\xdb\xcb\x27\x1a\x12\xee\xe9\x84\x88\xa2\xe6\xea\x8d\xc6\x50\xd4\x93\x8a\xfd\xec\x0d\x7b\xf5\x6a\xf1\x44\xd5\xa5\x09\xbe\xfd\x0b\x90\x1e\x7e\xff\x63\xd5\x4e\x25\x7b\x3f\xb2\x29\xe0\x7f\x01\x00\x00\xff\xff\x6a\x89\xb5\x5d\x0c\x09\x00\x00")
 
 func cmd_clusterctl_config_manifest_clusterctl_api_yaml() ([]byte, error) {
 	return bindata_read(

config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml

@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.3
+    controller-gen.kubebuilder.io/version: v0.2.4
   creationTimestamp: null
   name: kubeadmconfigs.bootstrap.cluster.x-k8s.io
 spec:
@@ -27,12 +27,12 @@ spec:
         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'
+            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'
+            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
@@ -102,7 +102,7 @@ spec:
                   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'
+                    info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
                   type: string
                 certificatesDir:
                   description: CertificatesDir specifies where to store or look for
@@ -278,7 +278,7 @@ spec:
                   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'
+                    More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                   type: string
                 kubernetesVersion:
                   description: 'KubernetesVersion is the target version of the control
@@ -400,7 +400,7 @@ spec:
                   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'
+                    info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
                   type: string
                 bootstrapTokens:
                   description: BootstrapTokens is respected at `kubeadm init` time
@@ -452,7 +452,7 @@ spec:
                   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'
+                    More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                   type: string
                 localAPIEndpoint:
                   description: LocalAPIEndpoint represents the endpoint of the API
@@ -550,7 +550,7 @@ spec:
                   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'
+                    info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
                   type: string
                 caCertPath:
                   description: 'CACertPath is the path to the SSL certificate authority
@@ -653,7 +653,7 @@ spec:
                   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'
+                    More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
                   type: string
                 nodeRegistration:
                   description: NodeRegistration holds fields that relate to registering