Merge pull request #4538 from vincepri/update-cr0090b1

🌱 Update Controller Runtime v0.9.0-beta.0 and Tools to v0.6.0-beta.0
kubernetes-sigs · Apr 27, 2021 · 4ea7d2c · 4ea7d2c
2 parents a0313eb + 03d551f
commit 4ea7d2c
Show file tree

Hide file tree

Showing 24 changed files with 5,534 additions and 1,745 deletions.
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
diff --git a/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/bootstrap/kubeadm/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
diff --git a/cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_metadata.yaml b/cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_metadata.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.0-beta.0
   creationTimestamp: null
   name: metadata.clusterctl.cluster.x-k8s.io
 spec:
@@ -22,19 +22,25 @@ spec:
         description: Metadata for a provider repository.
         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/sig-architecture/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/sig-architecture/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
           releaseSeries:
             items:
-              description: ReleaseSeries maps a provider release series (major/minor) with a API Version of Cluster API (contract).
+              description: ReleaseSeries maps a provider release series (major/minor)
+                with a API Version of Cluster API (contract).
               properties:
                 contract:
-                  description: "Contract defines the Cluster API contract supported by this series. \n The value is an API Version, e.g. `v1alpha3`."
+                  description: "Contract defines the Cluster API contract supported
+                    by this series. \n The value is an API Version, e.g. `v1alpha3`."
                   type: string
                 major:
                   description: Major version of the release series

diff --git a/cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_providers.yaml b/cmd/clusterctl/config/crd/bases/clusterctl.cluster.x-k8s.io_providers.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.0-beta.0
   creationTimestamp: null
   name: providers.clusterctl.cluster.x-k8s.io
 spec:
@@ -37,24 +37,31 @@ spec:
         description: Provider defines an entry in the provider inventory.
         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/sig-architecture/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/sig-architecture/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
           providerName:
             description: ProviderName indicates the name of the provider.
             type: string
           type:
-            description: Type indicates the type of the provider. See ProviderType for a list of supported values
+            description: Type indicates the type of the provider. See ProviderType
+              for a list of supported values
             type: string
           version:
             description: Version indicates the component version.
             type: string
           watchedNamespace:
-            description: WatchedNamespace indicates the namespace where the provider controller is is watching. if empty the provider controller is watching for objects in all namespaces.
+            description: WatchedNamespace indicates the namespace where the provider
+              controller is is watching. if empty the provider controller is watching
+              for objects in all namespaces.
             type: string
         type: object
     served: true

diff --git a/cmd/clusterctl/config/manifest/clusterctl-api.yaml b/cmd/clusterctl/config/manifest/clusterctl-api.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.0-beta.0
   creationTimestamp: null
   name: providers.clusterctl.cluster.x-k8s.io
 spec:

diff --git a/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml b/config/crd/bases/addons.cluster.x-k8s.io_clusterresourcesetbindings.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.5.0
+    controller-gen.kubebuilder.io/version: v0.6.0-beta.0
   creationTimestamp: null
   name: clusterresourcesetbindings.addons.cluster.x-k8s.io
 spec:
@@ -21,50 +21,68 @@ spec:
   - name: v1alpha3
     schema:
       openAPIV3Schema:
-        description: ClusterResourceSetBinding lists all matching ClusterResourceSets with the cluster it belongs to.
+        description: ClusterResourceSetBinding lists all matching ClusterResourceSets
+          with the cluster it belongs to.
         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/sig-architecture/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/sig-architecture/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:
-            description: ClusterResourceSetBindingSpec defines the desired state of ClusterResourceSetBinding.
+            description: ClusterResourceSetBindingSpec defines the desired state of
+              ClusterResourceSetBinding.
             properties:
               bindings:
                 description: Bindings is a list of ClusterResourceSets and their resources.
                 items:
-                  description: ResourceSetBinding keeps info on all of the resources in a ClusterResourceSet.
+                  description: ResourceSetBinding keeps info on all of the resources
+                    in a ClusterResourceSet.
                   properties:
                     clusterResourceSetName:
-                      description: ClusterResourceSetName is the name of the ClusterResourceSet that is applied to the owner cluster of the binding.
+                      description: ClusterResourceSetName is the name of the ClusterResourceSet
+                        that is applied to the owner cluster of the binding.
                       type: string
                     resources:
-                      description: Resources is a list of resources that the ClusterResourceSet has.
+                      description: Resources is a list of resources that the ClusterResourceSet
+                        has.
                       items:
-                        description: ResourceBinding shows the status of a resource that belongs to a ClusterResourceSet matched by the owner cluster of the ClusterResourceSetBinding object.
+                        description: ResourceBinding shows the status of a resource
+                          that belongs to a ClusterResourceSet matched by the owner
+                          cluster of the ClusterResourceSetBinding object.
                         properties:
                           applied:
-                            description: Applied is to track if a resource is applied to the cluster or not.
+                            description: Applied is to track if a resource is applied
+                              to the cluster or not.
                             type: boolean
                           hash:
-                            description: Hash is the hash of a resource's data. This can be used to decide if a resource is changed. For "ApplyOnce" ClusterResourceSet.spec.strategy, this is no-op as that strategy does not act on change.
+                            description: Hash is the hash of a resource's data. This
+                              can be used to decide if a resource is changed. For
+                              "ApplyOnce" ClusterResourceSet.spec.strategy, this is
+                              no-op as that strategy does not act on change.
                             type: string
                           kind:
-                            description: 'Kind of the resource. Supported kinds are: Secrets and ConfigMaps.'
+                            description: 'Kind of the resource. Supported kinds are:
+                              Secrets and ConfigMaps.'
                             enum:
                             - Secret
                             - ConfigMap
                             type: string
                           lastAppliedTime:
-                            description: LastAppliedTime identifies when this resource was last applied to the cluster.
+                            description: LastAppliedTime identifies when this resource
+                              was last applied to the cluster.
                             format: date-time
                             type: string
                           name:
-                            description: Name of the resource that is in the same namespace with ClusterResourceSet object.
+                            description: Name of the resource that is in the same
+                              namespace with ClusterResourceSet object.
                             minLength: 1
                             type: string
                         required:
@@ -86,50 +104,68 @@ spec:
   - name: v1alpha4
     schema:
       openAPIV3Schema:
-        description: ClusterResourceSetBinding lists all matching ClusterResourceSets with the cluster it belongs to.
+        description: ClusterResourceSetBinding lists all matching ClusterResourceSets
+          with the cluster it belongs to.
         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/sig-architecture/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/sig-architecture/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:
-            description: ClusterResourceSetBindingSpec defines the desired state of ClusterResourceSetBinding.
+            description: ClusterResourceSetBindingSpec defines the desired state of
+              ClusterResourceSetBinding.
             properties:
               bindings:
                 description: Bindings is a list of ClusterResourceSets and their resources.
                 items:
-                  description: ResourceSetBinding keeps info on all of the resources in a ClusterResourceSet.
+                  description: ResourceSetBinding keeps info on all of the resources
+                    in a ClusterResourceSet.
                   properties:
                     clusterResourceSetName:
-                      description: ClusterResourceSetName is the name of the ClusterResourceSet that is applied to the owner cluster of the binding.
+                      description: ClusterResourceSetName is the name of the ClusterResourceSet
+                        that is applied to the owner cluster of the binding.
                       type: string
                     resources:
-                      description: Resources is a list of resources that the ClusterResourceSet has.
+                      description: Resources is a list of resources that the ClusterResourceSet
+                        has.
                       items:
-                        description: ResourceBinding shows the status of a resource that belongs to a ClusterResourceSet matched by the owner cluster of the ClusterResourceSetBinding object.
+                        description: ResourceBinding shows the status of a resource
+                          that belongs to a ClusterResourceSet matched by the owner
+                          cluster of the ClusterResourceSetBinding object.
                         properties:
                           applied:
-                            description: Applied is to track if a resource is applied to the cluster or not.
+                            description: Applied is to track if a resource is applied
+                              to the cluster or not.
                             type: boolean
                           hash:
-                            description: Hash is the hash of a resource's data. This can be used to decide if a resource is changed. For "ApplyOnce" ClusterResourceSet.spec.strategy, this is no-op as that strategy does not act on change.
+                            description: Hash is the hash of a resource's data. This
+                              can be used to decide if a resource is changed. For
+                              "ApplyOnce" ClusterResourceSet.spec.strategy, this is
+                              no-op as that strategy does not act on change.
                             type: string
                           kind:
-                            description: 'Kind of the resource. Supported kinds are: Secrets and ConfigMaps.'
+                            description: 'Kind of the resource. Supported kinds are:
+                              Secrets and ConfigMaps.'
                             enum:
                             - Secret
                             - ConfigMap
                             type: string
                           lastAppliedTime:
-                            description: LastAppliedTime identifies when this resource was last applied to the cluster.
+                            description: LastAppliedTime identifies when this resource
+                              was last applied to the cluster.
                             format: date-time
                             type: string
                           name:
-                            description: Name of the resource that is in the same namespace with ClusterResourceSet object.
+                            description: Name of the resource that is in the same
+                              namespace with ClusterResourceSet object.
                             minLength: 1
                             type: string
                         required: