ARO - reorganize packages, updates based on proposal

Author: marek-veber

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

@@ -73,10 +73,91 @@ spec:
                 - host
                 - port
                 type: object
+              resources:
+                description: Resources are embedded ARO resources to be managed by
+                  this resource.
+                items:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                type: array
+              secrets:
+                description: 'Secrets: configures where to place Azure generated secrets.'
+                properties:
+                  adminCredentials:
+                    description: |-
+                      AdminCredentials: indicates where the AdminCredentials secret should be placed. If omitted, the secret will not be
+                      retrieved from Azure.
+                    properties:
+                      key:
+                        description: Key is the key in the Kubernetes secret being
+                          referenced.
+                        type: string
+                      name:
+                        description: |-
+                          Name is the name of the Kubernetes secret to write to.
+                          The secret will be created in the same namespace as the resource.
+                        type: string
+                    required:
+                    - key
+                    - name
+                    type: object
+                  userCredentials:
+                    description: |-
+                      UserCredentials: indicates where the UserCredentials secret should be placed. If omitted, the secret will not be
+                      retrieved from Azure.
+                    properties:
+                      key:
+                        description: Key is the key in the Kubernetes secret being
+                          referenced.
+                        type: string
+                      name:
+                        description: |-
+                          Name is the name of the Kubernetes secret to write to.
+                          The secret will be created in the same namespace as the resource.
+                        type: string
+                    required:
+                    - key
+                    - name
+                    type: object
+                type: object
             type: object
           status:
             description: AROClusterStatus defines the observed state of AROCluster.
             properties:
+              aadProfile:
+                description: 'AadProfile: The Azure Active Directory configuration.'
+                properties:
+                  adminGroupObjectIDs:
+                    description: 'AdminGroupObjectIDs: The list of AAD group object
+                      IDs that will have admin role of the cluster.'
+                    items:
+                      type: string
+                    type: array
+                  clientAppID:
+                    description: 'ClientAppID: (DEPRECATED) The client AAD application
+                      ID. Learn more at https://aka.ms/aks/aad-legacy.'
+                    type: string
+                  enableAzureRBAC:
+                    description: 'EnableAzureRBAC: Whether to enable Azure RBAC for
+                      Kubernetes authorization.'
+                    type: boolean
+                  managed:
+                    description: 'Managed: Whether to enable managed AAD.'
+                    type: boolean
+                  serverAppID:
+                    description: 'ServerAppID: (DEPRECATED) The server AAD application
+                      ID. Learn more at https://aka.ms/aks/aad-legacy.'
+                    type: string
+                  serverAppSecret:
+                    description: 'ServerAppSecret: (DEPRECATED) The server AAD application
+                      secret. Learn more at https://aka.ms/aks/aad-legacy.'
+                    type: string
+                  tenantID:
+                    description: |-
+                      TenantID: The AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment
+                      subscription.
+                    type: string
+                type: object
               conditions:
                 description: Conditions define the current service state of the AROCluster.
                 items:
@@ -129,6 +210,14 @@ spec:
                   - type
                   type: object
                 type: array
+              currentKubernetesVersion:
+                type: string
+              disableLocalAccounts:
+                description: |-
+                  DisableLocalAccounts: If set to true, getting static credentials will be disabled for this cluster. This must only be
+                  used on Managed Clusters that are AAD enabled. For more details see [disable local
+                  accounts](https://docs.microsoft.com/azure/aks/managed-aad#disable-local-accounts-preview).
+                type: boolean
               failureDomains:
                 additionalProperties:
                   description: |-
@@ -149,9 +238,80 @@ spec:
                 description: FailureDomains specifies a list fo available availability
                   zones that can be used
                 type: object
+              fqdn:
+                description: 'Fqdn: The FQDN of the master pool.'
+                type: string
+              longRunningOperationStates:
+                description: |-
+                  LongRunningOperationStates saves the state for ARO long-running operations so they can be continued on the
+                  next reconciliation loop.
+                items:
+                  description: Future contains the data needed for an Azure long-running
+                    operation to continue across reconcile loops.
+                  properties:
+                    data:
+                      description: Data is the base64 url encoded json Azure AutoRest
+                        Future.
+                      type: string
+                    name:
+                      description: |-
+                        Name is the name of the Azure resource.
+                        Together with the service name, this forms the unique identifier for the future.
+                      type: string
+                    resourceGroup:
+                      description: ResourceGroup is the Azure resource group for the
+                        resource.
+                      type: string
+                    serviceName:
+                      description: |-
+                        ServiceName is the name of the Azure service.
+                        Together with the name of the resource, this forms the unique identifier for the future.
+                      type: string
+                    type:
+                      description: Type describes the type of future, such as update,
+                        create, delete, etc.
+                      type: string
+                  required:
+                  - data
+                  - name
+                  - serviceName
+                  - type
+                  type: object
+                type: array
+              privateFQDN:
+                description: 'PrivateFQDN: The FQDN of private cluster.'
+                type: string
               ready:
                 description: Ready is when the AROControlPlane has a API server URL.
                 type: boolean
+              resources:
+                items:
+                  description: ResourceStatus represents the status of a resource.
+                  properties:
+                    ready:
+                      type: boolean
+                    resource:
+                      description: StatusResource is a handle to a resource.
+                      properties:
+                        group:
+                          type: string
+                        kind:
+                          type: string
+                        name:
+                          type: string
+                        version:
+                          type: string
+                      required:
+                      - group
+                      - kind
+                      - name
+                      - version
+                      type: object
+                  required:
+                  - ready
+                  - resource
+                  type: object
+                type: array
             type: object
         type: object
     served: true

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

@@ -195,8 +195,8 @@ spec:
                             description: ControlPlaneManagedIdentities "control-plane"
                               Microsoft.ManagedIdentity/userAssignedIdentities
                             type: string
-                          diskCsiDrivereManagedIdentities:
-                            description: DiskCsiDrivereManagedIdentities "disk-csi-driver"
+                          diskCsiDriverManagedIdentities:
+                            description: DiskCsiDriverManagedIdentities "disk-csi-driver"
                               Microsoft.ManagedIdentity/userAssignedIdentities
                             type: string
                           fileCsiDriverManagedIdentities:
@@ -222,8 +222,8 @@ spec:
                       dataPlaneOperators:
                         description: DataPlaneOperators ref to Microsoft.ManagedIdentity/userAssignedIdentities
                         properties:
-                          diskCsiDrivereManagedIdentities:
-                            description: DiskCsiDrivereManagedIdentities "disk-csi-driver"
+                          diskCsiDriverManagedIdentities:
+                            description: DiskCsiDriverManagedIdentities "disk-csi-driver"
                               Microsoft.ManagedIdentity/userAssignedIdentities
                             type: string
                           fileCsiDriverManagedIdentities:
@@ -260,6 +260,13 @@ spec:
                       and cannot be set with Subnet.
                     type: string
                 type: object
+              resources:
+                description: Resources are embedded ARO resources to be managed by
+                  this resource.
+                items:
+                  type: object
+                  x-kubernetes-preserve-unknown-fields: true
+                type: array
               version:
                 description: OpenShift semantic version, for example "4.14.5".
                 type: string
@@ -354,6 +361,22 @@ spec:
               consoleURL:
                 description: ConsoleURL is the url for the openshift console.
                 type: string
+              controlPlaneEndpoint:
+                description: ControlPlaneEndpoint represents the endpoint for the
+                  cluster's API server.
+                properties:
+                  host:
+                    description: host is the hostname on which the API server is serving.
+                    maxLength: 512
+                    type: string
+                  port:
+                    description: port is the port on which the API server is serving.
+                    format: int32
+                    type: integer
+                required:
+                - host
+                - port
+                type: object
               externalManagedControlPlane:
                 default: true
                 description: |-
@@ -384,6 +407,34 @@ spec:
                 description: Ready denotes that the AROControlPlane API Server is
                   ready to receive requests.
                 type: boolean
+              resources:
+                items:
+                  description: ResourceStatus represents the status of a resource.
+                  properties:
+                    ready:
+                      type: boolean
+                    resource:
+                      description: StatusResource is a handle to a resource.
+                      properties:
+                        group:
+                          type: string
+                        kind:
+                          type: string
+                        name:
+                          type: string
+                        version:
+                          type: string
+                      required:
+                      - group
+                      - kind
+                      - name
+                      - version
+                      type: object
+                  required:
+                  - ready
+                  - resource
+                  type: object
+                type: array
               version:
                 description: ARO-HCP OpenShift semantic version, for example "4.20.0".
                 type: string

config/crd/kustomization.yaml

@@ -53,6 +53,9 @@ patches:
 - path: patches/cainjection_in_azuremachinetemplates.yaml
 - path: patches/cainjection_in_azuremachinepools.yaml
 - path: patches/cainjection_in_azuremachinepoolmachines.yaml
+- path: patches/cainjection_in_aroclusters.yaml
+- path: patches/cainjection_in_arocontrolplanes.yaml
+- path: patches/cainjection_in_aromachinepools.yaml
 # - path: patches/cainjection_in_azuremanagedmachinepools.yaml
 # - path: patches/cainjection_in_azuremanagedclusters.yaml
 # - path: patches/cainjection_in_azuremanagedcontrolplanes.yaml
@@ -77,9 +80,9 @@ patches:
 - path: patches/capicontract_in_azureasomanagedcontrolplanetemplates.yaml
 - path: patches/capicontract_in_azureasomanagedmachinepools.yaml
 - path: patches/capicontract_in_azureasomanagedmachinepooltemplates.yaml
-- path: patches/cainjection_in_aroclusters.yaml
-- path: patches/cainjection_in_arocontrolplanes.yaml
-- path: patches/cainjection_in_aromachinepools.yaml
+- path: patches/capicontract_in_aroclusters.yaml
+- path: patches/capicontract_in_arocontrolplanes.yaml
+- path: patches/capicontract_in_aromachinepools.yaml
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:

config/crd/patches/capicontract_in_aroclusters.yaml

@@ -0,0 +1,6 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: aroclusters.infrastructure.cluster.x-k8s.io
+  labels:
+    cluster.x-k8s.io/v1beta1: v1beta1

config/crd/patches/capicontract_in_arocontrolplanes.yaml

@@ -0,0 +1,6 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: arocontrolplanes.infrastructure.cluster.x-k8s.io
+  labels:
+    cluster.x-k8s.io/v1beta1: v1beta1

config/crd/patches/capicontract_in_aromachinepools.yaml

@@ -0,0 +1,6 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  name: aromachinepools.infrastructure.cluster.x-k8s.io
+  labels:
+    cluster.x-k8s.io/v1beta1: v1beta1

config/rbac/role.yaml

@@ -127,6 +127,32 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - controlplane.cluster.x-k8s.io
+  resources:
+  - arocontrolplanes
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - controlplane.cluster.x-k8s.io
+  resources:
+  - arocontrolplanes/finalizers
+  verbs:
+  - update
+- apiGroups:
+  - controlplane.cluster.x-k8s.io
+  resources:
+  - arocontrolplanes/status
+  verbs:
+  - get
+  - patch
+  - update
 - apiGroups:
   - ""
   resources:
@@ -139,7 +165,6 @@ rules:
   - infrastructure.cluster.x-k8s.io
   resources:
   - aroclusters
-  - arocontrolplanes
   - aromachinepools
   - azureasomanagedclusters
   - azureasomanagedcontrolplanes
@@ -165,7 +190,6 @@ rules:
   - infrastructure.cluster.x-k8s.io
   resources:
   - aroclusters/finalizers
-  - arocontrolplanes/finalizers
   - aromachinepools/finalizers
   - azureasomanagedclusters/finalizers
   - azureasomanagedcontrolplanes/finalizers
@@ -176,7 +200,6 @@ rules:
   - infrastructure.cluster.x-k8s.io
   resources:
   - aroclusters/status
-  - arocontrolplanes/status
   - aromachinepools/status
   - azureasomanagedclusters/status
   - azureasomanagedcontrolplanes/status