Add RosaRoleConfig API and CRD.

Author: PanSpagetka

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

@@ -41,6 +41,7 @@ spec:
           metadata:
             type: object
           spec:
+<<<<<<< HEAD
             description: ROSARoleConfigSpec defines the desired state of ROSARoleConfig
             properties:
               accountRoleConfig:
@@ -76,6 +77,26 @@ spec:
                   version:
                     description: ' Version of OpenShift that will be used to setup
                       policy tag, for example "4.11"'
+=======
+            properties:
+              accountRoleConfig:
+                properties:
+                  path:
+                    type: string
+                  permissionsBoundaryARN:
+                    type: string
+                  prefix:
+                    maxLength: 4
+                    type: string
+                  sharedVPCConfig:
+                    properties:
+                      routeRoleARN:
+                        type: string
+                      vpcEndpointRoleArn:
+                        type: string
+                    type: object
+                  version:
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
                     type: string
                 required:
                 - prefix
@@ -100,6 +121,7 @@ spec:
                 - name
                 type: object
               oidcConfig:
+<<<<<<< HEAD
                 description: |-
                   OIDCConfig creates OIDC config in a S3 bucket for the client AWS account and populates it to be compliant with OIDC protocol.
                   It also creates a Secret in Secrets Manager containing the private key.
@@ -110,6 +132,10 @@ spec:
                       Can only be set if "enableExternalAuthProviders" is set to "True".
 
                       At most one provider can be configured.
+=======
+                properties:
+                  externalAuthProviders:
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
                     items:
                       description: ExternalAuthProvider is an external OIDC identity
                         provider that can issue tokens for this cluster
@@ -343,6 +369,7 @@ spec:
                       - issuer
                       - name
                       type: object
+<<<<<<< HEAD
                     maxItems: 1
                     type: array
                     x-kubernetes-list-map-keys:
@@ -353,11 +380,16 @@ spec:
                     description: ManagedOIDC indicates whether it is a Red Hat managed
                       or unmanaged (Customer hosted) OIDC Configuration. Default is
                       true.
+=======
+                    type: array
+                  managedOIDC:
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
                     type: boolean
                 required:
                 - managedOIDC
                 type: object
               operatorRoleConfig:
+<<<<<<< HEAD
                 description: OperatorRoleConfig defines cluster-specific operator
                   IAM roles based on your cluster configuration.
                 properties:
@@ -386,6 +418,21 @@ spec:
                         description: ' Role ARN associated with the shared VPC used
                           for Hosted Control Plane clusters, this role contains policies
                           to be used with the VPC endpoint'
+=======
+                properties:
+                  oidcConfigId:
+                    type: string
+                  permissionsBoundaryARN:
+                    type: string
+                  prefix:
+                    maxLength: 4
+                    type: string
+                  sharedVPCConfig:
+                    properties:
+                      routeRoleARN:
+                        type: string
+                      vpcEndpointRoleArn:
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
                         type: string
                     type: object
                 required:
@@ -403,6 +450,7 @@ spec:
             description: ROSARoleConfigStatus defines the observed state of ROSARoleConfig
             properties:
               accountRolesRef:
+<<<<<<< HEAD
                 description: Created Account roles that can be used to
                 properties:
                   installerRoleARN:
@@ -421,6 +469,15 @@ spec:
                 required:
                 - installerRoleARN
                 - supportRoleARN
+=======
+                properties:
+                  installerRoleARN:
+                    type: string
+                  supportRoleARN:
+                    type: string
+                  workerRoleARN:
+                    type: string
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
                 type: object
               conditions:
                 description: Conditions provide observations of the operational state
@@ -476,6 +533,7 @@ spec:
                   type: object
                 type: array
               oidcID:
+<<<<<<< HEAD
                 description: ID of created OIDC config
                 type: string
               oidcProviderARN:
@@ -519,10 +577,23 @@ spec:
                       \"*\"\n\t\t},\n\t\t{\n\t\t\t\"Effect\": \"Allow\",\n\t\t\t\"Action\":
                       [\n\t\t\t\t\"route53:ChangeResourceRecordSets\"\n\t\t\t],\n\t\t\t\"Resource\":
                       [\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}"
+=======
+                type: string
+              oidcProviderARN:
+                type: string
+              operatorRolesRef:
+                properties:
+                  controlPlaneOperatorARN:
+                    type: string
+                  imageRegistryARN:
+                    type: string
+                  ingressARN:
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
                     type: string
                   kmsProviderARN:
                     type: string
                   kubeCloudControllerARN:
+<<<<<<< HEAD
                     description: |-
                       KubeCloudControllerARN is an ARN value referencing a role appropriate for the KCM/KCC.
                       Source: https://cloud-provider-aws.sigs.k8s.io/prerequisites/#iam-policies
@@ -675,6 +746,16 @@ spec:
                 type: object
             required:
             - operatorRolesRef
+=======
+                    type: string
+                  networkARN:
+                    type: string
+                  nodePoolManagementARN:
+                    type: string
+                  storageARN:
+                    type: string
+                type: object
+>>>>>>> 7c770d9ae (Add RosaRoleConfig API and CRD.)
             type: object
         type: object
     served: true

controllers/suite_test.go

@@ -25,9 +25,9 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	// +kubebuilder:scaffold:imports
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/test/helpers"
+	// +kubebuilder:scaffold:imports
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	kubeadmv1beta1 "sigs.k8s.io/cluster-api/controlplane/kubeadm/api/v1beta1"
 )

exp/api/v1beta2/zz_generated.deepcopy.go

@@ -43,7 +43,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	// +kubebuilder:scaffold:imports
 	infrav1beta1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1"
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	eksbootstrapv1beta1 "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta1"
@@ -66,6 +65,7 @@ import (
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/logger"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/record"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/version"
+	// +kubebuilder:scaffold:imports
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/flags"