Skip to content

Use stolostron/cluster-api-provider-aws for CAPA (changes for the main branch) #355

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

Merged
merged 1 commit into from
Oct 28, 2025
Merged

Use stolostron/cluster-api-provider-aws for CAPA (changes for the main branch) #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions charts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
OCP_VERSION ?= 4.19
MCE_VERSION ?= 2.10.0-1
SYNC2CHARTS ?= true

DEFAULT_ORGREPO ?= https://github.com/openshift
STOLOSTRON_ORGREPO ?= https://github.com/stolostron
CAPI_BRANCH ?= master
CAPA_BRANCH ?= main
# needs overridable branch, as the non-master branch will differ
Expand Down Expand Up @@ -44,15 +46,15 @@ build-cluster-api-chart:
build-cluster-api-provider-aws-chart:
@echo "Building cluster-api-provider-aws chart"
WKDIR="$(WKDIR)" \
ORGREPO="$(DEFAULT_ORGREPO)" \
ORGREPO="$(STOLOSTRON_ORGREPO)" \
PROJECT="cluster-api-provider-aws" \
BRANCH="$(CAPA_BRANCH)" \
../scripts/build.sh
BUILTDIR="$(WKDIR)/cluster-api-provider-aws/config/tmp" \
CHART_VERSION="$(OCP_VERSION)" \
CHART_APP_VERSION="$(OCP_VERSION)" \
CHART_VALUES_IMAGE_TAG="$(OCP_VERSION)" \
CHART_VALUES_IMAGE_TAG_PREFIX="v" \
CHART_VERSION="$(MCE_VERSION)" \
CHART_APP_VERSION="$(MCE_VERSION)" \
CHART_VALUES_IMAGE_TAG="$(MCE_VERSION)" \
CHART_VALUES_IMAGE_TAG_PREFIX="" \
SYNC2CHARTS="$(SYNC2CHARTS)" \
PROJECT="cluster-api-provider-aws" \
../scripts/sync2chart.sh
Expand Down
4 changes: 2 additions & 2 deletions charts/cluster-api-provider-aws/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: cluster-api-provider-aws
description: Cluster API provider for AWS
type: application
version: "4.19"
appVersion: "4.19"
version: "2.10.0-1"
appVersion: "2.10.0-1"
2 changes: 1 addition & 1 deletion ...tomresourcedefinition_awsclustercontrolleridentities.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
controller-gen.kubebuilder.io/version: v0.19.0
service.beta.openshift.io/inject-cabundle: "true"
labels:
cluster.x-k8s.io/provider: infrastructure-aws
Expand Down
2 changes: 1 addition & 1 deletion ...v1_customresourcedefinition_awsclusterroleidentities.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
controller-gen.kubebuilder.io/version: v0.19.0
service.beta.openshift.io/inject-cabundle: "true"
labels:
cluster.x-k8s.io/provider: infrastructure-aws
Expand Down
200 changes: 183 additions & 17 deletions ...sions.k8s.io_v1_customresourcedefinition_awsclusters.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ..._customresourcedefinition_awsclusterstaticidentities.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
controller-gen.kubebuilder.io/version: v0.19.0
labels:
cluster.x-k8s.io/provider: infrastructure-aws
cluster.x-k8s.io/v1alpha3: v1alpha3
Expand Down
98 changes: 91 additions & 7 deletions ...s.io_v1_customresourcedefinition_awsclustertemplates.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
controller-gen.kubebuilder.io/version: v0.19.0
service.beta.openshift.io/inject-cabundle: "true"
labels:
cluster.x-k8s.io/provider: infrastructure-aws
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
additionalProperties:
type: string
description: |-
Map of string keys and values that can be used to organize and categorize
labels is a map of string keys and values that can be used to organize and categorize
(scope and select) objects. May match selectors of replication controllers
and services.
More info: http://kubernetes.io/docs/user-guide/labels
Expand Down Expand Up @@ -142,10 +142,13 @@ spec:
used to communicate with the control plane.
properties:
host:
description: The hostname on which the API server is serving.
description: host is the hostname on which the API server
is serving.
maxLength: 512
type: string
port:
description: The port on which the API server is serving.
description: port is the port on which the API server
is serving.
format: int32
type: integer
required:
Expand Down Expand Up @@ -513,7 +516,7 @@ spec:
additionalProperties:
type: string
description: |-
Map of string keys and values that can be used to organize and categorize
labels is a map of string keys and values that can be used to organize and categorize
(scope and select) objects. May match selectors of replication controllers
and services.
More info: http://kubernetes.io/docs/user-guide/labels
Expand Down Expand Up @@ -568,10 +571,13 @@ spec:
used to communicate with the control plane.
properties:
host:
description: The hostname on which the API server is serving.
description: host is the hostname on which the API server
is serving.
maxLength: 512
type: string
port:
description: The port on which the API server is serving.
description: port is the port on which the API server
is serving.
format: int32
type: integer
required:
Expand Down Expand Up @@ -992,6 +998,84 @@ spec:
- toPort
type: object
type: array
additionalNodeIngressRules:
description: AdditionalNodeIngressRules is an optional
set of ingress rules to add to every node
items:
description: IngressRule defines an AWS ingress rule
for security groups.
properties:
cidrBlocks:
description: List of CIDR blocks to allow access
from. Cannot be specified with SourceSecurityGroupID.
items:
type: string
type: array
description:
description: Description provides extended information
about the ingress rule.
type: string
fromPort:
description: FromPort is the start of port range.
format: int64
type: integer
ipv6CidrBlocks:
description: List of IPv6 CIDR blocks to allow access
from. Cannot be specified with SourceSecurityGroupID.
items:
type: string
type: array
natGatewaysIPsSource:
description: NatGatewaysIPsSource use the NAT gateways
IPs as the source for the ingress rule.
type: boolean
protocol:
description: Protocol is the protocol for the ingress
rule. Accepted values are "-1" (all), "4" (IP
in IP),"tcp", "udp", "icmp", and "58" (ICMPv6),
"50" (ESP).
enum:
- "-1"
- "4"
- tcp
- udp
- icmp
- "58"
- "50"
type: string
sourceSecurityGroupIds:
description: The security group id to allow access
from. Cannot be specified with CidrBlocks.
items:
type: string
type: array
sourceSecurityGroupRoles:
description: |-
The security group role to allow access from. Cannot be specified with CidrBlocks.
The field will be combined with source security group IDs if specified.
items:
description: SecurityGroupRole defines the unique
role of a security group.
enum:
- bastion
- node
- controlplane
- apiserver-lb
- lb
- node-eks-additional
type: string
type: array
toPort:
description: ToPort is the end of port range.
format: int64
type: integer
required:
- description
- fromPort
- protocol
- toPort
type: object
type: array
cni:
description: CNI configuration
properties:
Expand Down
52 changes: 45 additions & 7 deletions ...8s.io_v1_customresourcedefinition_awsfargateprofiles.infrastructure.cluster.x-k8s.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.5
controller-gen.kubebuilder.io/version: v0.19.0
labels:
cluster.x-k8s.io/provider: infrastructure-aws
cluster.x-k8s.io/v1alpha3: v1alpha3
Expand Down Expand Up @@ -121,27 +121,32 @@ spec:
properties:
lastTransitionTime:
description: |-
Last time the condition transitioned from one status to another.
lastTransitionTime is the 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.
message is a human readable message indicating details about the transition.
This field may be empty.
maxLength: 10240
minLength: 1
type: string
reason:
description: |-
The reason for the condition's last transition in CamelCase.
reason is 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 be empty.
maxLength: 256
minLength: 1
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.
maxLength: 32
type: string
status:
description: status of the condition, one of True, False, Unknown.
Expand All @@ -151,6 +156,8 @@ spec:
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.
maxLength: 256
minLength: 1
type: string
required:
- lastTransitionTime
Expand Down Expand Up @@ -268,6 +275,30 @@ spec:
and not delete it on deletion. If the EKSEnableIAM feature
flag is true and no name is supplied then a role is created.
type: string
rolePath:
description: |-
RolePath sets the path to the role. For more information about paths, see IAM Identifiers
(https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html)
in the IAM User Guide.

This parameter is optional. If it is not included, it defaults to a slash
(/).
type: string
rolePermissionsBoundary:
description: |-
RolePermissionsBoundary sets the ARN of the managed policy that is used
to set the permissions boundary for the role.

A permissions boundary policy defines the maximum permissions that identity-based
policies can grant to an entity, but does not grant permissions. Permissions
boundaries do not define the maximum permissions that a resource-based policy
can grant to an entity. To learn more, see Permissions boundaries for IAM
entities (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html)
in the IAM User Guide.

For more information about policy types, see Policy types (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#access_policy-types)
in the IAM User Guide.
type: string
selectors:
description: Selectors specify fargate pod selectors.
items:
Expand Down Expand Up @@ -307,27 +338,32 @@ spec:
properties:
lastTransitionTime:
description: |-
Last time the condition transitioned from one status to another.
lastTransitionTime is the 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.
message is a human readable message indicating details about the transition.
This field may be empty.
maxLength: 10240
minLength: 1
type: string
reason:
description: |-
The reason for the condition's last transition in CamelCase.
reason is 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 be empty.
maxLength: 256
minLength: 1
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.
maxLength: 32
type: string
status:
description: status of the condition, one of True, False, Unknown.
Expand All @@ -337,6 +373,8 @@ spec:
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.
maxLength: 256
minLength: 1
type: string
required:
- lastTransitionTime
Expand Down
Loading