Skip to content

Commit d4a61d5

Browse files
mzazrivecmzazrivec
authored
Use stolostron/cluster-api-provider-aws for CAPA (changes for the main branch) (#355)
1 parent 0010be6 commit d4a61d5

File tree

47 files changed

+7609
-4926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+7609
-4926
lines changed

‎charts/Makefile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
OCP_VERSION ?= 4.19
2+
MCE_VERSION ?= 2.10.0-1
23
SYNC2CHARTS ?= true
34

45
DEFAULT_ORGREPO ?= https://github.com/openshift
6+
STOLOSTRON_ORGREPO ?= https://github.com/stolostron
57
CAPI_BRANCH ?= master
68
CAPA_BRANCH ?= main
79
# needs overridable branch, as the non-master branch will differ
@@ -44,15 +46,15 @@ build-cluster-api-chart:
4446
build-cluster-api-provider-aws-chart:
4547
@echo "Building cluster-api-provider-aws chart"
4648
WKDIR="$(WKDIR)" \
47-
ORGREPO="$(DEFAULT_ORGREPO)" \
49+
ORGREPO="$(STOLOSTRON_ORGREPO)" \
4850
PROJECT="cluster-api-provider-aws" \
4951
BRANCH="$(CAPA_BRANCH)" \
5052
../scripts/build.sh
5153
BUILTDIR="$(WKDIR)/cluster-api-provider-aws/config/tmp" \
52-
CHART_VERSION="$(OCP_VERSION)" \
53-
CHART_APP_VERSION="$(OCP_VERSION)" \
54-
CHART_VALUES_IMAGE_TAG="$(OCP_VERSION)" \
55-
CHART_VALUES_IMAGE_TAG_PREFIX="v" \
54+
CHART_VERSION="$(MCE_VERSION)" \
55+
CHART_APP_VERSION="$(MCE_VERSION)" \
56+
CHART_VALUES_IMAGE_TAG="$(MCE_VERSION)" \
57+
CHART_VALUES_IMAGE_TAG_PREFIX="" \
5658
SYNC2CHARTS="$(SYNC2CHARTS)" \
5759
PROJECT="cluster-api-provider-aws" \
5860
../scripts/sync2chart.sh

‎charts/cluster-api-provider-aws/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: cluster-api-provider-aws
33
description: Cluster API provider for AWS
44
type: application
5-
version: "4.19"
6-
appVersion: "4.19"
5+
version: "2.10.0-1"
6+
appVersion: "2.10.0-1"

‎charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_awsclustercontrolleridentities.infrastructure.cluster.x-k8s.io.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
service.beta.openshift.io/inject-cabundle: "true"
77
labels:
88
cluster.x-k8s.io/provider: infrastructure-aws

‎charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_awsclusterroleidentities.infrastructure.cluster.x-k8s.io.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
service.beta.openshift.io/inject-cabundle: "true"
77
labels:
88
cluster.x-k8s.io/provider: infrastructure-aws

‎charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_awsclusters.infrastructure.cluster.x-k8s.io.yaml‎

Lines changed: 183 additions & 17 deletions
Large diffs are not rendered by default.

‎charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_awsclusterstaticidentities.infrastructure.cluster.x-k8s.io.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
labels:
77
cluster.x-k8s.io/provider: infrastructure-aws
88
cluster.x-k8s.io/v1alpha3: v1alpha3

‎charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_awsclustertemplates.infrastructure.cluster.x-k8s.io.yaml‎

Lines changed: 91 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
service.beta.openshift.io/inject-cabundle: "true"
77
labels:
88
cluster.x-k8s.io/provider: infrastructure-aws
@@ -87,7 +87,7 @@ spec:
8787
additionalProperties:
8888
type: string
8989
description: |-
90-
Map of string keys and values that can be used to organize and categorize
90+
labels is a map of string keys and values that can be used to organize and categorize
9191
(scope and select) objects. May match selectors of replication controllers
9292
and services.
9393
More info: http://kubernetes.io/docs/user-guide/labels
@@ -142,10 +142,13 @@ spec:
142142
used to communicate with the control plane.
143143
properties:
144144
host:
145-
description: The hostname on which the API server is serving.
145+
description: host is the hostname on which the API server
146+
is serving.
147+
maxLength: 512
146148
type: string
147149
port:
148-
description: The port on which the API server is serving.
150+
description: port is the port on which the API server
151+
is serving.
149152
format: int32
150153
type: integer
151154
required:
@@ -513,7 +516,7 @@ spec:
513516
additionalProperties:
514517
type: string
515518
description: |-
516-
Map of string keys and values that can be used to organize and categorize
519+
labels is a map of string keys and values that can be used to organize and categorize
517520
(scope and select) objects. May match selectors of replication controllers
518521
and services.
519522
More info: http://kubernetes.io/docs/user-guide/labels
@@ -568,10 +571,13 @@ spec:
568571
used to communicate with the control plane.
569572
properties:
570573
host:
571-
description: The hostname on which the API server is serving.
574+
description: host is the hostname on which the API server
575+
is serving.
576+
maxLength: 512
572577
type: string
573578
port:
574-
description: The port on which the API server is serving.
579+
description: port is the port on which the API server
580+
is serving.
575581
format: int32
576582
type: integer
577583
required:
@@ -992,6 +998,84 @@ spec:
992998
- toPort
993999
type: object
9941000
type: array
1001+
additionalNodeIngressRules:
1002+
description: AdditionalNodeIngressRules is an optional
1003+
set of ingress rules to add to every node
1004+
items:
1005+
description: IngressRule defines an AWS ingress rule
1006+
for security groups.
1007+
properties:
1008+
cidrBlocks:
1009+
description: List of CIDR blocks to allow access
1010+
from. Cannot be specified with SourceSecurityGroupID.
1011+
items:
1012+
type: string
1013+
type: array
1014+
description:
1015+
description: Description provides extended information
1016+
about the ingress rule.
1017+
type: string
1018+
fromPort:
1019+
description: FromPort is the start of port range.
1020+
format: int64
1021+
type: integer
1022+
ipv6CidrBlocks:
1023+
description: List of IPv6 CIDR blocks to allow access
1024+
from. Cannot be specified with SourceSecurityGroupID.
1025+
items:
1026+
type: string
1027+
type: array
1028+
natGatewaysIPsSource:
1029+
description: NatGatewaysIPsSource use the NAT gateways
1030+
IPs as the source for the ingress rule.
1031+
type: boolean
1032+
protocol:
1033+
description: Protocol is the protocol for the ingress
1034+
rule. Accepted values are "-1" (all), "4" (IP
1035+
in IP),"tcp", "udp", "icmp", and "58" (ICMPv6),
1036+
"50" (ESP).
1037+
enum:
1038+
- "-1"
1039+
- "4"
1040+
- tcp
1041+
- udp
1042+
- icmp
1043+
- "58"
1044+
- "50"
1045+
type: string
1046+
sourceSecurityGroupIds:
1047+
description: The security group id to allow access
1048+
from. Cannot be specified with CidrBlocks.
1049+
items:
1050+
type: string
1051+
type: array
1052+
sourceSecurityGroupRoles:
1053+
description: |-
1054+
The security group role to allow access from. Cannot be specified with CidrBlocks.
1055+
The field will be combined with source security group IDs if specified.
1056+
items:
1057+
description: SecurityGroupRole defines the unique
1058+
role of a security group.
1059+
enum:
1060+
- bastion
1061+
- node
1062+
- controlplane
1063+
- apiserver-lb
1064+
- lb
1065+
- node-eks-additional
1066+
type: string
1067+
type: array
1068+
toPort:
1069+
description: ToPort is the end of port range.
1070+
format: int64
1071+
type: integer
1072+
required:
1073+
- description
1074+
- fromPort
1075+
- protocol
1076+
- toPort
1077+
type: object
1078+
type: array
9951079
cni:
9961080
description: CNI configuration
9971081
properties:

‎charts/cluster-api-provider-aws/crds/apiextensions.k8s.io_v1_customresourcedefinition_awsfargateprofiles.infrastructure.cluster.x-k8s.io.yaml‎

Lines changed: 45 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
labels:
77
cluster.x-k8s.io/provider: infrastructure-aws
88
cluster.x-k8s.io/v1alpha3: v1alpha3
@@ -121,27 +121,32 @@ spec:
121121
properties:
122122
lastTransitionTime:
123123
description: |-
124-
Last time the condition transitioned from one status to another.
124+
lastTransitionTime is the last time the condition transitioned from one status to another.
125125
This should be when the underlying condition changed. If that is not known, then using the time when
126126
the API field changed is acceptable.
127127
format: date-time
128128
type: string
129129
message:
130130
description: |-
131-
A human readable message indicating details about the transition.
131+
message is a human readable message indicating details about the transition.
132132
This field may be empty.
133+
maxLength: 10240
134+
minLength: 1
133135
type: string
134136
reason:
135137
description: |-
136-
The reason for the condition's last transition in CamelCase.
138+
reason is the reason for the condition's last transition in CamelCase.
137139
The specific API may choose whether or not this field is considered a guaranteed API.
138140
This field may be empty.
141+
maxLength: 256
142+
minLength: 1
139143
type: string
140144
severity:
141145
description: |-
142146
severity provides an explicit classification of Reason code, so the users or machines can immediately
143147
understand the current situation and act accordingly.
144148
The Severity field MUST be set only when Status=False.
149+
maxLength: 32
145150
type: string
146151
status:
147152
description: status of the condition, one of True, False, Unknown.
@@ -151,6 +156,8 @@ spec:
151156
type of condition in CamelCase or in foo.example.com/CamelCase.
152157
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
153158
can be useful (see .node.status.conditions), the ability to deconflict is important.
159+
maxLength: 256
160+
minLength: 1
154161
type: string
155162
required:
156163
- lastTransitionTime
@@ -268,6 +275,30 @@ spec:
268275
and not delete it on deletion. If the EKSEnableIAM feature
269276
flag is true and no name is supplied then a role is created.
270277
type: string
278+
rolePath:
279+
description: |-
280+
RolePath sets the path to the role. For more information about paths, see IAM Identifiers
281+
(https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html)
282+
in the IAM User Guide.
283+
284+
This parameter is optional. If it is not included, it defaults to a slash
285+
(/).
286+
type: string
287+
rolePermissionsBoundary:
288+
description: |-
289+
RolePermissionsBoundary sets the ARN of the managed policy that is used
290+
to set the permissions boundary for the role.
291+
292+
A permissions boundary policy defines the maximum permissions that identity-based
293+
policies can grant to an entity, but does not grant permissions. Permissions
294+
boundaries do not define the maximum permissions that a resource-based policy
295+
can grant to an entity. To learn more, see Permissions boundaries for IAM
296+
entities (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_boundaries.html)
297+
in the IAM User Guide.
298+
299+
For more information about policy types, see Policy types (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies.html#access_policy-types)
300+
in the IAM User Guide.
301+
type: string
271302
selectors:
272303
description: Selectors specify fargate pod selectors.
273304
items:
@@ -307,27 +338,32 @@ spec:
307338
properties:
308339
lastTransitionTime:
309340
description: |-
310-
Last time the condition transitioned from one status to another.
341+
lastTransitionTime is the last time the condition transitioned from one status to another.
311342
This should be when the underlying condition changed. If that is not known, then using the time when
312343
the API field changed is acceptable.
313344
format: date-time
314345
type: string
315346
message:
316347
description: |-
317-
A human readable message indicating details about the transition.
348+
message is a human readable message indicating details about the transition.
318349
This field may be empty.
350+
maxLength: 10240
351+
minLength: 1
319352
type: string
320353
reason:
321354
description: |-
322-
The reason for the condition's last transition in CamelCase.
355+
reason is the reason for the condition's last transition in CamelCase.
323356
The specific API may choose whether or not this field is considered a guaranteed API.
324357
This field may be empty.
358+
maxLength: 256
359+
minLength: 1
325360
type: string
326361
severity:
327362
description: |-
328363
severity provides an explicit classification of Reason code, so the users or machines can immediately
329364
understand the current situation and act accordingly.
330365
The Severity field MUST be set only when Status=False.
366+
maxLength: 32
331367
type: string
332368
status:
333369
description: status of the condition, one of True, False, Unknown.
@@ -337,6 +373,8 @@ spec:
337373
type of condition in CamelCase or in foo.example.com/CamelCase.
338374
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
339375
can be useful (see .node.status.conditions), the ability to deconflict is important.
376+
maxLength: 256
377+
minLength: 1
340378
type: string
341379
required:
342380
- lastTransitionTime

0 commit comments

Comments
 (0)