Skip to content

Commit 23fa4cb

Browse files
PanSpagetkaPanSpagetka
committed
tmp cmt
1 parent 3d26d75 commit 23fa4cb

22 files changed

+806
-205
lines changed

‎Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ WORKDIR /workspace
2828
# Copy the Go Modules manifests
2929
COPY go.mod go.mod
3030
COPY go.sum go.sum
31+
3132
# Cache deps before building and copying source so that we don't need to re-download as much
3233
# and so that source changes don't invalidate our downloaded layer
3334
RUN --mount=type=cache,target=/root/.local/share/golang \

‎PROJECT

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,62 @@ version: "2"
22
domain: cluster.x-k8s.io
33
repo: sigs.k8s.io/cluster-api-provider-aws
44
resources:
5+
# v1beta1 types
56
- group: infrastructure
6-
kind: AWSMachine
77
version: v1beta1
8+
kind: AWSMachine
89
- group: infrastructure
9-
kind: AWSCluster
1010
version: v1beta1
11+
kind: AWSCluster
1112
- group: infrastructure
12-
kind: AWSMachineTemplate
1313
version: v1beta1
14+
kind: AWSMachineTemplate
1415
- group: infrastructure
15-
kind: AWSClusterStaticIdentity
1616
version: v1beta1
17+
kind: AWSClusterStaticIdentity
1718
- group: infrastructure
18-
kind: AWSClusterRoleIdentity
1919
version: v1beta1
20+
kind: AWSClusterRoleIdentity
2021
- group: infrastructure
21-
kind: AWSClusterControllerIdentity
2222
version: v1beta1
23+
kind: AWSClusterControllerIdentity
2324
- group: infrastructure
24-
kind: AWSClusterTemplate
2525
version: v1beta1
26+
kind: AWSClusterTemplate
2627
- group: infrastructure
27-
kind: AWSManagedControlPlanes
2828
version: v1beta1
29+
kind: AWSManagedControlPlanes
2930
- group: infrastructure
30-
kind: AWSManagedCluster
3131
version: v1beta1
32+
kind: AWSManagedCluster
33+
# v1beta2 types
3234
- group: infrastructure
33-
kind: AWSMachine
3435
version: v1beta2
36+
kind: AWSMachine
3537
- group: infrastructure
36-
kind: AWSCluster
3738
version: v1beta2
39+
kind: AWSCluster
3840
- group: infrastructure
39-
kind: AWSMachineTemplate
4041
version: v1beta2
42+
kind: AWSMachineTemplate
4143
- group: infrastructure
42-
kind: AWSClusterStaticIdentity
4344
version: v1beta2
45+
kind: AWSClusterStaticIdentity
4446
- group: infrastructure
45-
kind: AWSClusterRoleIdentity
4647
version: v1beta2
48+
kind: AWSClusterRoleIdentity
4749
- group: infrastructure
48-
kind: AWSClusterControllerIdentity
4950
version: v1beta2
51+
kind: AWSClusterControllerIdentity
5052
- group: infrastructure
51-
kind: AWSClusterTemplate
5253
version: v1beta2
54+
kind: AWSClusterTemplate
5355
- group: infrastructure
54-
kind: AWSManagedControlPlanes
5556
version: v1beta2
57+
kind: AWSManagedControlPlanes
5658
- group: infrastructure
57-
kind: AWSManagedCluster
5859
version: v1beta2
60+
kind: AWSManagedCluster
5961
- group: infrastructure
6062
kind: ROSARoleConfig
6163
version: v1beta2

‎config/crd/bases/infrastructure.cluster.x-k8s.io_rosaroleconfigs.yaml

Lines changed: 41 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ spec:
4141
metadata:
4242
type: object
4343
spec:
44-
<<<<<<< HEAD
4544
description: ROSARoleConfigSpec defines the desired state of ROSARoleConfig
4645
properties:
4746
accountRoleConfig:
@@ -77,31 +76,29 @@ spec:
7776
version:
7877
description: ' Version of OpenShift that will be used to setup
7978
policy tag, for example "4.11"'
80-
=======
81-
properties:
82-
accountRoleConfig:
83-
properties:
84-
path:
85-
type: string
86-
permissionsBoundaryARN:
87-
type: string
88-
prefix:
89-
maxLength: 4
90-
type: string
91-
sharedVPCConfig:
92-
properties:
93-
routeRoleARN:
94-
type: string
95-
vpcEndpointRoleArn:
96-
type: string
97-
type: object
98-
version:
99-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
10079
type: string
10180
required:
10281
- prefix
10382
- version
10483
type: object
84+
credentialsSecretRef:
85+
description: |-
86+
CredentialsSecretRef references a secret with necessary credentials to connect to the OCM API.
87+
The secret should contain the following data keys:
88+
- ocmToken: eyJhbGciOiJIUzI1NiIsI....
89+
- ocmApiUrl: Optional, defaults to 'https://api.openshift.com'
90+
properties:
91+
name:
92+
default: ""
93+
description: |-
94+
Name of the referent.
95+
This field is effectively required, but due to backwards compatibility is
96+
allowed to be empty. Instances of this type with an empty value here are
97+
almost certainly wrong.
98+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
99+
type: string
100+
type: object
101+
x-kubernetes-map-type: atomic
105102
identityRef:
106103
description: AWSIdentityReference specifies a identity.
107104
properties:
@@ -121,7 +118,6 @@ spec:
121118
- name
122119
type: object
123120
oidcConfig:
124-
<<<<<<< HEAD
125121
description: |-
126122
OIDCConfig creates OIDC config in a S3 bucket for the client AWS account and populates it to be compliant with OIDC protocol.
127123
It also creates a Secret in Secrets Manager containing the private key.
@@ -132,10 +128,6 @@ spec:
132128
Can only be set if "enableExternalAuthProviders" is set to "True".
133129
134130
At most one provider can be configured.
135-
=======
136-
properties:
137-
externalAuthProviders:
138-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
139131
items:
140132
description: ExternalAuthProvider is an external OIDC identity
141133
provider that can issue tokens for this cluster
@@ -369,34 +361,47 @@ spec:
369361
- issuer
370362
- name
371363
type: object
372-
<<<<<<< HEAD
373364
maxItems: 1
374365
type: array
375366
x-kubernetes-list-map-keys:
376367
- name
377368
x-kubernetes-list-type: map
369+
identityRef:
370+
description: AWSIdentityReference specifies a identity.
371+
properties:
372+
kind:
373+
description: Kind of the identity.
374+
enum:
375+
- AWSClusterControllerIdentity
376+
- AWSClusterRoleIdentity
377+
- AWSClusterStaticIdentity
378+
type: string
379+
name:
380+
description: Name of the identity.
381+
minLength: 1
382+
type: string
383+
required:
384+
- kind
385+
- name
386+
type: object
378387
managedOIDC:
379388
default: true
380389
description: ManagedOIDC indicates whether it is a Red Hat managed
381390
or unmanaged (Customer hosted) OIDC Configuration. Default is
382391
true.
383-
=======
384-
type: array
385-
managedOIDC:
386-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
387392
type: boolean
393+
prefix:
394+
type: string
395+
region:
396+
type: string
388397
required:
389398
- managedOIDC
399+
- prefix
390400
type: object
391401
operatorRoleConfig:
392-
<<<<<<< HEAD
393402
description: OperatorRoleConfig defines cluster-specific operator
394403
IAM roles based on your cluster configuration.
395404
properties:
396-
oidcConfigId:
397-
description: Registered OIDC configuration ID to add its issuer
398-
URL as the trusted relationship to the operator roles.''
399-
type: string
400405
permissionsBoundaryARN:
401406
description: The ARN of the policy that is used to set the permissions
402407
boundary for the operator roles.
@@ -418,25 +423,9 @@ spec:
418423
description: ' Role ARN associated with the shared VPC used
419424
for Hosted Control Plane clusters, this role contains policies
420425
to be used with the VPC endpoint'
421-
=======
422-
properties:
423-
oidcConfigId:
424-
type: string
425-
permissionsBoundaryARN:
426-
type: string
427-
prefix:
428-
maxLength: 4
429-
type: string
430-
sharedVPCConfig:
431-
properties:
432-
routeRoleARN:
433-
type: string
434-
vpcEndpointRoleArn:
435-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
436426
type: string
437427
type: object
438428
required:
439-
- oidcConfigId
440429
- prefix
441430
type: object
442431
region:
@@ -450,7 +439,6 @@ spec:
450439
description: ROSARoleConfigStatus defines the observed state of ROSARoleConfig
451440
properties:
452441
accountRolesRef:
453-
<<<<<<< HEAD
454442
description: Created Account roles that can be used to
455443
properties:
456444
installerRoleARN:
@@ -466,18 +454,6 @@ spec:
466454
description: WorkerRoleARN is an AWS IAM role that will be attached
467455
to worker instances.
468456
type: string
469-
required:
470-
- installerRoleARN
471-
- supportRoleARN
472-
=======
473-
properties:
474-
installerRoleARN:
475-
type: string
476-
supportRoleARN:
477-
type: string
478-
workerRoleARN:
479-
type: string
480-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
481457
type: object
482458
conditions:
483459
description: Conditions provide observations of the operational state
@@ -526,7 +502,6 @@ spec:
526502
type: object
527503
type: array
528504
oidcID:
529-
<<<<<<< HEAD
530505
description: ID of created OIDC config
531506
type: string
532507
oidcProviderARN:
@@ -570,23 +545,10 @@ spec:
570545
\"*\"\n\t\t},\n\t\t{\n\t\t\t\"Effect\": \"Allow\",\n\t\t\t\"Action\":
571546
[\n\t\t\t\t\"route53:ChangeResourceRecordSets\"\n\t\t\t],\n\t\t\t\"Resource\":
572547
[\n\t\t\t\t\"arn:aws:route53:::PUBLIC_ZONE_ID\",\n\t\t\t\t\"arn:aws:route53:::PRIVATE_ZONE_ID\"\n\t\t\t]\n\t\t}\n\t]\n}"
573-
=======
574-
type: string
575-
oidcProviderARN:
576-
type: string
577-
operatorRolesRef:
578-
properties:
579-
controlPlaneOperatorARN:
580-
type: string
581-
imageRegistryARN:
582-
type: string
583-
ingressARN:
584-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
585548
type: string
586549
kmsProviderARN:
587550
type: string
588551
kubeCloudControllerARN:
589-
<<<<<<< HEAD
590552
description: |-
591553
KubeCloudControllerARN is an ARN value referencing a role appropriate for the KCM/KCC.
592554
Source: https://cloud-provider-aws.sigs.k8s.io/prerequisites/#iam-policies
@@ -737,18 +699,6 @@ spec:
737699
- nodePoolManagementARN
738700
- storageARN
739701
type: object
740-
required:
741-
- operatorRolesRef
742-
=======
743-
type: string
744-
networkARN:
745-
type: string
746-
nodePoolManagementARN:
747-
type: string
748-
storageARN:
749-
type: string
750-
type: object
751-
>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
752702
type: object
753703
type: object
754704
served: true

‎config/crd/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ patchesStrategicMerge:
3939
- patches/webhook_in_awsmanagedcontrolplanes.yaml
4040
- patches/webhook_in_eksconfigs.yaml
4141
- patches/webhook_in_eksconfigtemplates.yaml
42-
#- patches/webhook_in_rosaroleconfigs.yaml
42+
- patches/webhook_in_rosaroleconfigs.yaml
4343
# +kubebuilder:scaffold:crdkustomizewebhookpatch
4444

4545
# [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
@@ -54,7 +54,7 @@ patchesStrategicMerge:
5454
- patches/cainjection_in_awsmanagedclusters.yaml
5555
- patches/cainjection_in_eksconfigs.yaml
5656
- patches/cainjection_in_eksconfigtemplates.yaml
57-
#- patches/cainjection_in_rosaroleconfigs.yaml
57+
- patches/cainjection_in_rosaroleconfigs.yaml
5858
# +kubebuilder:scaffold:crdkustomizecainjectionpatch
5959

6060
# [LABEL] To enable label, uncomment all the sections with [LABEL] prefix.

‎config/rbac/role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,5 +211,6 @@ rules:
211211
- infrastructure.cluster.x-k8s.io
212212
resources:
213213
- rosamachinepools/finalizers
214+
- rosaroleconfigs/finalizers
214215
verbs:
215216
- update

0 commit comments

Comments
 (0)