Upgrade to CAPA v2.5.2

giantswarm · Aug 28, 2024 · 5ed6d4e · 5ed6d4e
1 parent f94cb91
commit 5ed6d4e
Show file tree

Hide file tree

Showing 49 changed files with 4,960 additions and 923 deletions.
diff --git a/...cluster-api-provider-aws/files/bootstrap/bases/eksconfigs.bootstrap.cluster.x-k8s.io.yaml b/...cluster-api-provider-aws/files/bootstrap/bases/eksconfigs.bootstrap.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'

diff --git a/...api-provider-aws/files/bootstrap/bases/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml b/...api-provider-aws/files/bootstrap/bases/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml
@@ -3,7 +3,7 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/capa-serving-cert'
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.14.0
   labels:
     app.kubernetes.io/instance: '{{ .Release.Name }}'
     app.kubernetes.io/managed-by: '{{ .Release.Service }}'

diff --git a/...r-aws/files/bootstrap/patches/versions/v1beta1/eksconfigs.bootstrap.cluster.x-k8s.io.yaml b/...r-aws/files/bootstrap/patches/versions/v1beta1/eksconfigs.bootstrap.cluster.x-k8s.io.yaml
@@ -5,10 +5,19 @@
       description: EKSConfig is the schema for the Amazon EKS Machine Bootstrap Configuration API.
       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
@@ -22,10 +31,12 @@
               description: ContainerRuntime specify the container runtime to use when bootstrapping EKS.
               type: string
             dnsClusterIP:
-              description: DNSClusterIP overrides the IP address to use for DNS queries within the cluster.
+              description: ' DNSClusterIP overrides the IP address to use for DNS queries within the cluster.'
               type: string
             dockerConfigJson:
-              description: DockerConfigJson is used for the contents of the /etc/docker/daemon.json file. Useful if you want a custom config differing from the default one in the AMI. This is expected to be a json string.
+              description: |-
+                DockerConfigJson is used for the contents of the /etc/docker/daemon.json file. Useful if you want a custom config differing from the default one in the AMI.
+                This is expected to be a json string.
               type: string
             kubeletExtraArgs:
               additionalProperties:
@@ -36,7 +47,7 @@
               description: PauseContainer allows customization of the pause container to use.
               properties:
                 accountNumber:
-                  description: AccountNumber is the AWS account number to pull the pause container from.
+                  description: ' AccountNumber is the AWS account number to pull the pause container from.'
                   type: string
                 version:
                   description: Version is the tag of the pause container to use.
@@ -46,7 +57,9 @@
                 - version
               type: object
             serviceIPV6Cidr:
-              description: ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then the ip family will be set to ipv6.
+              description: |-
+                ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then
+                the ip family will be set to ipv6.
               type: string
             useMaxPods:
               description: UseMaxPods  sets --max-pods for the kubelet when true.
@@ -61,23 +74,37 @@
                 description: Condition defines an observation of a Cluster API resource operational state.
                 properties:
                   lastTransitionTime:
-                    description: Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
+                    description: |-
+                      Last time the condition transitioned from one status to another.
+                      This should be when the underlying condition changed. If that is not known, then using the time when
+                      the API field changed is acceptable.
                     format: date-time
                     type: string
                   message:
-                    description: A human readable message indicating details about the transition. This field may be empty.
+                    description: |-
+                      A human readable message indicating details about the transition.
+                      This field may be empty.
                     type: string
                   reason:
-                    description: The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.
+                    description: |-
+                      The reason for the condition's last transition in CamelCase.
+                      The specific API may choose whether or not this field is considered a guaranteed API.
+                      This field may not be empty.
                     type: string
                   severity:
-                    description: Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.
+                    description: |-
+                      Severity provides an explicit classification of Reason code, so the users or machines can immediately
+                      understand the current situation and act accordingly.
+                      The Severity field MUST be set only when Status=False.
                     type: string
                   status:
                     description: Status of the condition, one of True, False, Unknown.
                     type: string
                   type:
-                    description: Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.
+                    description: |-
+                      Type of condition in CamelCase or in foo.example.com/CamelCase.
+                      Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
+                      can be useful (see .node.status.conditions), the ability to deconflict is important.
                     type: string
                 required:
                   - lastTransitionTime

diff --git a/...les/bootstrap/patches/versions/v1beta1/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml b/...les/bootstrap/patches/versions/v1beta1/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml
@@ -5,10 +5,19 @@
       description: EKSConfigTemplate is the Amazon EKS Bootstrap Configuration Template API.
       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
@@ -28,10 +37,12 @@
                       description: ContainerRuntime specify the container runtime to use when bootstrapping EKS.
                       type: string
                     dnsClusterIP:
-                      description: DNSClusterIP overrides the IP address to use for DNS queries within the cluster.
+                      description: ' DNSClusterIP overrides the IP address to use for DNS queries within the cluster.'
                       type: string
                     dockerConfigJson:
-                      description: DockerConfigJson is used for the contents of the /etc/docker/daemon.json file. Useful if you want a custom config differing from the default one in the AMI. This is expected to be a json string.
+                      description: |-
+                        DockerConfigJson is used for the contents of the /etc/docker/daemon.json file. Useful if you want a custom config differing from the default one in the AMI.
+                        This is expected to be a json string.
                       type: string
                     kubeletExtraArgs:
                       additionalProperties:
@@ -42,7 +53,7 @@
                       description: PauseContainer allows customization of the pause container to use.
                       properties:
                         accountNumber:
-                          description: AccountNumber is the AWS account number to pull the pause container from.
+                          description: ' AccountNumber is the AWS account number to pull the pause container from.'
                           type: string
                         version:
                           description: Version is the tag of the pause container to use.
@@ -52,7 +63,9 @@
                         - version
                       type: object
                     serviceIPV6Cidr:
-                      description: ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then the ip family will be set to ipv6.
+                      description: |-
+                        ServiceIPV6Cidr is the ipv6 cidr range of the cluster. If this is specified then
+                        the ip family will be set to ipv6.
                       type: string
                     useMaxPods:
                       description: UseMaxPods  sets --max-pods for the kubelet when true.