diff --git a/internal/database/convert_cluster.go b/internal/database/convert_cluster.go index 8c9e0b04dbd..28c6c2a9397 100644 --- a/internal/database/convert_cluster.go +++ b/internal/database/convert_cluster.go @@ -39,6 +39,7 @@ func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, ResourceType: internalObj.ID.ResourceType.String(), }, HCPClusterProperties: HCPClusterProperties{ + HCPOpenShiftCluster: *internalObj, CosmosMetadata: api.CosmosMetadata{ ResourceID: internalObj.ID, }, @@ -47,7 +48,7 @@ func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, InternalID: ptr.Deref(internalObj.ServiceProviderProperties.ClusterServiceID, api.InternalID{}), ActiveOperationID: internalObj.ServiceProviderProperties.ActiveOperationID, ProvisioningState: internalObj.ServiceProviderProperties.ProvisioningState, - Identity: toCosmosIdentity(internalObj.Identity), + Identity: internalObj.Identity.DeepCopy(), SystemData: internalObj.SystemData, Tags: copyTags(internalObj.Tags), }, @@ -57,52 +58,9 @@ func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, }, } - // some pieces of data in the internalCluster conflict with ResourceDocument fields. We may evolve over time, but for - // now avoid persisting those. - cosmosObj.InternalState.InternalAPI.TrackedResource = arm.TrackedResource{ - Location: internalObj.Location, // this is the only TrackedResource value not present elsewhere in ResourceDcoument - } - cosmosObj.InternalState.InternalAPI.Identity = nil - cosmosObj.InternalState.InternalAPI.SystemData = nil - cosmosObj.InternalState.InternalAPI.Tags = nil - cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ProvisioningState = "" - // we do this to keep serialization the same so that we can go to n-1 where this field isn't a pointer. - // on the reading side, we handle the pointer as expected. - cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ClusterServiceID = &api.InternalID{} - cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ActiveOperationID = "" - return cosmosObj, nil } -func toCosmosIdentity(src *arm.ManagedServiceIdentity) *arm.ManagedServiceIdentity { - if src == nil { - return nil - } - tempIdentity := *src - if src.UserAssignedIdentities != nil { - tempIdentity.UserAssignedIdentities = make(map[string]*arm.UserAssignedIdentity, len(src.UserAssignedIdentities)) - for k, v := range src.UserAssignedIdentities { - if v != nil { - tempIdentity.UserAssignedIdentities[k] = v.DeepCopy() - } else { - tempIdentity.UserAssignedIdentities[k] = nil - } - } - } - return &tempIdentity -} - -func toInternalIdentity(src *arm.ManagedServiceIdentity) *arm.ManagedServiceIdentity { - if src == nil { - return nil - } - - // at this point we still haven't restored the UserAssignedIdentities values, only the keys. The values are looked up on azure somehow in the frontend - // this means that backend reads lack this data - tempIdentity := *src - return &tempIdentity -} - func copyTags(src map[string]string) map[string]string { if src == nil { return nil @@ -141,8 +99,8 @@ func CosmosToInternalCluster(cosmosObj *HCPCluster) (*api.HCPOpenShiftCluster, e // we carry over the CosmosETag from the cosmos object to the internal object into a // temporary field until we have inlined and serialized CosmosMetadata in // HCPOpenShiftCluster. - internalObj.CosmosETag = cosmosObj.CosmosETag - internalObj.Identity = toInternalIdentity(resourceDoc.Identity) + internalObj.CosmosETag = cosmosObj.BaseDocument.CosmosETag + internalObj.Identity = resourceDoc.Identity.DeepCopy() internalObj.SystemData = resourceDoc.SystemData internalObj.Tags = copyTags(resourceDoc.Tags) internalObj.ServiceProviderProperties.ExistingCosmosUID = cosmosObj.ID diff --git a/internal/database/convert_nodepool.go b/internal/database/convert_nodepool.go index 49a0b30ef08..90ad6a579a1 100644 --- a/internal/database/convert_nodepool.go +++ b/internal/database/convert_nodepool.go @@ -46,7 +46,7 @@ func InternalToCosmosNodePool(internalObj *api.HCPOpenShiftClusterNodePool) (*No InternalID: internalObj.ServiceProviderProperties.ClusterServiceID, ActiveOperationID: internalObj.ServiceProviderProperties.ActiveOperationID, ProvisioningState: internalObj.Properties.ProvisioningState, - Identity: toCosmosIdentity(internalObj.Identity), + Identity: internalObj.Identity.DeepCopy(), SystemData: internalObj.SystemData, Tags: copyTags(internalObj.Tags), }, @@ -98,7 +98,7 @@ func CosmosToInternalNodePool(cosmosObj *NodePool) (*api.HCPOpenShiftClusterNode // temporary field until we have inlined and serialized CosmosMetadata in // HCPOpenShiftClusterNodePool. internalObj.CosmosETag = cosmosObj.CosmosETag - internalObj.Identity = toInternalIdentity(resourceDoc.Identity) + internalObj.Identity = resourceDoc.Identity.DeepCopy() internalObj.Properties.ProvisioningState = resourceDoc.ProvisioningState internalObj.SystemData = resourceDoc.SystemData internalObj.Tags = copyTags(resourceDoc.Tags) diff --git a/internal/database/types_hcpcluster.go b/internal/database/types_hcpcluster.go index 24608d1d1cf..7570a5d4f21 100644 --- a/internal/database/types_hcpcluster.go +++ b/internal/database/types_hcpcluster.go @@ -25,8 +25,14 @@ type HCPCluster struct { } type HCPClusterProperties struct { + // HCPOpenShiftCluster is where we're migrating to. It is compatible with a GenericDocument[api.HCPOpenShiftCluster] + // which is where we want to end up. + // * to be compatible with prior versions, we must continue writing all previous fields and this new field + // * to be compatible with prior versions, we must continue reading only from previous fields + api.HCPOpenShiftCluster `json:",inline"` + // when we switch to inlining the internalObj, this will be in the right spot. We add it now so that we can switch our - // queries to select on cosmosMetata.ResourceID instead of resourceId + // queries to select on cosmosMetadata.ResourceID instead of resourceId CosmosMetadata api.CosmosMetadata `json:"cosmosMetadata"` // IntermediateResourceDoc exists so that we can stop inlining the resource document so that we can directly diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json index 5bb96fba640..df797d0cd94 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,13 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -16,12 +23,33 @@ }, "internalState": { "internalAPI": { + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "eastus", + "name": "some-hcp-cluster", "serviceProviderProperties": { - "clusterServiceID": "" - } + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "eastus", + "name": "some-hcp-cluster", + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json index bcc872d3f61..50790056402 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,13 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -21,12 +28,44 @@ }, "internalState": { "internalAPI": { + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "eastus", + "name": "some-hcp-cluster", "serviceProviderProperties": { - "clusterServiceID": "" - } + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "eastus", + "name": "some-hcp-cluster", + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json index bcc872d3f61..50790056402 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,13 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -21,12 +28,44 @@ }, "internalState": { "internalAPI": { + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "eastus", + "name": "some-hcp-cluster", "serviceProviderProperties": { - "clusterServiceID": "" - } + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "eastus", + "name": "some-hcp-cluster", + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json index bcc872d3f61..50790056402 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,13 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -21,12 +28,44 @@ }, "internalState": { "internalAPI": { + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "eastus", + "name": "some-hcp-cluster", "serviceProviderProperties": { - "clusterServiceID": "" - } + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "eastus", + "name": "some-hcp-cluster", + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json index 91051e86b86..d2abf8d5758 100644 --- a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "1efd180d-f929-5506-9e76-15ef4c14ca7b", "partitionKey": "4fa75980-6637-4157-9726-84d878a62e83", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "lavishUnhappiness", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "lavishUnhappiness", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json index 91051e86b86..d2abf8d5758 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json @@ -2,6 +2,63 @@ "id": "1efd180d-f929-5506-9e76-15ef4c14ca7b", "partitionKey": "4fa75980-6637-4157-9726-84d878a62e83", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "lavishUnhappiness", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "lavishUnhappiness", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json index 91051e86b86..d2abf8d5758 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json @@ -2,6 +2,63 @@ "id": "1efd180d-f929-5506-9e76-15ef4c14ca7b", "partitionKey": "4fa75980-6637-4157-9726-84d878a62e83", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "lavishUnhappiness", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "lavishUnhappiness", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json index 79d13b40f93..cf23e04131c 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json @@ -2,6 +2,33 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -39,16 +66,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json index 79d13b40f93..cf23e04131c 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,33 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -39,16 +66,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json index 79d13b40f93..cf23e04131c 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json @@ -2,6 +2,33 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -39,16 +66,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json index 79d13b40f93..cf23e04131c 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,33 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -39,16 +66,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json index 71911cf2334..b93039a54e6 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json @@ -2,6 +2,63 @@ "id": "f7583c84-ae03-56f3-b91d-55bbb849164d", "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "uprightPairing", + "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": { + "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" + } + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "identity": { @@ -69,16 +126,48 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "monstrousPrecinct", "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "monstrousPrecinct", + "serviceProviderProperties": { + "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json index a2dfa622518..e004965a3e6 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json @@ -8,6 +8,58 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", + "cosmosMetadata": { + "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "identity": { "type": "UserAssigned" }, @@ -62,18 +114,40 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "platform": {} - } + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } }, + "location": "fake-location", + "name": "create-with-tags", "provisioningState": "Accepted", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "platform": {} + }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", "createdByType": "Application", @@ -82,7 +156,8 @@ }, "tags": { "one": "apple" - } + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json index 734e1f3ca30..d68e63268d8 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json @@ -8,6 +8,58 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", + "cosmosMetadata": { + "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "identity": { "type": "UserAssigned" }, @@ -62,18 +114,40 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "platform": {} - } + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } }, + "location": "fake-location", + "name": "create-with-tags", "provisioningState": "Accepted", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "platform": {} + }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", "createdByType": "Application", @@ -82,7 +156,8 @@ }, "tags": { "one": "apple" - } + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/microsoft.redhatopenshift/hcpopenshiftclusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json index 734e1f3ca30..d68e63268d8 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json @@ -8,6 +8,58 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", + "cosmosMetadata": { + "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "identity": { "type": "UserAssigned" }, @@ -62,18 +114,40 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "platform": {} - } + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } }, + "location": "fake-location", + "name": "create-with-tags", "provisioningState": "Accepted", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "platform": {} + }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", "createdByType": "Application", @@ -82,7 +156,8 @@ }, "tags": { "one": "apple" - } + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/microsoft.redhatopenshift/hcpopenshiftclusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json index 734e1f3ca30..d68e63268d8 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json @@ -8,6 +8,58 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", + "cosmosMetadata": { + "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "identity": { "type": "UserAssigned" }, @@ -62,18 +114,40 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "platform": {} - } + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } }, + "location": "fake-location", + "name": "create-with-tags", "provisioningState": "Accepted", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "platform": {} + }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", "createdByType": "Application", @@ -82,7 +156,8 @@ }, "tags": { "one": "apple" - } + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/microsoft.redhatopenshift/hcpopenshiftclusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json index 734e1f3ca30..d68e63268d8 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json @@ -8,6 +8,58 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", + "cosmosMetadata": { + "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "identity": { "type": "UserAssigned" }, @@ -62,18 +114,40 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "platform": {} - } + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } }, + "location": "fake-location", + "name": "create-with-tags", "provisioningState": "Accepted", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "platform": {} + }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", "createdByType": "Application", @@ -82,7 +156,8 @@ }, "tags": { "one": "apple" - } + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/microsoft.redhatopenshift/hcpopenshiftclusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json index 734e1f3ca30..d68e63268d8 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json @@ -8,6 +8,58 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", + "cosmosMetadata": { + "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "identity": { "type": "UserAssigned" }, @@ -62,18 +114,40 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "platform": {} - } + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } }, + "location": "fake-location", + "name": "create-with-tags", "provisioningState": "Accepted", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "platform": {} + }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", "createdByType": "Application", @@ -82,7 +156,8 @@ }, "tags": { "one": "apple" - } + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/microsoft.redhatopenshift/hcpopenshiftclusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index e45507472dc..0a5457d64a0 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -2,11 +2,20 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "intermediateResourceDoc": { "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Provisioning", "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Provisioning" } }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json index 5b746e5bf58..619c0119993 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json @@ -2,11 +2,20 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "intermediateResourceDoc": { "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Succeeded" } }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json index c9690b0f673..d840efb96b7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,10 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "intermediateResourceDoc": { "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", @@ -9,7 +13,12 @@ "tags": { "foo": "bar" } + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Succeeded" } }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json index c9690b0f673..d840efb96b7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,10 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "intermediateResourceDoc": { "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", @@ -9,7 +13,12 @@ "tags": { "foo": "bar" } + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Succeeded" } }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index 9d209d91952..04f84414c93 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,13 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -21,12 +28,45 @@ }, "internalState": { "internalAPI": { + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "eastus", + "name": "some-hcp-cluster", "serviceProviderProperties": { - "clusterServiceID": "" - } + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Provisioning" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "eastus", + "name": "some-hcp-cluster", + "serviceProviderProperties": { + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Provisioning" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "foo": "bar" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json index c9690b0f673..d840efb96b7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json @@ -2,6 +2,10 @@ "id": "68bc6026-a8a9-5706-92c5-25d3313bcabb", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "intermediateResourceDoc": { "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", @@ -9,7 +13,12 @@ "tags": { "foo": "bar" } + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", + "provisioningState": "Succeeded" } }, + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json index 838f63f2ae1..0f016eec4d3 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -10,6 +10,60 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable", + "id": "4.20" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", "identity": { @@ -80,17 +134,56 @@ "id": "4.20" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index e3d36ec2322..3f9d1bc46ba 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -10,6 +10,60 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 47, + "maxPodGracePeriodSeconds": 73, + "podPriorityThreshold": -6 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable", + "id": "4.20" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", "identity": { @@ -81,17 +135,58 @@ "id": "4.20" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple", + "two": "banana" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple", + "two": "banana" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json index d3f3b16dc7d..42bf2bc191a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json @@ -5,6 +5,60 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable", + "id": "4.20" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -70,17 +124,46 @@ "id": "4.20" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "test-cluster", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Deleting" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "test-cluster", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Deleting" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json index d3f3b16dc7d..42bf2bc191a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json @@ -5,6 +5,60 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable", + "id": "4.20" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -70,17 +124,46 @@ "id": "4.20" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "test-cluster", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Deleting" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "test-cluster", + "serviceProviderProperties": { + "api": {}, + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Deleting" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json index 0be69f505e6..7b793736b78 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", "identity": { @@ -75,17 +130,56 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 28034e83c15..b06265dc897 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -10,6 +10,59 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 47, + "maxPodGracePeriodSeconds": 73, + "podPriorityThreshold": -6 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", "identity": { @@ -80,17 +133,58 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple", + "two": "banana" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Accepted" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple", + "two": "banana" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index e9e81a58a89..76a0029fbad 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -2,7 +2,11 @@ "id": "d9dc2060-758a-540b-bb6e-bab0900ea591", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating" + }, "customerDesiredState": null, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", "intermediateResourceDoc": { "identity": { "principalId": "the-principal", @@ -16,6 +20,10 @@ "foo": "bar" } }, + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", + "provisioningState": "Provisioning" + }, "serviceProviderState": null }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index 9d9dbdf5e3d..02ac22e874d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -2,7 +2,11 @@ "id": "24d2a0af-ce42-50a3-80c4-dbfb99e5b460", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting" + }, "customerDesiredState": null, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", "intermediateResourceDoc": { "identity": { "principalId": "the-principal", @@ -16,6 +20,10 @@ "foo": "bar" } }, + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", + "provisioningState": "Deleting" + }, "serviceProviderState": null }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json index f2c292816d6..202c883baa2 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json @@ -10,6 +10,60 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable", + "id": "4.20" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -79,17 +133,54 @@ "id": "4.20" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json index 83a1b23fd44..c141ded29f5 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -74,17 +129,54 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 257be743309..37030891ccf 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -74,17 +129,54 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json index 131ded98591..ece0e5aa806 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "identity": { @@ -75,17 +130,56 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json index 2b281726eba..92a305be4dd 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json @@ -10,6 +10,59 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "identity": { @@ -79,17 +132,56 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json index 6432c982d16..67cb2f1778a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "identity": { @@ -75,16 +130,54 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json index 6432c982d16..67cb2f1778a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "identity": { @@ -75,16 +130,54 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index c07863564d4..dc6321536e1 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -2,6 +2,15 @@ "id": "d9dc2060-758a-540b-bb6e-bab0900ea591", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating" + }, + "customerProperties": { + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", "intermediateResourceDoc": { "identity": { "principalId": "the-principal", @@ -21,8 +30,13 @@ "version": { "channelGroup": "stable" } - } + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating" } + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", + "provisioningState": "Provisioning" } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index db4c434351b..7d0db4d2e0a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -2,6 +2,15 @@ "id": "24d2a0af-ce42-50a3-80c4-dbfb99e5b460", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting" + }, + "customerProperties": { + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", "intermediateResourceDoc": { "identity": { "principalId": "the-principal", @@ -21,8 +30,13 @@ "version": { "channelGroup": "stable" } - } + }, + "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting" } + }, + "serviceProviderProperties": { + "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", + "provisioningState": "Deleting" } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json index 906d3b469d2..6105660da1e 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -10,6 +10,60 @@ "cosmosMetadata": { "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + }, + "visibility": "Public" + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable", + "id": "4.20" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "identity": { "type": "UserAssigned" @@ -79,17 +133,54 @@ "id": "4.20" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json index 131ded98591..ece0e5aa806 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "identity": { @@ -75,17 +130,56 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index ca4b6ece277..03db3af16a6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -7,6 +7,61 @@ "id": "96b154eb-638c-5dae-ba08-9b2df5cd8f61", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "cosmosMetadata": { + "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags" + }, + "customerProperties": { + "api": { + "visibility": "Public" + }, + "autoscaling": { + "maxNodeProvisionTimeSeconds": 900, + "maxPodGracePeriodSeconds": 600, + "podPriorityThreshold": -10 + }, + "clusterImageRegistry": { + "state": "Disabled" + }, + "dns": {}, + "etcd": { + "dataEncryption": { + "customerManaged": { + "encryptionType": "KMS", + "kms": { + "activeKey": { + "name": "encryptionKeyName", + "vaultName": "keyVaultName", + "version": "2024-12-01-preview" + } + } + }, + "keyManagementMode": "CustomerManaged" + } + }, + "network": { + "hostPrefix": 23, + "machineCidr": "10.0.0.0/16", + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16" + }, + "platform": { + "managedResourceGroup": "managed-resource-group-name", + "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", + "operatorsAuthentication": { + "userAssignedIdentities": {} + }, + "outboundType": "LoadBalancer", + "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" + }, + "version": { + "channelGroup": "stable" + } + }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "intermediateResourceDoc": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "identity": { @@ -75,17 +130,56 @@ "channelGroup": "stable" } }, + "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "identity": { + "type": "UserAssigned" + }, "location": "fake-location", + "name": "create-with-tags", "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", "api": {}, - "clusterServiceID": "", + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", "console": {}, "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {} - } + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" } - } + }, + "location": "fake-location", + "name": "create-with-tags", + "serviceProviderProperties": { + "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "api": {}, + "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "console": {}, + "dns": {}, + "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", + "platform": {}, + "provisioningState": "Succeeded" + }, + "systemData": { + "createdBy": "Unknown-ARO-HCP-frontend", + "createdByType": "Application", + "lastModifiedBy": "Unknown-ARO-HCP-frontend", + "lastModifiedByType": "Application" + }, + "tags": { + "one": "apple" + }, + "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" }, "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", "resourceType": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" diff --git a/test-integration/utils/databasemutationhelpers/per_resource_comparer.go b/test-integration/utils/databasemutationhelpers/per_resource_comparer.go index 848ae8e929e..a4cda450c59 100644 --- a/test-integration/utils/databasemutationhelpers/per_resource_comparer.go +++ b/test-integration/utils/databasemutationhelpers/per_resource_comparer.go @@ -112,12 +112,23 @@ func ResourceInstanceEquals(t *testing.T, expected, actual any) (string, bool) { // this loops handles the cosmosObj possibility and the internalObj possibility for _, possiblePrepend := range []string{"", "properties"} { - unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "lastTransitionTime")...) // operations - unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "startTime")...) // operations - unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "operationId")...) // operations - unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "serviceProviderProperties", "clusterUID")...) // cluster - UUID generated + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "lastTransitionTime")...) // operations + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "startTime")...) // operations + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "operationId")...) // operations + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "serviceProviderProperties", "clusterUID")...) // cluster - UUID generated + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "serviceProviderProperties", "activeOperationId")...) // cluster - UUID generated + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "serviceProviderProperties", "clusterServiceID")...) // cluster - randomly generated by cluster-service mock + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "systemData", "createdAt")...) // cluster - varies on every run + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "systemData", "lastModifiedAt")...) // cluster - varies on every run unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "cosmosMetadata", "etag")...) + // inline serialization on cluster also exposes these UUID-generated / variable fields directly under properties + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "serviceProviderProperties", "clusterUID")...) // UUID generated + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "serviceProviderProperties", "activeOperationId")...) // UUID generated + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "serviceProviderProperties", "clusterServiceID")...) // randomly generated by cluster-service mock + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "systemData", "createdAt")...) + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "systemData", "lastModifiedAt")...) + for _, nestedPossiblePrepend := range []string{"", "intermediateResourceDoc"} { unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, prepend(nestedPossiblePrepend, "activeOperationId")...)...) // cluster, nodepool, externalauth unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, prepend(nestedPossiblePrepend, "internalId")...)...) // cluster, nodepool, externalauth