Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to CAPA v2.5.2 #260

Merged
merged 3 commits into from
Sep 16, 2024
Merged

Upgrade to CAPA v2.5.2 #260

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
149e2f3
Upgrade to CAPA v2.5.2
fiunchinho Aug 28, 2024
6eb75af
Merge branch 'master' into upgrade-2-5
fiunchinho Sep 3, 2024
1380676
Use right fork tag
fiunchinho Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion helm/cluster-api-provider-aws/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: "Helm chart for cluster-api-provider-aws."
home: "https://github.com/giantswarm/cluster-api-provider-aws-app"
icon: https://s.giantswarm.io/app-icons/aws/2/dark.svg
version: "2.21.0"
appVersion: "2.3.0"
appVersion: "2.5.2"
annotations:
application.giantswarm.io/team: "phoenix"
config.giantswarm.io/version: 1.x.x
2 changes: 1 addition & 1 deletion ...cluster-api-provider-aws/files/bootstrap/bases/eksconfigs.bootstrap.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
2 changes: 1 addition & 1 deletion ...api-provider-aws/files/bootstrap/bases/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}'
Expand Down
49 changes: 38 additions & 11 deletions ...r-aws/files/bootstrap/patches/versions/v1beta1/eksconfigs.bootstrap.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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
Expand Down
25 changes: 19 additions & 6 deletions ...les/bootstrap/patches/versions/v1beta1/eksconfigtemplates.bootstrap.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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.
Expand All @@ -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.
Expand Down
Loading
Loading