From 95cfab834c1d818678b0ed454956e73682ae61a6 Mon Sep 17 00:00:00 2001 From: Petr Date: Mon, 20 May 2024 14:22:46 +0000 Subject: [PATCH] Prepare the api for ARM Move swagger to subfolder and create autorest config readme files. The folder structure is selected to match the structure of the azure repository. --- api/autorest-config.yaml | 2 +- ...rations_ListByLocation_MinimumSet_Gen.json | 18 - ...rsions_ListByLocation_MaximumSet_Gen.json} | 8 +- ...ersions_ListByLocation_MinimumSet_Gen.json | 20 + ...sters_AdminCredentials_MaximumSet_Gen.json | 4 +- ...lusters_CreateOrUpdate_MaximumSet_Gen.json | 57 +- ...enShiftClusters_Delete_MaximumSet_Gen.json | 4 +- ...pOpenShiftClusters_Get_MaximumSet_Gen.json | 22 +- ...iftClusters_KubeConfig_MaximumSet_Gen.json | 4 +- ...rs_ListByResourceGroup_MaximumSet_Gen.json | 20 +- ...ers_ListBySubscription_MaximumSet_Gen.json | 20 +- ...enShiftClusters_Update_MaximumSet_Gen.json | 23 +- ...dePools_CreateOrUpdate_MaximumSet_Gen.json | 31 +- .../NodePools_Delete_MaximumSet_Gen.json | 6 +- .../NodePools_Get_MaximumSet_Gen.json | 9 +- ...enShiftClusterResource_MaximumSet_Gen.json | 7 +- .../NodePools_Update_MaximumSet_Gen.json | 58 +- .../Operations_List_MaximumSet_Gen.json | 4 +- .../Operations_List_MinimumSet_Gen.json | 2 +- .../HcpCluster/hcpCluster-models.tsp | 168 ++++-- api/redhatopenshift/HcpCluster/hcpCluster.tsp | 8 +- .../HcpCluster/hcpVersions.tsp | 11 +- api/redhatopenshift/HcpCluster/main.tsp | 11 +- api/redhatopenshift/HcpCluster/tspconfig.yaml | 11 +- ...rsions_ListByLocation_MaximumSet_Gen.json} | 8 +- ...ersions_ListByLocation_MinimumSet_Gen.json | 20 + ...sters_AdminCredentials_MaximumSet_Gen.json | 4 +- ...lusters_CreateOrUpdate_MaximumSet_Gen.json | 57 +- ...enShiftClusters_Delete_MaximumSet_Gen.json | 4 +- ...pOpenShiftClusters_Get_MaximumSet_Gen.json | 22 +- ...iftClusters_KubeConfig_MaximumSet_Gen.json | 4 +- ...rs_ListByResourceGroup_MaximumSet_Gen.json | 20 +- ...ers_ListBySubscription_MaximumSet_Gen.json | 20 +- ...enShiftClusters_Update_MaximumSet_Gen.json | 23 +- ...dePools_CreateOrUpdate_MaximumSet_Gen.json | 31 +- .../NodePools_Delete_MaximumSet_Gen.json | 6 +- .../NodePools_Get_MaximumSet_Gen.json | 9 +- ...enShiftClusterResource_MaximumSet_Gen.json | 7 +- .../NodePools_Update_MaximumSet_Gen.json | 58 +- .../Operations_List_MaximumSet_Gen.json | 4 +- .../Operations_List_MinimumSet_Gen.json | 2 +- .../preview/2024-06-10-preview/openapi.json | 508 ++++++++---------- .../hcpclusters/readme.go.md | 34 ++ .../hcpclusters/readme.md | 76 +++ .../hcpclusters/readme.python.md | 34 ++ ...rations_ListByLocation_MinimumSet_Gen.json | 18 - .../generated/client_factory.go | 6 +- .../v20240610preview/generated/constants.go | 2 +- .../fake/hcpclusterversions_server.go | 109 ++++ .../fake/hcpopenshiftclusters_server.go | 16 +- .../generated/fake/nodepools_server.go | 10 +- .../generated/fake/server_factory.go | 10 +- .../generated/hcpclusterversions_client.go | 104 ++++ .../generated/hcpopenshiftclusters_client.go | 16 +- .../api/v20240610preview/generated/models.go | 141 ++--- .../generated/models_serde.go | 191 ++++--- .../generated/nodepools_client.go | 10 +- .../generated/operations_client.go | 2 +- .../api/v20240610preview/generated/options.go | 4 +- .../v20240610preview/generated/responses.go | 8 +- package-lock.json | 21 +- package.json | 1 + 62 files changed, 1347 insertions(+), 801 deletions(-) delete mode 100644 api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json rename api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/{HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json => HcpClusterVersions_ListByLocation_MaximumSet_Gen.json} (75%) create mode 100644 api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json => hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json} (75%) create mode 100644 api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json (79%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json (82%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json (79%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json (82%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json (75%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json (84%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json (84%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json (85%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json (78%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json (65%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json (84%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json (88%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json (61%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json (92%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json (98%) rename api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/{ => hcpclusters}/preview/2024-06-10-preview/openapi.json (83%) create mode 100644 api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.go.md create mode 100644 api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.md create mode 100644 api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.python.md delete mode 100644 api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json create mode 100644 internal/api/v20240610preview/generated/fake/hcpclusterversions_server.go create mode 100644 internal/api/v20240610preview/generated/hcpclusterversions_client.go diff --git a/api/autorest-config.yaml b/api/autorest-config.yaml index 06f5652b9..f1ffc8797 100644 --- a/api/autorest-config.yaml +++ b/api/autorest-config.yaml @@ -1,5 +1,5 @@ --- -input-file: redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json +input-file: redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/openapi.json use: # TODO: This is an old version. We should fix incompatibilities and remove this later - "@autorest/go@4.0.0-preview.63" diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json deleted file mode 100644 index 7dde06591..000000000 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "title": "HcpClusterVersionOperations_ListByLocation_Minimum", - "operationId": "HcpClusterVersionOperations_ListByLocation", - "parameters": { - "api-version": "2024-06-10-preview", - "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", - "location": "pdtzymgwqsbxy" - }, - "responses": { - "200": { - "body": { - "value": [ - {} - ] - } - } - } -} \ No newline at end of file diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json similarity index 75% rename from api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json rename to api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json index 635f459e6..13fba1bc7 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json @@ -1,6 +1,6 @@ { - "title": "HcpClusterVersionOperations_ListByLocation_Maximum", - "operationId": "HcpClusterVersionOperations_ListByLocation", + "title": "HcpClusterVersions_ListByLocation_Maximum", + "operationId": "HcpClusterVersions_ListByLocation", "parameters": { "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", @@ -15,7 +15,7 @@ "provisioningState": "Succeeded", "clusterVersion": "xkfddeiqkiqqkqzgnby" }, - "id": "pvhxaztlblmgvoyoeqczqf", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "mvugweyhywfyadmkhkzrlhoiscgfl", "type": "by", "systemData": { @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json new file mode 100644 index 000000000..9baf5e9d3 --- /dev/null +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json @@ -0,0 +1,20 @@ +{ + "title": "HcpClusterVersions_ListByLocation_Minimum", + "operationId": "HcpClusterVersions_ListByLocation", + "parameters": { + "api-version": "2024-06-10-preview", + "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", + "location": "pdtzymgwqsbxy" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName" + } + ] + } + } + } +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json index df8c7eadf..2d36a2651 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json index 8d1fa5ad6..ab5d432c4 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json @@ -5,23 +5,22 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", "resource": { "properties": { "spec": { "version": { - "id": "pvinporshxtqvnkr", - "channelGroup": "meqrztdrw" + "channelGroup": "stable", + "id": "4.12" }, "dns": { "baseDomainPrefix": "jcldjrtyebhrlxseuuhd" }, "network": { "networkType": "OVNKubernetes", - "podCidr": "hlfvrznsn", - "serviceCidr": "ittcodescilyiixnewchphuxxu", - "machineCidr": "cxglfwznjq", - "hostPrefix": 27 + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": {}, "api": { @@ -40,7 +39,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "externalAuth": { @@ -72,6 +71,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -80,7 +80,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -100,10 +103,10 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, - "issuerUrl": "pqfgpubcuaaovvpeqal", + "issuerUrl": "https://oidc.contoso.com", "externalAuth": { "externalAuths": [ { @@ -152,13 +155,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -166,7 +169,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -188,6 +191,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -196,7 +200,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -216,10 +223,10 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, - "issuerUrl": "pqfgpubcuaaovvpeqal", + "issuerUrl": "https://oidc.contoso.com", "externalAuth": { "externalAuths": [ { @@ -268,13 +275,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -282,7 +289,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -296,4 +303,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json index 78876fe88..3b2223bc8 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "202": { @@ -15,4 +15,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Get_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Get_MaximumSet_Gen.json index b8fda9e5a..25000d80a 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Get_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Get_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { @@ -14,6 +14,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -22,7 +23,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -42,7 +46,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -94,13 +98,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -108,7 +112,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -122,4 +126,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json index dadc33f48..b4d67a129 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json @@ -5,11 +5,11 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { "body": {} } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json index 26e4f70fa..5a747aee5 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json @@ -15,6 +15,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -23,7 +24,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -43,7 +47,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -95,13 +99,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -109,7 +113,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -126,4 +130,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json index 00f0bdc46..461dd1dd8 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json @@ -14,6 +14,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -22,7 +23,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -42,7 +46,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -94,13 +98,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -108,7 +112,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -125,4 +129,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Update_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Update_MaximumSet_Gen.json index 370909c42..fcc5d104b 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Update_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/HcpOpenShiftClusters_Update_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", "properties": { "identity": { "type": "None", @@ -21,7 +21,6 @@ "version": { "id": "nsj" }, - "dns": {}, "disableUserWorkloadMonitoring": true, "proxy": { "httpProxy": "sjjbjvkimlvtwdnwjodcajidcoompt", @@ -40,6 +39,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -48,7 +48,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -68,7 +71,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -120,13 +123,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -134,7 +137,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -153,4 +156,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_CreateOrUpdate_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_CreateOrUpdate_MaximumSet_Gen.json index 02f7517a0..9c813b6ff 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_CreateOrUpdate_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_CreateOrUpdate_MaximumSet_Gen.json @@ -5,14 +5,14 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodePool-name", "resource": { "properties": { "spec": { "version": { - "id": "tbg", - "channelGroup": "rhhchgarryftdwzbadtwrzcbighms" + "channelGroup": "stable", + "id": "jlufyoivqzyxnqzwijozipxmgux" }, "platform": { "subnetId": "afapulyhvjjg", @@ -31,10 +31,17 @@ "max": 29 }, "labels": [ - "ufrvhxdwltr" + { + "key": "release", + "value": "4.12" + } ], "taints": [ - "yzmuazkxmfhksrjm" + { + "key": "iveofwsptzsxepyfirlfypshvkgzkpfdwrpreacacbcifrzpvmgmovnpmkeqxgvamtbwqfewlrnlcqcmbnqhdgvosyxazqxwtlcviveerkvdrveayeyvasngwjmrsnhyvmayzrndwahvuoocvbqjuscmybctzhrhbotipnrwhnkhejgiuanmidrdjetccddupjtvvztlbwlgdxgdwlhxdlluvcduh", + "value": "x", + "effect": "NoSchedule" + } ], "tuningConfigs": [ "m" @@ -54,8 +61,9 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ - "jlufyoivqzyxnqzwijozipxmgux" + "4.12" ] }, "platform": { @@ -81,7 +89,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -103,8 +111,9 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ - "jlufyoivqzyxnqzwijozipxmgux" + "4.12" ] }, "platform": { @@ -130,7 +139,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -144,4 +153,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Delete_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Delete_MaximumSet_Gen.json index 63f971276..cd69202a7 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Delete_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Delete_MaximumSet_Gen.json @@ -5,8 +5,8 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodePool-name" }, "responses": { "202": { @@ -16,4 +16,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Get_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Get_MaximumSet_Gen.json index 00422541f..286a35ee6 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Get_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Get_MaximumSet_Gen.json @@ -5,8 +5,8 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodepool-name" }, "responses": { "200": { @@ -15,6 +15,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "jlufyoivqzyxnqzwijozipxmgux" ] @@ -42,7 +43,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -56,4 +57,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json index 5f29b864d..39249e34d 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { @@ -16,6 +16,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "jlufyoivqzyxnqzwijozipxmgux" ] @@ -43,7 +44,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -60,4 +61,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Update_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Update_MaximumSet_Gen.json index aad3b759a..c912f31eb 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Update_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/NodePools_Update_MaximumSet_Gen.json @@ -5,30 +5,45 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodePool-name", "properties": { + "identity": { + "type": "None", + "userAssignedIdentities": { + "key4794": {} + } + }, "tags": { "key3313": "aciaohrpspozhrvwvbdtpqliezchbn" }, "properties": { - "version": { - "id": "chh" - }, - "replicas": 7, - "autoScaling": { - "min": 29, - "max": 2 - }, - "labels": [ - "qptpzhtgcqsofgvlahww" - ], - "taints": [ - "fzmckrigt" - ], - "tuningConfigs": [ - "dvoeaysltfusyb" - ] + "spec": { + "version": { + "id": "chh" + }, + "replicas": 7, + "autoScaling": { + "min": 29, + "max": 2 + }, + "labels": [ + { + "key": "release", + "value": "4.12" + } + ], + "taints": [ + { + "key": "iveofwsptzsxepyfirlfypshvkgzkpfdwrpreacacbcifrzpvmgmovnpmkeqxgvamtbwqfewlrnlcqcmbnqhdgvosyxazqxwtlcviveerkvdrveayeyvasngwjmrsnhyvmayzrndwahvuoocvbqjuscmybctzhrhbotipnrwhnkhejgiuanmidrdjetccddupjtvvztlbwlgdxgdwlhxdlluvcduh", + "value": "x", + "effect": "NoSchedule" + } + ], + "tuningConfigs": [ + "dvoeaysltfusyb" + ] + } } } }, @@ -39,6 +54,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "jlufyoivqzyxnqzwijozipxmgux" ] @@ -66,7 +82,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -85,4 +101,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MaximumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MaximumSet_Gen.json index d50ead77e..94e52932c 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MaximumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MaximumSet_Gen.json @@ -21,8 +21,8 @@ "actionType": "Internal" } ], - "nextLink": "mmxaxttmjsusvyx" + "nextLink": "https://microsoft.com/a" } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MinimumSet_Gen.json b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MinimumSet_Gen.json index dbdbbc80e..259fe494f 100644 --- a/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MinimumSet_Gen.json +++ b/api/redhatopenshift/HcpCluster/examples/2024-06-10-preview/Operations_List_MinimumSet_Gen.json @@ -9,4 +9,4 @@ "body": {} } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp index 1169e45c8..62cddeea5 100644 --- a/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp +++ b/api/redhatopenshift/HcpCluster/hcpCluster-models.tsp @@ -8,7 +8,7 @@ using TypeSpec.Http; using Azure.Core; using Azure.ResourceManager; -namespace Microsoft.RedHatOpenshift; +namespace Microsoft.RedHatOpenShift; /* * =================================== @@ -48,6 +48,8 @@ model HcpOpenShiftClusterNodePoolResource @path @segment("nodePools") name: string; + + ...ManagedServiceIdentityProperty; } /** HCP cluster properties */ @@ -56,9 +58,18 @@ model HcpOpenShiftClusterProperties { @visibility("read") provisioningState?: ProvisioningState; - /** The cluster resouce specification. */ - @visibility("create", "update") - spec: ClusterSpec; + /** The cluster resource specification. */ + spec?: ClusterSpec; +} + +/** HCP patchable cluster properties */ +model HcpOpenShiftClusterPatchProperties { + /** The status of the last operation. */ + @visibility("read") + provisioningState?: ProvisioningState; + + /** The cluster resource specification. */ + spec?: ClusterPatchSpec; } /** The cluster resource specification */ @@ -71,7 +82,7 @@ model ClusterSpec { dns?: DnsProfile; /** Cluster network configuration */ - @visibility("create") + @visibility("create", "read") network?: NetworkProfile; /** Shows the cluster web console information */ @@ -85,13 +96,13 @@ model ClusterSpec { /** Enable FIPS mode for the cluster * When set to true, `etcdEncryption` must be set to true */ - @visibility("create") + @visibility("create", "read") fips?: boolean = false; /** Enables customer ETCD encryption, set during creation * When set to true, `platform.etcdEncryptionSetId` must be set */ - @visibility("create") + @visibility("create", "read") etcdEncryption?: boolean = false; /** Disable user workload monitoring */ @@ -103,8 +114,8 @@ model ClusterSpec { proxy?: ProxyProfile; /** Azure platform configuration */ - @visibility("create") - platform: PlatformProfile; + @visibility("create", "read") + platform?: PlatformProfile; /** URL for the OIDC provider to be used for authentication * to authenticate against user Azure cloud account @@ -115,15 +126,30 @@ model ClusterSpec { /** Configuration to override the openshift-oauth-apiserver inside cluster * This changes user login into the cluster to external provider */ - @visibility("create") + @visibility("create", "read") externalAuth?: ExternalAuthConfigProfile; /** Configures the cluster ingresses */ - @visibility("create") + @visibility("create", "read") @OpenAPI.extension("x-ms-identifiers", ["ip", "url", "visibility"]) ingress?: IngressProfile[]; } +/** The patchable cluster specification */ +model ClusterPatchSpec { + /** Version of the control plane components */ + @visibility("update") + version?: VersionProfile; + + /** Disable user workload monitoring */ + @visibility("update") + disableUserWorkloadMonitoring?: boolean; + + /** Openshift cluster proxy configuration */ + @visibility("update") + proxy?: ProxyProfile; +} + /** The resource provisioning state. */ @lroStatus union ProvisioningState { @@ -138,7 +164,7 @@ model VersionProfile { id: string; /** ChannelGroup is the name of the set to which this version belongs. Each version belongs to only a single set. */ - @visibility("create") + @visibility("create", "read") channelGroup: string; /** AvailableUpgrades is a list of version names the current version can be upgraded to. */ @@ -150,41 +176,41 @@ model VersionProfile { model DnsProfile { /** BaseDomain is the base DNS domain of the cluster. */ @visibility("read") - baseDomain: string; + baseDomain?: string; /** BaseDomainPrefix is the unique name of the cluster representing the OpenShift's cluster name. * BaseDomainPrefix is the name that will appear in the cluster's DNS, provisioned cloud providers resources * */ - @visibility("create") - baseDomainPrefix: string; + @visibility("create", "read") + baseDomainPrefix?: string; } /** Network profile of the cluster */ model NetworkProfile { /** The main controller responsible for rendering the core networking components */ - @visibility("create") + @visibility("create", "read") networkType?: NetworkType = NetworkType.OVNKubernetes; /** The CIDR of the pod IP addresses * example: 10.128.0.0/14 */ - @visibility("create") + @visibility("create", "read") podCidr: string; /** The CIDR block for assigned service IPs, * example: 172.30.0.0/16 */ - @visibility("create") + @visibility("create", "read") serviceCidr: string; /** from which to assign machine IP addresses, * example: 10.0.0.0/16 */ - @visibility("create") + @visibility("create", "read") machineCidr: string; /** Network host prefix which is defaulted to 23 if not specified. */ - @visibility("create") + @visibility("create", "read") hostPrefix?: int32 = 23; } @@ -217,7 +243,7 @@ model ApiProfile { ip: string; /** should the API server be accessible from the internet */ - @visibility("create") + @visibility("create", "read") visibility: Visibility; } @@ -291,7 +317,7 @@ union OutboundType { /** External authentication configuration profile */ model ExternalAuthConfigProfile { /** This can be set during cluster creation only to ensure there is no openshift-oauth-apiserver in cluster */ - @visibility("create") + @visibility("create", "read") enabled?: boolean = false; /** This can only be set as a day-2 resource on a separate endpoint to provide a self-managed auth service */ @@ -370,10 +396,10 @@ model TokenClaimMappingsProfile { /** External auth claim profile */ model ClaimProfile { - /** Claim */ + /** Claim name of the external profile */ claim: string; - /** Prefix */ + /** Prefix for the claim external profile */ prefix: string; /** Prefix policy */ @@ -382,7 +408,7 @@ model ClaimProfile { /** External auth claim validation rule */ model TokenClaimValidationRuleProfile { - /** Claim */ + /** Claim name for the validation profile */ claim: string; /** Required value */ @@ -414,7 +440,7 @@ model IngressProfile { /** The visibility of the ingress * determines if the ingress is visible from the internet */ - @visibility("create") + @visibility("create", "read") visibility: Visibility; } @@ -437,7 +463,17 @@ model NodePoolProperties { provisioningState?: ResourceProvisioningState; /** The node pool resource specification */ - spec: NodePoolSpec; + spec?: NodePoolSpec; +} + +/** Represents the patchable node pool properties */ +model NodePoolPatchProperties { + /** Provisioning state */ + @visibility("read") + provisioningState?: ResourceProvisioningState; + + /** The node pool resource specification */ + spec?: NodePoolPatchSpec; } /** taintKey is the k8s valid key of the taint type on the nodepool nodes @@ -454,13 +490,6 @@ scalar taintKey extends string; @maxLength(63) scalar taintValue extends string; -/** labelValue is the k8s valid value of the label on the nodepool nodes - * The good example of the label value is `master` - */ -@minLength(1) -@maxLength(63) -scalar labelValue extends string; - /** The taint effect the same as in K8s */ union Effect { string, @@ -489,8 +518,8 @@ model NodePoolSpec { @visibility("create", "update") replicas?: int32; - /** Autorepair */ - @visibility("create") + /** Auto-repair */ + @visibility("create", "read") autoRepair?: boolean = false; /** Representation of a autoscaling in a node pool. */ @@ -503,7 +532,8 @@ model NodePoolSpec { */ #suppress "@azure-tools/typespec-azure-resource-manager/arm-no-record" "" @visibility("create", "update") - labels?: Record; + @OpenAPI.extension("x-ms-identifiers", ["key", "value"]) + labels?: Label[]; /** Taints for the nodes */ @visibility("create", "update") @@ -527,12 +557,56 @@ model NodePoolSpec { tuningConfigs?: string[]; } +/** Worker node pool profile */ +model NodePoolPatchSpec { + /** OpenShift version for the nodepool */ + @visibility("update") + version?: VersionProfile; + + /** The number of worker nodes, it cannot be used together with autoscaling */ + @visibility("update") + replicas?: int32; + + /** Representation of a autoscaling in a node pool. */ + autoScaling?: NodePoolAutoScaling; + + // This warning means to ensure good customer experience, to not create + // poorly defined types. However here the type literarly is the map + /** K8s labels to propagate to the NodePool Nodes + * The good example of the label is `node-role.kubernetes.io/master: ""` + */ + @visibility("update") + @OpenAPI.extension("x-ms-identifiers", ["key", "value"]) + labels?: Label[]; + + /** Taints for the nodes */ + @visibility("update") + @OpenAPI.extension("x-ms-identifiers", ["key", "value", "effect"]) + taints?: Taint[]; + + /* + * The Tuned API is defined here: + * - https://github.com/openshift/cluster-node-tuning-operator/blob/2c76314fb3cc8f12aef4a0dcd67ddc3677d5b54f/pkg/apis/tuned/v1/tuned_types.go + * + * The PerformanceProfile API is defined here: + * - https://github.com/openshift/cluster-node-tuning-operator/tree/b41042d42d4ba5bb2e99960248cf1d6ae4935018/pkg/apis/performanceprofile/v2 + */ + /** Tuning configs, TODO provide meaningful explanation + * TuningConfig is a list of references to ConfigMaps containing serialized + * Tuned resources to define the tuning configuration to be applied to + * nodes in the NodePool. + * Each ConfigMap must have a single key named "tuned" whose value is the + * JSON or YAML of a serialized Tuned or PerformanceProfile. + */ + tuningConfigs?: string[]; +} + /** Taint is controlling the node taint and its effects */ model Taint { /** The key of the taint * The good example of the taint key is `node-role.kubernetes.io/master` */ - key: taintKey; + key?: taintKey; /** The value of the taint * The good example of the taint value is `NoSchedule` @@ -542,7 +616,17 @@ model Taint { /** The effect of the taint * The good example of the taint effect is `NoSchedule` */ - effect: Effect; + effect?: Effect; +} + +/** Label represents the k8s label */ +// Key and value are both optional, so there is no need to redefine them for PATCH +model Label { + /** The key of the label */ + key?: string; + + /** The value of the label */ + value?: string; } /** Azure node pool platform configuration */ @@ -572,7 +656,7 @@ model NodePoolPlatformProfile { /** Whether the worker machines should be encrypted at host */ encryptionAtHost?: boolean; - /** Disk Encryption Set ID that will be used for ecnryption the Nodes disks + /** Disk Encryption Set ID that will be used for encryption the Nodes disks * - https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption-overview * - https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption */ @@ -586,11 +670,11 @@ model NodePoolPlatformProfile { model NodePoolAutoScaling { /** The minimum number of nodes in the node pool */ @minValue(0) - min: int32; + min?: int32; /** The maximum number of nodes in the node pool */ @minValue(0) - max: int32; + max?: int32; } /* diff --git a/api/redhatopenshift/HcpCluster/hcpCluster.tsp b/api/redhatopenshift/HcpCluster/hcpCluster.tsp index 88d477c8c..adca39a44 100644 --- a/api/redhatopenshift/HcpCluster/hcpCluster.tsp +++ b/api/redhatopenshift/HcpCluster/hcpCluster.tsp @@ -10,9 +10,7 @@ using TypeSpec.Http; using Azure.Core; using Azure.ResourceManager; -namespace Microsoft.RedHatOpenshift; - -interface Operations extends Azure.ResourceManager.Operations {} +namespace Microsoft.RedHatOpenShift; /** HCP cluster operations */ @armResourceOperations(HcpOpenShiftClusterResource) @@ -21,7 +19,7 @@ interface HcpOpenShiftClusters { createOrUpdate is ArmResourceCreateOrReplaceAsync; update is ArmResourcePatchAsync< HcpOpenShiftClusterResource, - HcpOpenShiftClusterProperties + HcpOpenShiftClusterPatchProperties >; delete is ArmResourceDeleteWithoutOkAsync; listByResourceGroup is ArmResourceListByParent; @@ -51,7 +49,7 @@ interface NodePools { createOrUpdate is ArmResourceCreateOrReplaceAsync; update is ArmResourcePatchAsync< HcpOpenShiftClusterNodePoolResource, - NodePoolSpec + NodePoolPatchProperties >; delete is ArmResourceDeleteWithoutOkAsync; listByParent is ArmResourceListByParent; diff --git a/api/redhatopenshift/HcpCluster/hcpVersions.tsp b/api/redhatopenshift/HcpCluster/hcpVersions.tsp index a5fa6465c..c68c3c5a9 100644 --- a/api/redhatopenshift/HcpCluster/hcpVersions.tsp +++ b/api/redhatopenshift/HcpCluster/hcpVersions.tsp @@ -8,11 +8,12 @@ using TypeSpec.Http; using Azure.Core; using Azure.ResourceManager; -namespace Microsoft.RedHatOpenshift; +namespace Microsoft.RedHatOpenShift; /** HcpOpenShiftVersions represents a location based available HCP cluster versions */ @locationResource -model HcpOpenShiftVersions is ProxyResource { +model HcpOpenShiftVersionResource + is ProxyResource { /** The name of the resource */ @pattern("^[a-zA-Z0-9-]{3,24}$") @segment("hcpOpenShiftVersions") @@ -31,7 +32,7 @@ model HcpOpenShiftVersionsProperties { clusterVersion: string; } -@armResourceOperations(HcpOpenShiftVersions) -interface HcpClusterVersionOperations { - list is ArmResourceListByParent; +@armResourceOperations(HcpOpenShiftVersionResource) +interface HcpClusterVersions { + list is ArmResourceListByParent; } diff --git a/api/redhatopenshift/HcpCluster/main.tsp b/api/redhatopenshift/HcpCluster/main.tsp index 2e5db4f6d..256d08ecc 100644 --- a/api/redhatopenshift/HcpCluster/main.tsp +++ b/api/redhatopenshift/HcpCluster/main.tsp @@ -1,16 +1,11 @@ -import "@typespec/http"; -import "@typespec/rest"; import "@typespec/versioning"; -import "@azure-tools/typespec-azure-core"; import "@azure-tools/typespec-azure-resource-manager"; import "./hcpCluster.tsp"; import "./hcpVersions.tsp"; using TypeSpec.Http; -using TypeSpec.Rest; using TypeSpec.Versioning; -using Azure.Core; using Azure.ResourceManager; /** Microsoft.RedHatOpenshift Resource Provider management API. */ @@ -18,8 +13,10 @@ using Azure.ResourceManager; @service({ title: "Microsoft.RedHatOpenshift management service", }) -@versioned(Microsoft.RedHatOpenshift.Versions) -namespace Microsoft.RedHatOpenshift; +@versioned(Microsoft.RedHatOpenShift.Versions) +namespace Microsoft.RedHatOpenShift; + +interface Operations extends Azure.ResourceManager.Operations {} /** The available API versions. */ enum Versions { diff --git a/api/redhatopenshift/HcpCluster/tspconfig.yaml b/api/redhatopenshift/HcpCluster/tspconfig.yaml index 95042b14e..711628562 100644 --- a/api/redhatopenshift/HcpCluster/tspconfig.yaml +++ b/api/redhatopenshift/HcpCluster/tspconfig.yaml @@ -1,13 +1,16 @@ --- emit: - - '@azure-tools/typespec-autorest' + - "@azure-tools/typespec-autorest" options: - '@azure-tools/typespec-autorest': + "@azure-tools/typespec-autorest": use-read-only-status-schema: true emitter-output-dir: "{project-root}/.." azure-resource-provider-folder: "resource-manager" - output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/openapi.json" + output-file: "{azure-resource-provider-folder}/{service-name}/hcpclusters/{version-status}/{version}/openapi.json" examples-directory: "{project-root}/examples" + omit-unreachable-types: true linter: extends: - - "@azure-tools/typespec-azure-resource-manager/all" + - "@azure-tools/typespec-azure-rulesets/resource-manager" + disable: + "@azure-tools/typespec-azure-resource-manager/arm-common-types-version": "New rule" diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json similarity index 75% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json index 635f459e6..13fba1bc7 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json @@ -1,6 +1,6 @@ { - "title": "HcpClusterVersionOperations_ListByLocation_Maximum", - "operationId": "HcpClusterVersionOperations_ListByLocation", + "title": "HcpClusterVersions_ListByLocation_Maximum", + "operationId": "HcpClusterVersions_ListByLocation", "parameters": { "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", @@ -15,7 +15,7 @@ "provisioningState": "Succeeded", "clusterVersion": "xkfddeiqkiqqkqzgnby" }, - "id": "pvhxaztlblmgvoyoeqczqf", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "mvugweyhywfyadmkhkzrlhoiscgfl", "type": "by", "systemData": { @@ -32,4 +32,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json new file mode 100644 index 000000000..9baf5e9d3 --- /dev/null +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json @@ -0,0 +1,20 @@ +{ + "title": "HcpClusterVersions_ListByLocation_Minimum", + "operationId": "HcpClusterVersions_ListByLocation", + "parameters": { + "api-version": "2024-06-10-preview", + "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", + "location": "pdtzymgwqsbxy" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName" + } + ] + } + } + } +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json similarity index 79% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json index df8c7eadf..2d36a2651 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_AdminCredentials_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json similarity index 82% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json index 8d1fa5ad6..ab5d432c4 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json @@ -5,23 +5,22 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", "resource": { "properties": { "spec": { "version": { - "id": "pvinporshxtqvnkr", - "channelGroup": "meqrztdrw" + "channelGroup": "stable", + "id": "4.12" }, "dns": { "baseDomainPrefix": "jcldjrtyebhrlxseuuhd" }, "network": { "networkType": "OVNKubernetes", - "podCidr": "hlfvrznsn", - "serviceCidr": "ittcodescilyiixnewchphuxxu", - "machineCidr": "cxglfwznjq", - "hostPrefix": 27 + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": {}, "api": { @@ -40,7 +39,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "externalAuth": { @@ -72,6 +71,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -80,7 +80,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -100,10 +103,10 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, - "issuerUrl": "pqfgpubcuaaovvpeqal", + "issuerUrl": "https://oidc.contoso.com", "externalAuth": { "externalAuths": [ { @@ -152,13 +155,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -166,7 +169,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -188,6 +191,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -196,7 +200,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -216,10 +223,10 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, - "issuerUrl": "pqfgpubcuaaovvpeqal", + "issuerUrl": "https://oidc.contoso.com", "externalAuth": { "externalAuths": [ { @@ -268,13 +275,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -282,7 +289,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -296,4 +303,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json similarity index 79% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json index 78876fe88..3b2223bc8 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Delete_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "202": { @@ -15,4 +15,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json similarity index 82% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json index b8fda9e5a..25000d80a 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { @@ -14,6 +14,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -22,7 +23,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -42,7 +46,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -94,13 +98,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -108,7 +112,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -122,4 +126,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json similarity index 75% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json index dadc33f48..b4d67a129 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_KubeConfig_MaximumSet_Gen.json @@ -5,11 +5,11 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { "body": {} } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json similarity index 84% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json index 26e4f70fa..5a747aee5 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json @@ -15,6 +15,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -23,7 +24,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -43,7 +47,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -95,13 +99,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -109,7 +113,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -126,4 +130,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json similarity index 84% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json index 00f0bdc46..461dd1dd8 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json @@ -14,6 +14,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -22,7 +23,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -42,7 +46,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -94,13 +98,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -108,7 +112,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -125,4 +129,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json similarity index 85% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json index 370909c42..fcc5d104b 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", "properties": { "identity": { "type": "None", @@ -21,7 +21,6 @@ "version": { "id": "nsj" }, - "dns": {}, "disableUserWorkloadMonitoring": true, "proxy": { "httpProxy": "sjjbjvkimlvtwdnwjodcajidcoompt", @@ -40,6 +39,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "fpjxf" ] @@ -48,7 +48,10 @@ "baseDomain": "yubrqcgqdhgqfkobjqm" }, "network": { - "networkType": "OVNKubernetes" + "networkType": "OVNKubernetes", + "podCidr": "10.128.0.0/14", + "serviceCidr": "172.30.0.0/16", + "machineCidr": "10.0.0.0/16" }, "console": { "url": "ejgtgwbbvjtmzfqvldg" @@ -68,7 +71,7 @@ "managedResourceGroup": "nhyhywrxupo", "subnetId": "kqujobzvoswldorx", "outboundType": "loadBalancer", - "preconfiguredNsgs": true, + "networkSecurityGroupId": "groupid", "etcdEncryptionSetId": "mrhumnvbsnnzduuhw" }, "issuerUrl": "pqfgpubcuaaovvpeqal", @@ -120,13 +123,13 @@ } }, "identity": { - "principalId": "xlswu", - "tenantId": "xfqisd", + "principalId": "00000000-0000-0000-0000-000000000000", + "tenantId": "00000000-0000-0000-0000-000000000000", "type": "None", "userAssignedIdentities": { "key4794": { - "principalId": "uctdckatfraombzrbkdltewc", - "clientId": "auud" + "principalId": "00000000-0000-0000-0000-000000000000", + "clientId": "00000000-0000-0000-0000-000000000000" } } }, @@ -134,7 +137,7 @@ "key4181": "leaswtidajsjtgmqawhdl" }, "location": "ayecbdqonsqfowbq", - "id": "xioeiro", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "vuwzuwooutjavgdhoatz", "type": "utiyj", "systemData": { @@ -153,4 +156,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json similarity index 78% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json index 02f7517a0..9c813b6ff 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_CreateOrUpdate_MaximumSet_Gen.json @@ -5,14 +5,14 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodePool-name", "resource": { "properties": { "spec": { "version": { - "id": "tbg", - "channelGroup": "rhhchgarryftdwzbadtwrzcbighms" + "channelGroup": "stable", + "id": "jlufyoivqzyxnqzwijozipxmgux" }, "platform": { "subnetId": "afapulyhvjjg", @@ -31,10 +31,17 @@ "max": 29 }, "labels": [ - "ufrvhxdwltr" + { + "key": "release", + "value": "4.12" + } ], "taints": [ - "yzmuazkxmfhksrjm" + { + "key": "iveofwsptzsxepyfirlfypshvkgzkpfdwrpreacacbcifrzpvmgmovnpmkeqxgvamtbwqfewlrnlcqcmbnqhdgvosyxazqxwtlcviveerkvdrveayeyvasngwjmrsnhyvmayzrndwahvuoocvbqjuscmybctzhrhbotipnrwhnkhejgiuanmidrdjetccddupjtvvztlbwlgdxgdwlhxdlluvcduh", + "value": "x", + "effect": "NoSchedule" + } ], "tuningConfigs": [ "m" @@ -54,8 +61,9 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ - "jlufyoivqzyxnqzwijozipxmgux" + "4.12" ] }, "platform": { @@ -81,7 +89,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -103,8 +111,9 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ - "jlufyoivqzyxnqzwijozipxmgux" + "4.12" ] }, "platform": { @@ -130,7 +139,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -144,4 +153,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json similarity index 65% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json index 63f971276..cd69202a7 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Delete_MaximumSet_Gen.json @@ -5,8 +5,8 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodePool-name" }, "responses": { "202": { @@ -16,4 +16,4 @@ }, "204": {} } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json similarity index 84% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json index 00422541f..286a35ee6 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Get_MaximumSet_Gen.json @@ -5,8 +5,8 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodepool-name" }, "responses": { "200": { @@ -15,6 +15,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "jlufyoivqzyxnqzwijozipxmgux" ] @@ -42,7 +43,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -56,4 +57,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json similarity index 88% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json index 5f29b864d..39249e34d 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_ListByHcpOpenShiftClusterResource_MaximumSet_Gen.json @@ -5,7 +5,7 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$" + "hcpOpenShiftClusterName": "hcpCluster-name" }, "responses": { "200": { @@ -16,6 +16,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "jlufyoivqzyxnqzwijozipxmgux" ] @@ -43,7 +44,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -60,4 +61,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json similarity index 61% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json index aad3b759a..c912f31eb 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/NodePools_Update_MaximumSet_Gen.json @@ -5,30 +5,45 @@ "api-version": "2024-06-10-preview", "subscriptionId": "F64FF5E2-2AD0-4E4D-A9D5-6E88511247A7", "resourceGroupName": "rgopenapi", - "hcpOpenShiftClusterName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", - "nodePoolName": "Replace this value with a string matching RegExp ^[a-zA-Z0-9-]{3,24}$", + "hcpOpenShiftClusterName": "hcpCluster-name", + "nodePoolName": "nodePool-name", "properties": { + "identity": { + "type": "None", + "userAssignedIdentities": { + "key4794": {} + } + }, "tags": { "key3313": "aciaohrpspozhrvwvbdtpqliezchbn" }, "properties": { - "version": { - "id": "chh" - }, - "replicas": 7, - "autoScaling": { - "min": 29, - "max": 2 - }, - "labels": [ - "qptpzhtgcqsofgvlahww" - ], - "taints": [ - "fzmckrigt" - ], - "tuningConfigs": [ - "dvoeaysltfusyb" - ] + "spec": { + "version": { + "id": "chh" + }, + "replicas": 7, + "autoScaling": { + "min": 29, + "max": 2 + }, + "labels": [ + { + "key": "release", + "value": "4.12" + } + ], + "taints": [ + { + "key": "iveofwsptzsxepyfirlfypshvkgzkpfdwrpreacacbcifrzpvmgmovnpmkeqxgvamtbwqfewlrnlcqcmbnqhdgvosyxazqxwtlcviveerkvdrveayeyvasngwjmrsnhyvmayzrndwahvuoocvbqjuscmybctzhrhbotipnrwhnkhejgiuanmidrdjetccddupjtvvztlbwlgdxgdwlhxdlluvcduh", + "value": "x", + "effect": "NoSchedule" + } + ], + "tuningConfigs": [ + "dvoeaysltfusyb" + ] + } } } }, @@ -39,6 +54,7 @@ "provisioningState": "Succeeded", "spec": { "version": { + "channelGroup": "stable", "availableUpgrades": [ "jlufyoivqzyxnqzwijozipxmgux" ] @@ -66,7 +82,7 @@ "key7212": "uufkzlwqnoxdfihpqz" }, "location": "mqewzbuvnyxnwbmir", - "id": "ogtjdgogxemijejkai", + "id": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/resourceType/resourceName", "name": "riywfucwvfwoepzliopnphdfjw", "type": "znmdhkzcopsephiyom", "systemData": { @@ -85,4 +101,4 @@ } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json similarity index 92% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json index d50ead77e..94e52932c 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/Operations_List_MaximumSet_Gen.json @@ -21,8 +21,8 @@ "actionType": "Internal" } ], - "nextLink": "mmxaxttmjsusvyx" + "nextLink": "https://microsoft.com/a" } } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json similarity index 98% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json index dbdbbc80e..259fe494f 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/examples/Operations_List_MinimumSet_Gen.json @@ -9,4 +9,4 @@ "body": {} } } -} \ No newline at end of file +} diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/openapi.json similarity index 83% rename from api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json rename to api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/openapi.json index d42f9115c..5065ea9cf 100644 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/openapi.json +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/preview/2024-06-10-preview/openapi.json @@ -49,11 +49,11 @@ "name": "NodePools" }, { - "name": "HcpClusterVersionOperations" + "name": "HcpClusterVersions" } ], "paths": { - "/providers/Microsoft.RedHatOpenshift/operations": { + "/providers/Microsoft.RedHatOpenShift/operations": { "get": { "operationId": "Operations_List", "tags": [ @@ -62,20 +62,20 @@ "description": "List the operations for the provider", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" } ], "responses": { "200": { "description": "Azure operation completed successfully.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/OperationListResult" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/OperationListResult" } }, "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -92,44 +92,44 @@ } } }, - "/subscriptions/{subscriptionId}/locations/{location}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftVersions": { + "/subscriptions/{subscriptionId}/locations/{location}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftVersions": { "get": { - "operationId": "HcpClusterVersionOperations_ListByLocation", + "operationId": "HcpClusterVersions_ListByLocation", "tags": [ - "HcpClusterVersionOperations" + "HcpClusterVersions" ], - "description": "List HcpOpenShiftVersions resources by location", + "description": "List HcpOpenShiftVersionResource resources by location", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/LocationParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/LocationParameter" } ], "responses": { "200": { "description": "Azure operation completed successfully.", "schema": { - "$ref": "#/definitions/HcpOpenShiftVersionsListResult" + "$ref": "#/definitions/HcpOpenShiftVersionResourceListResult" } }, "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, "x-ms-examples": { - "HcpClusterVersionOperations_ListByLocation_Maximum": { - "$ref": "./examples/HcpClusterVersionOperations_ListByLocation_MaximumSet_Gen.json" + "HcpClusterVersions_ListByLocation_Maximum": { + "$ref": "./examples/HcpClusterVersions_ListByLocation_MaximumSet_Gen.json" }, - "HcpClusterVersionOperations_ListByLocation_Minimum": { - "$ref": "./examples/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json" + "HcpClusterVersions_ListByLocation_Minimum": { + "$ref": "./examples/HcpClusterVersions_ListByLocation_MinimumSet_Gen.json" } }, "x-ms-pageable": { @@ -137,7 +137,7 @@ } } }, - "/subscriptions/{subscriptionId}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters": { + "/subscriptions/{subscriptionId}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters": { "get": { "operationId": "HcpOpenShiftClusters_ListBySubscription", "tags": [ @@ -146,10 +146,10 @@ "description": "List HcpOpenShiftClusterResource resources by subscription ID", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" } ], "responses": { @@ -162,7 +162,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -176,7 +176,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters": { "get": { "operationId": "HcpOpenShiftClusters_ListByResourceGroup", "tags": [ @@ -185,13 +185,13 @@ "description": "List HcpOpenShiftClusterResource resources by resource group", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" } ], "responses": { @@ -204,7 +204,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -218,7 +218,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}": { "get": { "operationId": "HcpOpenShiftClusters_Get", "tags": [ @@ -227,13 +227,13 @@ "description": "Get a HcpOpenShiftClusterResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -256,7 +256,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -274,13 +274,13 @@ "description": "Create a HcpOpenShiftClusterResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -325,7 +325,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -347,13 +347,13 @@ "description": "Update a HcpOpenShiftClusterResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -399,7 +399,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -421,13 +421,13 @@ "description": "Delete a HcpOpenShiftClusterResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -461,7 +461,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -476,7 +476,7 @@ "x-ms-long-running-operation": true } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/adminCredentials": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/adminCredentials": { "post": { "operationId": "HcpOpenShiftClusters_AdminCredentials", "tags": [ @@ -485,13 +485,13 @@ "description": "Returns the admin cluster credentials", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -514,7 +514,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -525,7 +525,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/kubeConfig": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/kubeConfig": { "post": { "operationId": "HcpOpenShiftClusters_KubeConfig", "tags": [ @@ -534,13 +534,13 @@ "description": "Return the kubeconfig for the cluster", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -563,7 +563,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -574,7 +574,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools": { "get": { "operationId": "NodePools_ListByHcpOpenShiftClusterResource", "tags": [ @@ -583,13 +583,13 @@ "description": "List HcpOpenShiftClusterNodePoolResource resources by HcpOpenShiftClusterResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -612,7 +612,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -626,7 +626,7 @@ } } }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}": { "get": { "operationId": "NodePools_Get", "tags": [ @@ -635,13 +635,13 @@ "description": "Get a HcpOpenShiftClusterNodePoolResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -674,7 +674,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -692,13 +692,13 @@ "description": "Create a HcpOpenShiftClusterNodePoolResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -753,7 +753,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -775,13 +775,13 @@ "description": "Update a HcpOpenShiftClusterNodePoolResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -837,7 +837,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -859,13 +859,13 @@ "description": "Delete a HcpOpenShiftClusterNodePoolResource", "parameters": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/parameters/ResourceGroupNameParameter" }, { "name": "hcpOpenShiftClusterName", @@ -909,7 +909,7 @@ "default": { "description": "An unexpected error response.", "schema": { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ErrorResponse" } } }, @@ -944,6 +944,7 @@ "$ref": "#/definitions/Visibility", "description": "should the API server be accessible from the internet", "x-ms-mutability": [ + "read", "create" ] } @@ -991,11 +992,11 @@ "properties": { "claim": { "type": "string", - "description": "Claim" + "description": "Claim name of the external profile" }, "prefix": { "type": "string", - "description": "Prefix" + "description": "Prefix for the claim external profile" }, "prefixPolicy": { "type": "string", @@ -1008,6 +1009,33 @@ "prefixPolicy" ] }, + "ClusterPatchSpec": { + "type": "object", + "description": "The patchable cluster specification", + "properties": { + "version": { + "$ref": "#/definitions/VersionProfileUpdate", + "description": "Version of the control plane components", + "x-ms-mutability": [ + "update" + ] + }, + "disableUserWorkloadMonitoring": { + "type": "boolean", + "description": "Disable user workload monitoring", + "x-ms-mutability": [ + "update" + ] + }, + "proxy": { + "$ref": "#/definitions/ProxyProfile", + "description": "Openshift cluster proxy configuration", + "x-ms-mutability": [ + "update" + ] + } + } + }, "ClusterSpec": { "type": "object", "description": "The cluster resource specification", @@ -1028,6 +1056,7 @@ "$ref": "#/definitions/NetworkProfile", "description": "Cluster network configuration", "x-ms-mutability": [ + "read", "create" ] }, @@ -1046,6 +1075,7 @@ "description": "Enable FIPS mode for the cluster\nWhen set to true, `etcdEncryption` must be set to true", "default": false, "x-ms-mutability": [ + "read", "create" ] }, @@ -1054,6 +1084,7 @@ "description": "Enables customer ETCD encryption, set during creation\nWhen set to true, `platform.etcdEncryptionSetId` must be set", "default": false, "x-ms-mutability": [ + "read", "create" ] }, @@ -1078,6 +1109,7 @@ "$ref": "#/definitions/PlatformProfile", "description": "Azure platform configuration", "x-ms-mutability": [ + "read", "create" ] }, @@ -1090,6 +1122,7 @@ "$ref": "#/definitions/ExternalAuthConfigProfile", "description": "Configuration to override the openshift-oauth-apiserver inside cluster\nThis changes user login into the cluster to external provider", "x-ms-mutability": [ + "read", "create" ] }, @@ -1105,6 +1138,7 @@ "visibility" ], "x-ms-mutability": [ + "read", "create" ] } @@ -1113,45 +1147,9 @@ "version", "console", "api", - "platform", "issuerUrl" ] }, - "ClusterSpecUpdate": { - "type": "object", - "description": "The cluster resource specification", - "properties": { - "version": { - "$ref": "#/definitions/VersionProfileUpdate", - "description": "Version of the control plane components", - "x-ms-mutability": [ - "update", - "create" - ] - }, - "dns": { - "$ref": "#/definitions/DnsProfileUpdate", - "description": "Cluster DNS configuration" - }, - "disableUserWorkloadMonitoring": { - "type": "boolean", - "description": "Disable user workload monitoring", - "default": false, - "x-ms-mutability": [ - "update", - "create" - ] - }, - "proxy": { - "$ref": "#/definitions/ProxyProfile", - "description": "Openshift cluster proxy configuration", - "x-ms-mutability": [ - "update", - "create" - ] - } - } - }, "ConsoleProfile": { "type": "object", "description": "Configuration of the cluster web console", @@ -1179,18 +1177,11 @@ "type": "string", "description": "BaseDomainPrefix is the unique name of the cluster representing the OpenShift's cluster name.\nBaseDomainPrefix is the name that will appear in the cluster's DNS, provisioned cloud providers resources", "x-ms-mutability": [ + "read", "create" ] } - }, - "required": [ - "baseDomain", - "baseDomainPrefix" - ] - }, - "DnsProfileUpdate": { - "type": "object", - "description": "DNS contains the DNS settings of the cluster" + } }, "Effect": { "type": "string", @@ -1307,6 +1298,7 @@ "description": "This can be set during cluster creation only to ensure there is no openshift-oauth-apiserver in cluster", "default": false, "x-ms-mutability": [ + "read", "create" ] }, @@ -1404,11 +1396,15 @@ "read", "create" ] + }, + "identity": { + "$ref": "../../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity", + "description": "The managed service identities assigned to this resource." } }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource" } ] }, @@ -1437,6 +1433,10 @@ "type": "object", "description": "The type used for update operations of the HcpOpenShiftClusterNodePoolResource.", "properties": { + "identity": { + "$ref": "../../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity", + "description": "The managed service identities assigned to this resource." + }, "tags": { "type": "object", "description": "Resource tags.", @@ -1454,60 +1454,9 @@ "type": "object", "description": "The updatable properties of the HcpOpenShiftClusterNodePoolResource.", "properties": { - "version": { - "$ref": "#/definitions/VersionProfileUpdate", - "description": "OpenShift version for the nodepool", - "x-ms-mutability": [ - "update", - "create" - ] - }, - "replicas": { - "type": "integer", - "format": "int32", - "description": "The number of worker nodes, it cannot be used together with autoscaling", - "x-ms-mutability": [ - "update", - "create" - ] - }, - "autoScaling": { - "$ref": "#/definitions/NodePoolAutoScalingUpdate", - "description": "Representation of a autoscaling in a node pool." - }, - "labels": { - "type": "object", - "description": "K8s labels to propagate to the NodePool Nodes\nThe good example of the label is `node-role.kubernetes.io/master: \"\"`", - "additionalProperties": { - "$ref": "#/definitions/labelValue" - }, - "x-ms-mutability": [ - "update", - "create" - ] - }, - "taints": { - "type": "array", - "description": "Taints for the nodes", - "items": { - "$ref": "#/definitions/Taint" - }, - "x-ms-identifiers": [ - "key", - "value", - "effect" - ], - "x-ms-mutability": [ - "update", - "create" - ] - }, - "tuningConfigs": { - "type": "array", - "description": "Tuning configs, TODO provide meaningful explanation\nTuningConfig is a list of references to ConfigMaps containing serialized\nTuned resources to define the tuning configuration to be applied to\nnodes in the NodePool.\nEach ConfigMap must have a single key named \"tuned\" whose value is the\nJSON or YAML of a serialized Tuned or PerformanceProfile.", - "items": { - "type": "string" - } + "spec": { + "$ref": "#/definitions/NodePoolPatchSpec", + "description": "The node pool resource specification" } } }, @@ -1522,16 +1471,9 @@ }, "spec": { "$ref": "#/definitions/ClusterSpec", - "description": "The cluster resouce specification.", - "x-ms-mutability": [ - "update", - "create" - ] + "description": "The cluster resource specification." } - }, - "required": [ - "spec" - ] + } }, "HcpOpenShiftClusterResource": { "type": "object", @@ -1547,13 +1489,13 @@ ] }, "identity": { - "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity", + "$ref": "../../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity", "description": "The managed service identities assigned to this resource." } }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/TrackedResource" } ] }, @@ -1583,7 +1525,7 @@ "description": "The type used for update operations of the HcpOpenShiftClusterResource.", "properties": { "identity": { - "$ref": "../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity", + "$ref": "../../../../../../common-types/resource-management/v5/managedidentity.json#/definitions/ManagedServiceIdentity", "description": "The managed service identities assigned to this resource." }, "tags": { @@ -1604,16 +1546,12 @@ "description": "The updatable properties of the HcpOpenShiftClusterResource.", "properties": { "spec": { - "$ref": "#/definitions/ClusterSpecUpdate", - "description": "The cluster resouce specification.", - "x-ms-mutability": [ - "update", - "create" - ] + "$ref": "#/definitions/ClusterPatchSpec", + "description": "The cluster resource specification." } } }, - "HcpOpenShiftVersions": { + "HcpOpenShiftVersionResource": { "type": "object", "description": "HcpOpenShiftVersions represents a location based available HCP cluster versions", "properties": { @@ -1629,19 +1567,19 @@ }, "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource" + "$ref": "../../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource" } ] }, - "HcpOpenShiftVersionsListResult": { + "HcpOpenShiftVersionResourceListResult": { "type": "object", - "description": "The response of a HcpOpenShiftVersions list operation.", + "description": "The response of a HcpOpenShiftVersionResource list operation.", "properties": { "value": { "type": "array", - "description": "The HcpOpenShiftVersions items on this page", + "description": "The HcpOpenShiftVersionResource items on this page", "items": { - "$ref": "#/definitions/HcpOpenShiftVersions" + "$ref": "#/definitions/HcpOpenShiftVersionResource" } }, "nextLink": { @@ -1691,6 +1629,7 @@ "$ref": "#/definitions/Visibility", "description": "The visibility of the ingress\ndetermines if the ingress is visible from the internet", "x-ms-mutability": [ + "read", "create" ] } @@ -1701,6 +1640,20 @@ "visibility" ] }, + "Label": { + "type": "object", + "description": "Label represents the k8s label", + "properties": { + "key": { + "type": "string", + "description": "The key of the label" + }, + "value": { + "type": "string", + "description": "The value of the label" + } + } + }, "NetworkProfile": { "type": "object", "description": "Network profile of the cluster", @@ -1730,6 +1683,7 @@ ] }, "x-ms-mutability": [ + "read", "create" ] }, @@ -1737,6 +1691,7 @@ "type": "string", "description": "The CIDR of the pod IP addresses\nexample: 10.128.0.0/14", "x-ms-mutability": [ + "read", "create" ] }, @@ -1744,6 +1699,7 @@ "type": "string", "description": "The CIDR block for assigned service IPs,\nexample: 172.30.0.0/16", "x-ms-mutability": [ + "read", "create" ] }, @@ -1751,6 +1707,7 @@ "type": "string", "description": "from which to assign machine IP addresses,\nexample: 10.0.0.0/16", "x-ms-mutability": [ + "read", "create" ] }, @@ -1760,6 +1717,7 @@ "description": "Network host prefix which is defaulted to 23 if not specified.", "default": 23, "x-ms-mutability": [ + "read", "create" ] } @@ -1770,30 +1728,6 @@ "machineCidr" ] }, - "NetworkType": { - "type": "string", - "description": "The cluster network type", - "enum": [ - "OVNKubernetes", - "Other" - ], - "x-ms-enum": { - "name": "NetworkType", - "modelAsString": true, - "values": [ - { - "name": "OVNKubernetes", - "value": "OVNKubernetes", - "description": "THE OVN network plugin for the OpenShift cluster" - }, - { - "name": "Other", - "value": "Other", - "description": "Other network plugins" - } - ] - } - }, "NodePoolAutoScaling": { "type": "object", "description": "Node pool autoscaling", @@ -1810,27 +1744,66 @@ "description": "The maximum number of nodes in the node pool", "minimum": 0 } - }, - "required": [ - "min", - "max" - ] + } }, - "NodePoolAutoScalingUpdate": { + "NodePoolPatchSpec": { "type": "object", - "description": "Node pool autoscaling", + "description": "Worker node pool profile", "properties": { - "min": { - "type": "integer", - "format": "int32", - "description": "The minimum number of nodes in the node pool", - "minimum": 0 + "version": { + "$ref": "#/definitions/VersionProfileUpdate", + "description": "OpenShift version for the nodepool", + "x-ms-mutability": [ + "update" + ] }, - "max": { + "replicas": { "type": "integer", "format": "int32", - "description": "The maximum number of nodes in the node pool", - "minimum": 0 + "description": "The number of worker nodes, it cannot be used together with autoscaling", + "x-ms-mutability": [ + "update" + ] + }, + "autoScaling": { + "$ref": "#/definitions/NodePoolAutoScaling", + "description": "Representation of a autoscaling in a node pool." + }, + "labels": { + "type": "array", + "description": "K8s labels to propagate to the NodePool Nodes\nThe good example of the label is `node-role.kubernetes.io/master: \"\"`", + "items": { + "$ref": "#/definitions/Label" + }, + "x-ms-identifiers": [ + "key", + "value" + ], + "x-ms-mutability": [ + "update" + ] + }, + "taints": { + "type": "array", + "description": "Taints for the nodes", + "items": { + "$ref": "#/definitions/Taint" + }, + "x-ms-identifiers": [ + "key", + "value", + "effect" + ], + "x-ms-mutability": [ + "update" + ] + }, + "tuningConfigs": { + "type": "array", + "description": "Tuning configs, TODO provide meaningful explanation\nTuningConfig is a list of references to ConfigMaps containing serialized\nTuned resources to define the tuning configuration to be applied to\nnodes in the NodePool.\nEach ConfigMap must have a single key named \"tuned\" whose value is the\nJSON or YAML of a serialized Tuned or PerformanceProfile.", + "items": { + "type": "string" + } } } }, @@ -1865,7 +1838,7 @@ }, "discEncryptionSetId": { "type": "string", - "description": "Disk Encryption Set ID that will be used for ecnryption the Nodes disks\n- https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption-overview\n- https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption" + "description": "Disk Encryption Set ID that will be used for encryption the Nodes disks\n- https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption-overview\n- https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption" }, "ephemeralOsDisk": { "type": "boolean", @@ -1890,10 +1863,7 @@ "$ref": "#/definitions/NodePoolSpec", "description": "The node pool resource specification" } - }, - "required": [ - "spec" - ] + } }, "NodePoolSpec": { "type": "object", @@ -1925,9 +1895,10 @@ }, "autoRepair": { "type": "boolean", - "description": "Autorepair", + "description": "Auto-repair", "default": false, "x-ms-mutability": [ + "read", "create" ] }, @@ -1936,11 +1907,15 @@ "description": "Representation of a autoscaling in a node pool." }, "labels": { - "type": "object", + "type": "array", "description": "K8s labels to propagate to the NodePool Nodes\nThe good example of the label is `node-role.kubernetes.io/master: \"\"`", - "additionalProperties": { - "$ref": "#/definitions/labelValue" + "items": { + "$ref": "#/definitions/Label" }, + "x-ms-identifiers": [ + "key", + "value" + ], "x-ms-mutability": [ "update", "create" @@ -1975,24 +1950,6 @@ "platform" ] }, - "OutboundType": { - "type": "string", - "description": "The outbound routing strategy used to provide your cluster egress to the internet.", - "enum": [ - "loadBalancer" - ], - "x-ms-enum": { - "name": "OutboundType", - "modelAsString": true, - "values": [ - { - "name": "loadBalancer", - "value": "loadBalancer", - "description": "The loadbalancer configuration" - } - ] - } - }, "PlatformProfile": { "type": "object", "description": "Azure specific configuration", @@ -2108,11 +2065,7 @@ "$ref": "#/definitions/Effect", "description": "The effect of the taint\nThe good example of the taint effect is `NoSchedule`" } - }, - "required": [ - "key", - "effect" - ] + } }, "TokenClaimMappingsProfile": { "type": "object", @@ -2138,7 +2091,7 @@ "properties": { "claim": { "type": "string", - "description": "Claim" + "description": "Claim name for the validation profile" }, "requiredValue": { "type": "string", @@ -2192,6 +2145,7 @@ "type": "string", "description": "ChannelGroup is the name of the set to which this version belongs. Each version belongs to only a single set.", "x-ms-mutability": [ + "read", "create" ] }, @@ -2248,12 +2202,6 @@ ] } }, - "labelValue": { - "type": "string", - "description": "labelValue is the k8s valid value of the label on the nodepool nodes\nThe good example of the label value is `master`", - "minLength": 1, - "maxLength": 63 - }, "taintKey": { "type": "string", "description": "taintKey is the k8s valid key of the taint type on the nodepool nodes\nThe good example of the taint key is `node-role.kubernetes.io/master`", diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.go.md b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.go.md new file mode 100644 index 000000000..dd4fb859f --- /dev/null +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.go.md @@ -0,0 +1,34 @@ +## Go + +These settings apply only when `--go` is specified on the command line. + +``` yaml $(go) && !$(track2) +go: + license-header: MICROSOFT_MIT_NO_VERSION + namespace: redhatopenshift + clear-output-folder: true +``` + +``` yaml $(go) && $(track2) +license-header: MICROSOFT_MIT_NO_VERSION +module-name: sdk/resourcemanager/redhatopenshifthcp/armredhatopenshifthcp +module: github.com/Azure/azure-sdk-for-go/$(module-name) +output-folder: $(go-sdk-folder)/$(module-name) +azure-arm: true +``` + +### Go multi-api + +``` yaml $(go) && $(multiapi) +batch: + - tag: package-2024-06-10-preview +``` + +### Tag: 2024-06-10-preview and go + +These settings apply only when `--tag=package-2020-04-30 --go` is specified on the command line. +Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == '2024-06-10-preview' && $(go) +output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2024-06-10-preview/$(namespace) +``` \ No newline at end of file diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.md b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.md new file mode 100644 index 000000000..4e7678944 --- /dev/null +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.md @@ -0,0 +1,76 @@ +# RedHatOpenshift HCP Clusters + +> see https://aka.ms/autorest + + +## This is the autorest configuration file for RedHatOpenshift HCP Clusters. + +The service is hosted under Microsoft.RedHatOpenshift namespace but HCP is exposed +as a separarate set of resources, APIs and SDKs. + +## Getting Started + +To build the SDK for ContainerServices, [install Autorest](https://aka.ms/autorest/install). Then +in this folder, run this command: + +> `autorest` + +To see additional help and options, run: + +> `autorest --help` + +--- + +## Configuration + +### Basic Information + +These are the global settings for the ContainerServices API. + +``` yaml +openapi-type: arm +tag: package-2024-06-10-preview +``` + +### Tag: package-2024-06-10-preview + +These settings apply only when `--tag=package-2024-06-10-preview` is specified on the command line. + +``` yaml $(tag) == 'package-2024-06-10-preview' +input-file: + - preview/2024-06-10-preview/openapi.json +``` + +# Code Generation + +## Swagger to SDK + +This section describes what SDK should be generated by the automatic system. +This is not used by Autorest itself. + +``` yaml $(swagger-to-sdk) +swagger-to-sdk: + - repo: azure-sdk-for-python + - repo: azure-sdk-for-go + - repo: azure-resource-manager-schemas + - repo: azure-powershell +``` + +## Suppression + +### AutoRest v3 Suppressions +``` yaml +suppressions: + - code: PatchBodyParametersSchema + reasons: false positives + # https://github.com/Azure/azure-sdk-tools/issues/7802 +``` + + +## Go + +See configuration in [readme.go.md](./readme.go.md) + +## Python + +See configuration in [readme.python.md](./readme.python.md) \ No newline at end of file diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.python.md b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.python.md new file mode 100644 index 000000000..bfe0463a9 --- /dev/null +++ b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/hcpclusters/readme.python.md @@ -0,0 +1,34 @@ +## Python + +These settings apply only when `--python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(python) +title: RedHatOpenShiftHcpMgmtClient +azure-arm: true +license-header: MICROSOFT_MIT_NO_VERSION +package-name: azure-mgmt-redhatopenshifthcp +namespace: azure.mgmt.redhatopenshifthcp +package-version: 1.0.0b1 +clear-output-folder: true +``` + +``` yaml $(python) +no-namespace-folders: true +output-folder: $(python-sdks-folder)/redhatopenshifthcp/azure-mgmt-redhatopenshifthcp/azure/mgmt/redhatopenshifthcp +``` + +``` yaml $(python) +modelerfour: + flatten-models: false +``` + +### Tag: package-2024-06-10-preview and python + +These settings apply only when `--tag=package-2024-06-10-preview --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2024-06-10-preview' && $(python) +namespace: azure.mgmt.redhatopenshifthcp.v2024_06_10_preview +output-folder: $(python-sdks-folder)/redhatopenshifthcp/azure-mgmt-redhatopenshifthcp/azure/mgmt/redhatopenshifthcp/v2024_06_10_preview +``` \ No newline at end of file diff --git a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json b/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json deleted file mode 100644 index 7dde06591..000000000 --- a/api/redhatopenshift/resource-manager/Microsoft.RedHatOpenshift/preview/2024-06-10-preview/examples/HcpClusterVersionOperations_ListByLocation_MinimumSet_Gen.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "title": "HcpClusterVersionOperations_ListByLocation_Minimum", - "operationId": "HcpClusterVersionOperations_ListByLocation", - "parameters": { - "api-version": "2024-06-10-preview", - "subscriptionId": "FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D", - "location": "pdtzymgwqsbxy" - }, - "responses": { - "200": { - "body": { - "value": [ - {} - ] - } - } - } -} \ No newline at end of file diff --git a/internal/api/v20240610preview/generated/client_factory.go b/internal/api/v20240610preview/generated/client_factory.go index 3f6e0b1b9..01eba6be1 100644 --- a/internal/api/v20240610preview/generated/client_factory.go +++ b/internal/api/v20240610preview/generated/client_factory.go @@ -35,9 +35,9 @@ func NewClientFactory(subscriptionID string, credential azcore.TokenCredential, }, nil } -// NewHcpClusterVersionOperationsClient creates a new instance of HcpClusterVersionOperationsClient. -func (c *ClientFactory) NewHcpClusterVersionOperationsClient() *HcpClusterVersionOperationsClient { - return &HcpClusterVersionOperationsClient{ +// NewHcpClusterVersionsClient creates a new instance of HcpClusterVersionsClient. +func (c *ClientFactory) NewHcpClusterVersionsClient() *HcpClusterVersionsClient { + return &HcpClusterVersionsClient{ subscriptionID: c.subscriptionID, internal: c.internal, } diff --git a/internal/api/v20240610preview/generated/constants.go b/internal/api/v20240610preview/generated/constants.go index 4de23a61b..6e836602a 100644 --- a/internal/api/v20240610preview/generated/constants.go +++ b/internal/api/v20240610preview/generated/constants.go @@ -124,7 +124,7 @@ func PossibleOriginValues() []Origin { } } -// OutboundType - The outbound routing strategy used to provide your cluster egress to the internet. +// OutboundType - The core outgoing configuration type OutboundType string const ( diff --git a/internal/api/v20240610preview/generated/fake/hcpclusterversions_server.go b/internal/api/v20240610preview/generated/fake/hcpclusterversions_server.go new file mode 100644 index 000000000..07ab66b09 --- /dev/null +++ b/internal/api/v20240610preview/generated/fake/hcpclusterversions_server.go @@ -0,0 +1,109 @@ +//go:build go1.18 +// +build go1.18 + +// Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/go@4.0.0-preview.63) +// Changes may cause incorrect behavior and will be lost if the code is regenerated. +// Code generated by @autorest/go. DO NOT EDIT. + +package fake + +import ( + "errors" + "fmt" + "github.com/Azure/ARO-HCP/internal/api/v20240610preview/generated" + azfake "github.com/Azure/azure-sdk-for-go/sdk/azcore/fake" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/fake/server" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" + "net/http" + "net/url" + "regexp" +) + +// HcpClusterVersionsServer is a fake server for instances of the generated.HcpClusterVersionsClient type. +type HcpClusterVersionsServer struct{ + // NewListByLocationPager is the fake for method HcpClusterVersionsClient.NewListByLocationPager + // HTTP status codes to indicate success: http.StatusOK + NewListByLocationPager func(location string, options *generated.HcpClusterVersionsClientListByLocationOptions) (resp azfake.PagerResponder[generated.HcpClusterVersionsClientListByLocationResponse]) + +} + +// NewHcpClusterVersionsServerTransport creates a new instance of HcpClusterVersionsServerTransport with the provided implementation. +// The returned HcpClusterVersionsServerTransport instance is connected to an instance of generated.HcpClusterVersionsClient via the +// azcore.ClientOptions.Transporter field in the client's constructor parameters. +func NewHcpClusterVersionsServerTransport(srv *HcpClusterVersionsServer) *HcpClusterVersionsServerTransport { + return &HcpClusterVersionsServerTransport{ + srv: srv, + newListByLocationPager: newTracker[azfake.PagerResponder[generated.HcpClusterVersionsClientListByLocationResponse]](), + } +} + +// HcpClusterVersionsServerTransport connects instances of generated.HcpClusterVersionsClient to instances of HcpClusterVersionsServer. +// Don't use this type directly, use NewHcpClusterVersionsServerTransport instead. +type HcpClusterVersionsServerTransport struct { + srv *HcpClusterVersionsServer + newListByLocationPager *tracker[azfake.PagerResponder[generated.HcpClusterVersionsClientListByLocationResponse]] +} + +// Do implements the policy.Transporter interface for HcpClusterVersionsServerTransport. +func (h *HcpClusterVersionsServerTransport) Do(req *http.Request) (*http.Response, error) { + rawMethod := req.Context().Value(runtime.CtxAPINameKey{}) + method, ok := rawMethod.(string) + if !ok { + return nil, nonRetriableError{errors.New("unable to dispatch request, missing value for CtxAPINameKey")} + } + + var resp *http.Response + var err error + + switch method { + case "HcpClusterVersionsClient.NewListByLocationPager": + resp, err = h.dispatchNewListByLocationPager(req) + default: + err = fmt.Errorf("unhandled API %s", method) + } + + if err != nil { + return nil, err + } + + return resp, nil +} + +func (h *HcpClusterVersionsServerTransport) dispatchNewListByLocationPager(req *http.Request) (*http.Response, error) { + if h.srv.NewListByLocationPager == nil { + return nil, &nonRetriableError{errors.New("fake for method NewListByLocationPager not implemented")} + } + newListByLocationPager := h.newListByLocationPager.get(req) + if newListByLocationPager == nil { + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/locations/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftVersions` + regex := regexp.MustCompile(regexStr) + matches := regex.FindStringSubmatch(req.URL.EscapedPath()) + if matches == nil || len(matches) < 2 { + return nil, fmt.Errorf("failed to parse path %s", req.URL.Path) + } + locationParam, err := url.PathUnescape(matches[regex.SubexpIndex("location")]) + if err != nil { + return nil, err + } +resp := h.srv.NewListByLocationPager(locationParam, nil) + newListByLocationPager = &resp + h.newListByLocationPager.add(req, newListByLocationPager) + server.PagerResponderInjectNextLinks(newListByLocationPager, req, func(page *generated.HcpClusterVersionsClientListByLocationResponse, createLink func() string) { + page.NextLink = to.Ptr(createLink()) + }) + } + resp, err := server.PagerResponderNext(newListByLocationPager, req) + if err != nil { + return nil, err + } + if !contains([]int{http.StatusOK}, resp.StatusCode) { + h.newListByLocationPager.remove(req) + return nil, &nonRetriableError{fmt.Errorf("unexpected status code %d. acceptable values are http.StatusOK", resp.StatusCode)} + } + if !server.PagerResponderMore(newListByLocationPager) { + h.newListByLocationPager.remove(req) + } + return resp, nil +} + diff --git a/internal/api/v20240610preview/generated/fake/hcpopenshiftclusters_server.go b/internal/api/v20240610preview/generated/fake/hcpopenshiftclusters_server.go index 738b45218..339733306 100644 --- a/internal/api/v20240610preview/generated/fake/hcpopenshiftclusters_server.go +++ b/internal/api/v20240610preview/generated/fake/hcpopenshiftclusters_server.go @@ -125,7 +125,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchAdminCredentials(req *http if h.srv.AdminCredentials == nil { return nil, &nonRetriableError{errors.New("fake for method AdminCredentials not implemented")} } - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/adminCredentials` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/adminCredentials` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { @@ -160,7 +160,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchBeginCreateOrUpdate(req *h } beginCreateOrUpdate := h.beginCreateOrUpdate.get(req) if beginCreateOrUpdate == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { @@ -208,7 +208,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchBeginDelete(req *http.Requ } beginDelete := h.beginDelete.get(req) if beginDelete == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { @@ -250,7 +250,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchGet(req *http.Request) (*h if h.srv.Get == nil { return nil, &nonRetriableError{errors.New("fake for method Get not implemented")} } - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { @@ -283,7 +283,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchKubeConfig(req *http.Reque if h.srv.KubeConfig == nil { return nil, &nonRetriableError{errors.New("fake for method KubeConfig not implemented")} } - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/kubeConfig` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/kubeConfig` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { @@ -318,7 +318,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchNewListByResourceGroupPage } newListByResourceGroupPager := h.newListByResourceGroupPager.get(req) if newListByResourceGroupPager == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 2 { @@ -355,7 +355,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchNewListBySubscriptionPager } newListBySubscriptionPager := h.newListBySubscriptionPager.get(req) if newListBySubscriptionPager == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 1 { @@ -388,7 +388,7 @@ func (h *HcpOpenShiftClustersServerTransport) dispatchBeginUpdate(req *http.Requ } beginUpdate := h.beginUpdate.get(req) if beginUpdate == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { diff --git a/internal/api/v20240610preview/generated/fake/nodepools_server.go b/internal/api/v20240610preview/generated/fake/nodepools_server.go index 8626aa8fd..3f441387f 100644 --- a/internal/api/v20240610preview/generated/fake/nodepools_server.go +++ b/internal/api/v20240610preview/generated/fake/nodepools_server.go @@ -107,7 +107,7 @@ func (n *NodePoolsServerTransport) dispatchBeginCreateOrUpdate(req *http.Request } beginCreateOrUpdate := n.beginCreateOrUpdate.get(req) if beginCreateOrUpdate == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 4 { @@ -159,7 +159,7 @@ func (n *NodePoolsServerTransport) dispatchBeginDelete(req *http.Request) (*http } beginDelete := n.beginDelete.get(req) if beginDelete == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 4 { @@ -205,7 +205,7 @@ func (n *NodePoolsServerTransport) dispatchGet(req *http.Request) (*http.Respons if n.srv.Get == nil { return nil, &nonRetriableError{errors.New("fake for method Get not implemented")} } - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 4 { @@ -244,7 +244,7 @@ func (n *NodePoolsServerTransport) dispatchNewListByHcpOpenShiftClusterResourceP } newListByHcpOpenShiftClusterResourcePager := n.newListByHcpOpenShiftClusterResourcePager.get(req) if newListByHcpOpenShiftClusterResourcePager == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 3 { @@ -285,7 +285,7 @@ func (n *NodePoolsServerTransport) dispatchBeginUpdate(req *http.Request) (*http } beginUpdate := n.beginUpdate.get(req) if beginUpdate == nil { - const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenshift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` + const regexStr = `/subscriptions/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/resourceGroups/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/providers/Microsoft\.RedHatOpenShift/hcpOpenShiftClusters/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)/nodePools/(?P[!#&$-;=?-\[\]_a-zA-Z0-9~%@]+)` regex := regexp.MustCompile(regexStr) matches := regex.FindStringSubmatch(req.URL.EscapedPath()) if matches == nil || len(matches) < 4 { diff --git a/internal/api/v20240610preview/generated/fake/server_factory.go b/internal/api/v20240610preview/generated/fake/server_factory.go index 5e7b435b5..2f005670c 100644 --- a/internal/api/v20240610preview/generated/fake/server_factory.go +++ b/internal/api/v20240610preview/generated/fake/server_factory.go @@ -18,7 +18,7 @@ import ( // ServerFactory is a fake server for instances of the generated.ClientFactory type. type ServerFactory struct { - HcpClusterVersionOperationsServer HcpClusterVersionOperationsServer + HcpClusterVersionsServer HcpClusterVersionsServer HcpOpenShiftClustersServer HcpOpenShiftClustersServer NodePoolsServer NodePoolsServer OperationsServer OperationsServer @@ -38,7 +38,7 @@ func NewServerFactoryTransport(srv *ServerFactory) *ServerFactoryTransport { type ServerFactoryTransport struct { srv *ServerFactory trMu sync.Mutex - trHcpClusterVersionOperationsServer *HcpClusterVersionOperationsServerTransport + trHcpClusterVersionsServer *HcpClusterVersionsServerTransport trHcpOpenShiftClustersServer *HcpOpenShiftClustersServerTransport trNodePoolsServer *NodePoolsServerTransport trOperationsServer *OperationsServerTransport @@ -57,9 +57,9 @@ func (s *ServerFactoryTransport) Do(req *http.Request) (*http.Response, error) { var err error switch client { - case "HcpClusterVersionOperationsClient": - initServer(s, &s.trHcpClusterVersionOperationsServer, func() *HcpClusterVersionOperationsServerTransport { return NewHcpClusterVersionOperationsServerTransport(&s.srv.HcpClusterVersionOperationsServer) }) - resp, err = s.trHcpClusterVersionOperationsServer.Do(req) + case "HcpClusterVersionsClient": + initServer(s, &s.trHcpClusterVersionsServer, func() *HcpClusterVersionsServerTransport { return NewHcpClusterVersionsServerTransport(&s.srv.HcpClusterVersionsServer) }) + resp, err = s.trHcpClusterVersionsServer.Do(req) case "HcpOpenShiftClustersClient": initServer(s, &s.trHcpOpenShiftClustersServer, func() *HcpOpenShiftClustersServerTransport { return NewHcpOpenShiftClustersServerTransport(&s.srv.HcpOpenShiftClustersServer) }) resp, err = s.trHcpOpenShiftClustersServer.Do(req) diff --git a/internal/api/v20240610preview/generated/hcpclusterversions_client.go b/internal/api/v20240610preview/generated/hcpclusterversions_client.go new file mode 100644 index 000000000..26cfbbf42 --- /dev/null +++ b/internal/api/v20240610preview/generated/hcpclusterversions_client.go @@ -0,0 +1,104 @@ +//go:build go1.18 +// +build go1.18 + +// Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/go@4.0.0-preview.63) +// Changes may cause incorrect behavior and will be lost if the code is regenerated. +// Code generated by @autorest/go. DO NOT EDIT. + +package generated + +import ( + "context" + "errors" + "github.com/Azure/azure-sdk-for-go/sdk/azcore" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" + "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" + "net/http" + "net/url" + "strings" +) + +// HcpClusterVersionsClient contains the methods for the HcpClusterVersions group. +// Don't use this type directly, use NewHcpClusterVersionsClient() instead. +type HcpClusterVersionsClient struct { + internal *arm.Client + subscriptionID string +} + +// NewHcpClusterVersionsClient creates a new instance of HcpClusterVersionsClient with the specified values. +// - subscriptionID - The ID of the target subscription. The value must be an UUID. +// - credential - used to authorize requests. Usually a credential from azidentity. +// - options - pass nil to accept the default values. +func NewHcpClusterVersionsClient(subscriptionID string, credential azcore.TokenCredential, options *arm.ClientOptions) (*HcpClusterVersionsClient, error) { + cl, err := arm.NewClient(moduleName, moduleVersion, credential, options) + if err != nil { + return nil, err + } + client := &HcpClusterVersionsClient{ + subscriptionID: subscriptionID, + internal: cl, + } + return client, nil +} + +// NewListByLocationPager - List HcpOpenShiftVersionResource resources by location +// +// Generated from API version 2024-06-10-preview +// - location - The name of the Azure region. +// - options - HcpClusterVersionsClientListByLocationOptions contains the optional parameters for the HcpClusterVersionsClient.NewListByLocationPager +// method. +func (client *HcpClusterVersionsClient) NewListByLocationPager(location string, options *HcpClusterVersionsClientListByLocationOptions) (*runtime.Pager[HcpClusterVersionsClientListByLocationResponse]) { + return runtime.NewPager(runtime.PagingHandler[HcpClusterVersionsClientListByLocationResponse]{ + More: func(page HcpClusterVersionsClientListByLocationResponse) bool { + return page.NextLink != nil && len(*page.NextLink) > 0 + }, + Fetcher: func(ctx context.Context, page *HcpClusterVersionsClientListByLocationResponse) (HcpClusterVersionsClientListByLocationResponse, error) { + ctx = context.WithValue(ctx, runtime.CtxAPINameKey{}, "HcpClusterVersionsClient.NewListByLocationPager") + nextLink := "" + if page != nil { + nextLink = *page.NextLink + } + resp, err := runtime.FetcherForNextLink(ctx, client.internal.Pipeline(), nextLink, func(ctx context.Context) (*policy.Request, error) { + return client.listByLocationCreateRequest(ctx, location, options) + }, nil) + if err != nil { + return HcpClusterVersionsClientListByLocationResponse{}, err + } + return client.listByLocationHandleResponse(resp) + }, + Tracer: client.internal.Tracer(), + }) +} + +// listByLocationCreateRequest creates the ListByLocation request. +func (client *HcpClusterVersionsClient) listByLocationCreateRequest(ctx context.Context, location string, options *HcpClusterVersionsClientListByLocationOptions) (*policy.Request, error) { + urlPath := "/subscriptions/{subscriptionId}/locations/{location}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftVersions" + if client.subscriptionID == "" { + return nil, errors.New("parameter client.subscriptionID cannot be empty") + } + urlPath = strings.ReplaceAll(urlPath, "{subscriptionId}", url.PathEscape(client.subscriptionID)) + if location == "" { + return nil, errors.New("parameter location cannot be empty") + } + urlPath = strings.ReplaceAll(urlPath, "{location}", url.PathEscape(location)) + req, err := runtime.NewRequest(ctx, http.MethodGet, runtime.JoinPaths(client.internal.Endpoint(), urlPath)) + if err != nil { + return nil, err + } + reqQP := req.Raw().URL.Query() + reqQP.Set("api-version", "2024-06-10-preview") + req.Raw().URL.RawQuery = reqQP.Encode() + req.Raw().Header["Accept"] = []string{"application/json"} + return req, nil +} + +// listByLocationHandleResponse handles the ListByLocation response. +func (client *HcpClusterVersionsClient) listByLocationHandleResponse(resp *http.Response) (HcpClusterVersionsClientListByLocationResponse, error) { + result := HcpClusterVersionsClientListByLocationResponse{} + if err := runtime.UnmarshalAsJSON(resp, &result.HcpOpenShiftVersionResourceListResult); err != nil { + return HcpClusterVersionsClientListByLocationResponse{}, err + } + return result, nil +} + diff --git a/internal/api/v20240610preview/generated/hcpopenshiftclusters_client.go b/internal/api/v20240610preview/generated/hcpopenshiftclusters_client.go index b86d4f860..bfc376f5b 100644 --- a/internal/api/v20240610preview/generated/hcpopenshiftclusters_client.go +++ b/internal/api/v20240610preview/generated/hcpopenshiftclusters_client.go @@ -74,7 +74,7 @@ func (client *HcpOpenShiftClustersClient) AdminCredentials(ctx context.Context, // adminCredentialsCreateRequest creates the AdminCredentials request. func (client *HcpOpenShiftClustersClient) adminCredentialsCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, options *HcpOpenShiftClustersClientAdminCredentialsOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/adminCredentials" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/adminCredentials" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -161,7 +161,7 @@ func (client *HcpOpenShiftClustersClient) createOrUpdate(ctx context.Context, re // createOrUpdateCreateRequest creates the CreateOrUpdate request. func (client *HcpOpenShiftClustersClient) createOrUpdateCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, resource HcpOpenShiftClusterResource, options *HcpOpenShiftClustersClientBeginCreateOrUpdateOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -241,7 +241,7 @@ func (client *HcpOpenShiftClustersClient) deleteOperation(ctx context.Context, r // deleteCreateRequest creates the Delete request. func (client *HcpOpenShiftClustersClient) deleteCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, options *HcpOpenShiftClustersClientBeginDeleteOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -297,7 +297,7 @@ func (client *HcpOpenShiftClustersClient) Get(ctx context.Context, resourceGroup // getCreateRequest creates the Get request. func (client *HcpOpenShiftClustersClient) getCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, options *HcpOpenShiftClustersClientGetOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -362,7 +362,7 @@ func (client *HcpOpenShiftClustersClient) KubeConfig(ctx context.Context, resour // kubeConfigCreateRequest creates the KubeConfig request. func (client *HcpOpenShiftClustersClient) kubeConfigCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, options *HcpOpenShiftClustersClientKubeConfigOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/kubeConfig" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/kubeConfig" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -426,7 +426,7 @@ func (client *HcpOpenShiftClustersClient) NewListByResourceGroupPager(resourceGr // listByResourceGroupCreateRequest creates the ListByResourceGroup request. func (client *HcpOpenShiftClustersClient) listByResourceGroupCreateRequest(ctx context.Context, resourceGroupName string, options *HcpOpenShiftClustersClientListByResourceGroupOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -485,7 +485,7 @@ func (client *HcpOpenShiftClustersClient) NewListBySubscriptionPager(options *Hc // listBySubscriptionCreateRequest creates the ListBySubscription request. func (client *HcpOpenShiftClustersClient) listBySubscriptionCreateRequest(ctx context.Context, options *HcpOpenShiftClustersClientListBySubscriptionOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters" + urlPath := "/subscriptions/{subscriptionId}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -564,7 +564,7 @@ func (client *HcpOpenShiftClustersClient) update(ctx context.Context, resourceGr // updateCreateRequest creates the Update request. func (client *HcpOpenShiftClustersClient) updateCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, properties HcpOpenShiftClusterResourceUpdate, options *HcpOpenShiftClustersClientBeginUpdateOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } diff --git a/internal/api/v20240610preview/generated/models.go b/internal/api/v20240610preview/generated/models.go index ce6ab6b56..04ef37335 100644 --- a/internal/api/v20240610preview/generated/models.go +++ b/internal/api/v20240610preview/generated/models.go @@ -23,21 +23,30 @@ type APIProfile struct { // ClaimProfile - External auth claim profile type ClaimProfile struct { - // REQUIRED; Claim + // REQUIRED; Claim name of the external profile Claim *string - // REQUIRED; Prefix + // REQUIRED; Prefix for the claim external profile Prefix *string // REQUIRED; Prefix policy PrefixPolicy *string } +// ClusterPatchSpec - The patchable cluster specification +type ClusterPatchSpec struct { + // Disable user workload monitoring + DisableUserWorkloadMonitoring *bool + + // Openshift cluster proxy configuration + Proxy *ProxyProfile + + // Version of the control plane components + Version *VersionProfileUpdate +} + // ClusterSpec - The cluster resource specification type ClusterSpec struct { - // REQUIRED; Azure platform configuration - Platform *PlatformProfile - // REQUIRED; Version of the control plane components Version *VersionProfile @@ -66,6 +75,9 @@ type ClusterSpec struct { // Cluster network configuration Network *NetworkProfile + // Azure platform configuration + Platform *PlatformProfile + // Openshift cluster proxy configuration Proxy *ProxyProfile @@ -76,21 +88,6 @@ type ClusterSpec struct { Console *ConsoleProfile } -// ClusterSpecUpdate - The cluster resource specification -type ClusterSpecUpdate struct { - // Cluster DNS configuration - DNS any - - // Disable user workload monitoring - DisableUserWorkloadMonitoring *bool - - // Openshift cluster proxy configuration - Proxy *ProxyProfile - - // Version of the control plane components - Version *VersionProfileUpdate -} - // ConsoleProfile - Configuration of the cluster web console type ConsoleProfile struct { // READ-ONLY; The cluster web console URL endpoint @@ -99,8 +96,8 @@ type ConsoleProfile struct { // DNSProfile - DNS contains the DNS settings of the cluster type DNSProfile struct { - // REQUIRED; BaseDomainPrefix is the unique name of the cluster representing the OpenShift's cluster name. BaseDomainPrefix -// is the name that will appear in the cluster's DNS, provisioned cloud providers resources + // BaseDomainPrefix is the unique name of the cluster representing the OpenShift's cluster name. BaseDomainPrefix is the name +// that will appear in the cluster's DNS, provisioned cloud providers resources BaseDomainPrefix *string // READ-ONLY; BaseDomain is the base DNS domain of the cluster. @@ -216,6 +213,9 @@ type HcpOpenShiftClusterNodePoolResource struct { // REQUIRED; The geo-location where the resource lives Location *string + // The managed service identities assigned to this resource. + Identity *ManagedServiceIdentity + // The resource-specific properties for this resource. Properties *NodePoolProperties @@ -246,6 +246,9 @@ type HcpOpenShiftClusterNodePoolResourceListResult struct { // HcpOpenShiftClusterNodePoolResourceUpdate - The type used for update operations of the HcpOpenShiftClusterNodePoolResource. type HcpOpenShiftClusterNodePoolResourceUpdate struct { + // The managed service identities assigned to this resource. + Identity *ManagedServiceIdentity + // The updatable properties of the HcpOpenShiftClusterNodePoolResource. Properties *HcpOpenShiftClusterNodePoolResourceUpdateProperties @@ -255,31 +258,13 @@ type HcpOpenShiftClusterNodePoolResourceUpdate struct { // HcpOpenShiftClusterNodePoolResourceUpdateProperties - The updatable properties of the HcpOpenShiftClusterNodePoolResource. type HcpOpenShiftClusterNodePoolResourceUpdateProperties struct { - // Representation of a autoscaling in a node pool. - AutoScaling *NodePoolAutoScalingUpdate - - // K8s labels to propagate to the NodePool Nodes The good example of the label is node-role.kubernetes.io/master: "" - Labels map[string]*string - - // The number of worker nodes, it cannot be used together with autoscaling - Replicas *int32 - - // Taints for the nodes - Taints []*Taint - - // Tuning configs, TODO provide meaningful explanation TuningConfig is a list of references to ConfigMaps containing serialized -// Tuned resources to define the tuning configuration to be applied to nodes -// in the NodePool. Each ConfigMap must have a single key named "tuned" whose value is the JSON or YAML of a serialized Tuned -// or PerformanceProfile. - TuningConfigs []*string - - // OpenShift version for the nodepool - Version *VersionProfileUpdate + // The node pool resource specification + Spec *NodePoolPatchSpec } // HcpOpenShiftClusterProperties - HCP cluster properties type HcpOpenShiftClusterProperties struct { - // REQUIRED; The cluster resouce specification. + // The cluster resource specification. Spec *ClusterSpec // READ-ONLY; The status of the last operation. @@ -336,12 +321,12 @@ type HcpOpenShiftClusterResourceUpdate struct { // HcpOpenShiftClusterResourceUpdateProperties - The updatable properties of the HcpOpenShiftClusterResource. type HcpOpenShiftClusterResourceUpdateProperties struct { - // The cluster resouce specification. - Spec *ClusterSpecUpdate + // The cluster resource specification. + Spec *ClusterPatchSpec } -// HcpOpenShiftVersions represents a location based available HCP cluster versions -type HcpOpenShiftVersions struct { +// HcpOpenShiftVersionResource - HcpOpenShiftVersions represents a location based available HCP cluster versions +type HcpOpenShiftVersionResource struct { // The resource-specific properties for this resource. Properties *HcpOpenShiftVersionsProperties @@ -358,10 +343,10 @@ type HcpOpenShiftVersions struct { Type *string } -// HcpOpenShiftVersionsListResult - The response of a HcpOpenShiftVersions list operation. -type HcpOpenShiftVersionsListResult struct { - // REQUIRED; The HcpOpenShiftVersions items on this page - Value []*HcpOpenShiftVersions +// HcpOpenShiftVersionResourceListResult - The response of a HcpOpenShiftVersionResource list operation. +type HcpOpenShiftVersionResourceListResult struct { + // REQUIRED; The HcpOpenShiftVersionResource items on this page + Value []*HcpOpenShiftVersionResource // The link to the next page of items NextLink *string @@ -388,6 +373,15 @@ type IngressProfile struct { URL *string } +// Label represents the k8s label +type Label struct { + // The key of the label + Key *string + + // The value of the label + Value *string +} + // ManagedServiceIdentity - Managed service identity (system assigned and/or user assigned identities) type ManagedServiceIdentity struct { // REQUIRED; Type of managed service identity (where both SystemAssigned and UserAssigned types are allowed). @@ -428,20 +422,35 @@ type NetworkProfile struct { // NodePoolAutoScaling - Node pool autoscaling type NodePoolAutoScaling struct { - // REQUIRED; The maximum number of nodes in the node pool + // The maximum number of nodes in the node pool Max *int32 - // REQUIRED; The minimum number of nodes in the node pool + // The minimum number of nodes in the node pool Min *int32 } -// NodePoolAutoScalingUpdate - Node pool autoscaling -type NodePoolAutoScalingUpdate struct { - // The maximum number of nodes in the node pool - Max *int32 +// NodePoolPatchSpec - Worker node pool profile +type NodePoolPatchSpec struct { + // Representation of a autoscaling in a node pool. + AutoScaling *NodePoolAutoScaling - // The minimum number of nodes in the node pool - Min *int32 + // K8s labels to propagate to the NodePool Nodes The good example of the label is node-role.kubernetes.io/master: "" + Labels []*Label + + // The number of worker nodes, it cannot be used together with autoscaling + Replicas *int32 + + // Taints for the nodes + Taints []*Taint + + // Tuning configs, TODO provide meaningful explanation TuningConfig is a list of references to ConfigMaps containing serialized +// Tuned resources to define the tuning configuration to be applied to nodes +// in the NodePool. Each ConfigMap must have a single key named "tuned" whose value is the JSON or YAML of a serialized Tuned +// or PerformanceProfile. + TuningConfigs []*string + + // OpenShift version for the nodepool + Version *VersionProfileUpdate } // NodePoolPlatformProfile - Azure node pool platform configuration @@ -457,7 +466,7 @@ type NodePoolPlatformProfile struct { // * https://learn.microsoft.com/en-us/azure/availability-zones/az-overview AvailabilityZone *string - // Disk Encryption Set ID that will be used for ecnryption the Nodes disks + // Disk Encryption Set ID that will be used for encryption the Nodes disks // * https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption-overview // * https://learn.microsoft.com/en-us/azure/virtual-machines/disk-encryption DiscEncryptionSetID *string @@ -478,7 +487,7 @@ type NodePoolPlatformProfile struct { // NodePoolProperties - Represents the node pool properties type NodePoolProperties struct { - // REQUIRED; The node pool resource specification + // The node pool resource specification Spec *NodePoolSpec // READ-ONLY; Provisioning state @@ -493,14 +502,14 @@ type NodePoolSpec struct { // REQUIRED; OpenShift version for the nodepool Version *VersionProfile - // Autorepair + // Auto-repair AutoRepair *bool // Representation of a autoscaling in a node pool. AutoScaling *NodePoolAutoScaling // K8s labels to propagate to the NodePool Nodes The good example of the label is node-role.kubernetes.io/master: "" - Labels map[string]*string + Labels []*Label // The number of worker nodes, it cannot be used together with autoscaling Replicas *int32 @@ -652,10 +661,10 @@ type SystemData struct { // Taint is controlling the node taint and its effects type Taint struct { - // REQUIRED; The effect of the taint The good example of the taint effect is NoSchedule + // The effect of the taint The good example of the taint effect is NoSchedule Effect *Effect - // REQUIRED; The key of the taint The good example of the taint key is node-role.kubernetes.io/master + // The key of the taint The good example of the taint key is node-role.kubernetes.io/master Key *string // The value of the taint The good example of the taint value is NoSchedule @@ -673,7 +682,7 @@ type TokenClaimMappingsProfile struct { // TokenClaimValidationRuleProfile - External auth claim validation rule type TokenClaimValidationRuleProfile struct { - // REQUIRED; Claim + // REQUIRED; Claim name for the validation profile Claim *string // REQUIRED; Required value diff --git a/internal/api/v20240610preview/generated/models_serde.go b/internal/api/v20240610preview/generated/models_serde.go index deee0c431..ed83f5471 100644 --- a/internal/api/v20240610preview/generated/models_serde.go +++ b/internal/api/v20240610preview/generated/models_serde.go @@ -84,6 +84,41 @@ func (c *ClaimProfile) UnmarshalJSON(data []byte) error { return nil } +// MarshalJSON implements the json.Marshaller interface for type ClusterPatchSpec. +func (c ClusterPatchSpec) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]any) + populate(objectMap, "disableUserWorkloadMonitoring", c.DisableUserWorkloadMonitoring) + populate(objectMap, "proxy", c.Proxy) + populate(objectMap, "version", c.Version) + return json.Marshal(objectMap) +} + +// UnmarshalJSON implements the json.Unmarshaller interface for type ClusterPatchSpec. +func (c *ClusterPatchSpec) UnmarshalJSON(data []byte) error { + var rawMsg map[string]json.RawMessage + if err := json.Unmarshal(data, &rawMsg); err != nil { + return fmt.Errorf("unmarshalling type %T: %v", c, err) + } + for key, val := range rawMsg { + var err error + switch key { + case "disableUserWorkloadMonitoring": + err = unpopulate(val, "DisableUserWorkloadMonitoring", &c.DisableUserWorkloadMonitoring) + delete(rawMsg, key) + case "proxy": + err = unpopulate(val, "Proxy", &c.Proxy) + delete(rawMsg, key) + case "version": + err = unpopulate(val, "Version", &c.Version) + delete(rawMsg, key) + } + if err != nil { + return fmt.Errorf("unmarshalling type %T: %v", c, err) + } + } + return nil +} + // MarshalJSON implements the json.Marshaller interface for type ClusterSpec. func (c ClusterSpec) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -159,45 +194,6 @@ func (c *ClusterSpec) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type ClusterSpecUpdate. -func (c ClusterSpecUpdate) MarshalJSON() ([]byte, error) { - objectMap := make(map[string]any) - populateAny(objectMap, "dns", c.DNS) - populate(objectMap, "disableUserWorkloadMonitoring", c.DisableUserWorkloadMonitoring) - populate(objectMap, "proxy", c.Proxy) - populate(objectMap, "version", c.Version) - return json.Marshal(objectMap) -} - -// UnmarshalJSON implements the json.Unmarshaller interface for type ClusterSpecUpdate. -func (c *ClusterSpecUpdate) UnmarshalJSON(data []byte) error { - var rawMsg map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMsg); err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - for key, val := range rawMsg { - var err error - switch key { - case "dns": - err = unpopulate(val, "DNS", &c.DNS) - delete(rawMsg, key) - case "disableUserWorkloadMonitoring": - err = unpopulate(val, "DisableUserWorkloadMonitoring", &c.DisableUserWorkloadMonitoring) - delete(rawMsg, key) - case "proxy": - err = unpopulate(val, "Proxy", &c.Proxy) - delete(rawMsg, key) - case "version": - err = unpopulate(val, "Version", &c.Version) - delete(rawMsg, key) - } - if err != nil { - return fmt.Errorf("unmarshalling type %T: %v", c, err) - } - } - return nil -} - // MarshalJSON implements the json.Marshaller interface for type ConsoleProfile. func (c ConsoleProfile) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -586,6 +582,7 @@ func (h *HcpOpenShiftClusterKubeconfig) UnmarshalJSON(data []byte) error { func (h HcpOpenShiftClusterNodePoolResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) populate(objectMap, "id", h.ID) + populate(objectMap, "identity", h.Identity) populate(objectMap, "location", h.Location) populate(objectMap, "name", h.Name) populate(objectMap, "properties", h.Properties) @@ -607,6 +604,9 @@ func (h *HcpOpenShiftClusterNodePoolResource) UnmarshalJSON(data []byte) error { case "id": err = unpopulate(val, "ID", &h.ID) delete(rawMsg, key) + case "identity": + err = unpopulate(val, "Identity", &h.Identity) + delete(rawMsg, key) case "location": err = unpopulate(val, "Location", &h.Location) delete(rawMsg, key) @@ -667,6 +667,7 @@ func (h *HcpOpenShiftClusterNodePoolResourceListResult) UnmarshalJSON(data []byt // MarshalJSON implements the json.Marshaller interface for type HcpOpenShiftClusterNodePoolResourceUpdate. func (h HcpOpenShiftClusterNodePoolResourceUpdate) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) + populate(objectMap, "identity", h.Identity) populate(objectMap, "properties", h.Properties) populate(objectMap, "tags", h.Tags) return json.Marshal(objectMap) @@ -681,6 +682,9 @@ func (h *HcpOpenShiftClusterNodePoolResourceUpdate) UnmarshalJSON(data []byte) e for key, val := range rawMsg { var err error switch key { + case "identity": + err = unpopulate(val, "Identity", &h.Identity) + delete(rawMsg, key) case "properties": err = unpopulate(val, "Properties", &h.Properties) delete(rawMsg, key) @@ -698,12 +702,7 @@ func (h *HcpOpenShiftClusterNodePoolResourceUpdate) UnmarshalJSON(data []byte) e // MarshalJSON implements the json.Marshaller interface for type HcpOpenShiftClusterNodePoolResourceUpdateProperties. func (h HcpOpenShiftClusterNodePoolResourceUpdateProperties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "autoScaling", h.AutoScaling) - populate(objectMap, "labels", h.Labels) - populate(objectMap, "replicas", h.Replicas) - populate(objectMap, "taints", h.Taints) - populate(objectMap, "tuningConfigs", h.TuningConfigs) - populate(objectMap, "version", h.Version) + populate(objectMap, "spec", h.Spec) return json.Marshal(objectMap) } @@ -716,23 +715,8 @@ func (h *HcpOpenShiftClusterNodePoolResourceUpdateProperties) UnmarshalJSON(data for key, val := range rawMsg { var err error switch key { - case "autoScaling": - err = unpopulate(val, "AutoScaling", &h.AutoScaling) - delete(rawMsg, key) - case "labels": - err = unpopulate(val, "Labels", &h.Labels) - delete(rawMsg, key) - case "replicas": - err = unpopulate(val, "Replicas", &h.Replicas) - delete(rawMsg, key) - case "taints": - err = unpopulate(val, "Taints", &h.Taints) - delete(rawMsg, key) - case "tuningConfigs": - err = unpopulate(val, "TuningConfigs", &h.TuningConfigs) - delete(rawMsg, key) - case "version": - err = unpopulate(val, "Version", &h.Version) + case "spec": + err = unpopulate(val, "Spec", &h.Spec) delete(rawMsg, key) } if err != nil { @@ -921,8 +905,8 @@ func (h *HcpOpenShiftClusterResourceUpdateProperties) UnmarshalJSON(data []byte) return nil } -// MarshalJSON implements the json.Marshaller interface for type HcpOpenShiftVersions. -func (h HcpOpenShiftVersions) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type HcpOpenShiftVersionResource. +func (h HcpOpenShiftVersionResource) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) populate(objectMap, "id", h.ID) populate(objectMap, "name", h.Name) @@ -932,8 +916,8 @@ func (h HcpOpenShiftVersions) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type HcpOpenShiftVersions. -func (h *HcpOpenShiftVersions) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type HcpOpenShiftVersionResource. +func (h *HcpOpenShiftVersionResource) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", h, err) @@ -964,16 +948,16 @@ func (h *HcpOpenShiftVersions) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type HcpOpenShiftVersionsListResult. -func (h HcpOpenShiftVersionsListResult) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type HcpOpenShiftVersionResourceListResult. +func (h HcpOpenShiftVersionResourceListResult) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) populate(objectMap, "nextLink", h.NextLink) populate(objectMap, "value", h.Value) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type HcpOpenShiftVersionsListResult. -func (h *HcpOpenShiftVersionsListResult) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type HcpOpenShiftVersionResourceListResult. +func (h *HcpOpenShiftVersionResourceListResult) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", h, err) @@ -1061,6 +1045,37 @@ func (i *IngressProfile) UnmarshalJSON(data []byte) error { return nil } +// MarshalJSON implements the json.Marshaller interface for type Label. +func (l Label) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]any) + populate(objectMap, "key", l.Key) + populate(objectMap, "value", l.Value) + return json.Marshal(objectMap) +} + +// UnmarshalJSON implements the json.Unmarshaller interface for type Label. +func (l *Label) UnmarshalJSON(data []byte) error { + var rawMsg map[string]json.RawMessage + if err := json.Unmarshal(data, &rawMsg); err != nil { + return fmt.Errorf("unmarshalling type %T: %v", l, err) + } + for key, val := range rawMsg { + var err error + switch key { + case "key": + err = unpopulate(val, "Key", &l.Key) + delete(rawMsg, key) + case "value": + err = unpopulate(val, "Value", &l.Value) + delete(rawMsg, key) + } + if err != nil { + return fmt.Errorf("unmarshalling type %T: %v", l, err) + } + } + return nil +} + // MarshalJSON implements the json.Marshaller interface for type ManagedServiceIdentity. func (m ManagedServiceIdentity) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) @@ -1174,16 +1189,20 @@ func (n *NodePoolAutoScaling) UnmarshalJSON(data []byte) error { return nil } -// MarshalJSON implements the json.Marshaller interface for type NodePoolAutoScalingUpdate. -func (n NodePoolAutoScalingUpdate) MarshalJSON() ([]byte, error) { +// MarshalJSON implements the json.Marshaller interface for type NodePoolPatchSpec. +func (n NodePoolPatchSpec) MarshalJSON() ([]byte, error) { objectMap := make(map[string]any) - populate(objectMap, "max", n.Max) - populate(objectMap, "min", n.Min) + populate(objectMap, "autoScaling", n.AutoScaling) + populate(objectMap, "labels", n.Labels) + populate(objectMap, "replicas", n.Replicas) + populate(objectMap, "taints", n.Taints) + populate(objectMap, "tuningConfigs", n.TuningConfigs) + populate(objectMap, "version", n.Version) return json.Marshal(objectMap) } -// UnmarshalJSON implements the json.Unmarshaller interface for type NodePoolAutoScalingUpdate. -func (n *NodePoolAutoScalingUpdate) UnmarshalJSON(data []byte) error { +// UnmarshalJSON implements the json.Unmarshaller interface for type NodePoolPatchSpec. +func (n *NodePoolPatchSpec) UnmarshalJSON(data []byte) error { var rawMsg map[string]json.RawMessage if err := json.Unmarshal(data, &rawMsg); err != nil { return fmt.Errorf("unmarshalling type %T: %v", n, err) @@ -1191,11 +1210,23 @@ func (n *NodePoolAutoScalingUpdate) UnmarshalJSON(data []byte) error { for key, val := range rawMsg { var err error switch key { - case "max": - err = unpopulate(val, "Max", &n.Max) + case "autoScaling": + err = unpopulate(val, "AutoScaling", &n.AutoScaling) delete(rawMsg, key) - case "min": - err = unpopulate(val, "Min", &n.Min) + case "labels": + err = unpopulate(val, "Labels", &n.Labels) + delete(rawMsg, key) + case "replicas": + err = unpopulate(val, "Replicas", &n.Replicas) + delete(rawMsg, key) + case "taints": + err = unpopulate(val, "Taints", &n.Taints) + delete(rawMsg, key) + case "tuningConfigs": + err = unpopulate(val, "TuningConfigs", &n.TuningConfigs) + delete(rawMsg, key) + case "version": + err = unpopulate(val, "Version", &n.Version) delete(rawMsg, key) } if err != nil { diff --git a/internal/api/v20240610preview/generated/nodepools_client.go b/internal/api/v20240610preview/generated/nodepools_client.go index c8c180c1c..6332ee14b 100644 --- a/internal/api/v20240610preview/generated/nodepools_client.go +++ b/internal/api/v20240610preview/generated/nodepools_client.go @@ -97,7 +97,7 @@ func (client *NodePoolsClient) createOrUpdate(ctx context.Context, resourceGroup // createOrUpdateCreateRequest creates the CreateOrUpdate request. func (client *NodePoolsClient) createOrUpdateCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, nodePoolName string, resource HcpOpenShiftClusterNodePoolResource, options *NodePoolsClientBeginCreateOrUpdateOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -181,7 +181,7 @@ func (client *NodePoolsClient) deleteOperation(ctx context.Context, resourceGrou // deleteCreateRequest creates the Delete request. func (client *NodePoolsClient) deleteCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, nodePoolName string, options *NodePoolsClientBeginDeleteOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -241,7 +241,7 @@ func (client *NodePoolsClient) Get(ctx context.Context, resourceGroupName string // getCreateRequest creates the Get request. func (client *NodePoolsClient) getCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, nodePoolName string, options *NodePoolsClientGetOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -310,7 +310,7 @@ func (client *NodePoolsClient) NewListByHcpOpenShiftClusterResourcePager(resourc // listByHcpOpenShiftClusterResourceCreateRequest creates the ListByHcpOpenShiftClusterResource request. func (client *NodePoolsClient) listByHcpOpenShiftClusterResourceCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, options *NodePoolsClientListByHcpOpenShiftClusterResourceOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } @@ -397,7 +397,7 @@ func (client *NodePoolsClient) update(ctx context.Context, resourceGroupName str // updateCreateRequest creates the Update request. func (client *NodePoolsClient) updateCreateRequest(ctx context.Context, resourceGroupName string, hcpOpenShiftClusterName string, nodePoolName string, properties HcpOpenShiftClusterNodePoolResourceUpdate, options *NodePoolsClientBeginUpdateOptions) (*policy.Request, error) { - urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenshift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" + urlPath := "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/{hcpOpenShiftClusterName}/nodePools/{nodePoolName}" if client.subscriptionID == "" { return nil, errors.New("parameter client.subscriptionID cannot be empty") } diff --git a/internal/api/v20240610preview/generated/operations_client.go b/internal/api/v20240610preview/generated/operations_client.go index 08d73934e..133561cbb 100644 --- a/internal/api/v20240610preview/generated/operations_client.go +++ b/internal/api/v20240610preview/generated/operations_client.go @@ -65,7 +65,7 @@ func (client *OperationsClient) NewListPager(options *OperationsClientListOption // listCreateRequest creates the List request. func (client *OperationsClient) listCreateRequest(ctx context.Context, options *OperationsClientListOptions) (*policy.Request, error) { - urlPath := "/providers/Microsoft.RedHatOpenshift/operations" + urlPath := "/providers/Microsoft.RedHatOpenShift/operations" req, err := runtime.NewRequest(ctx, http.MethodGet, runtime.JoinPaths(client.internal.Endpoint(), urlPath)) if err != nil { return nil, err diff --git a/internal/api/v20240610preview/generated/options.go b/internal/api/v20240610preview/generated/options.go index 23af095d3..835483e02 100644 --- a/internal/api/v20240610preview/generated/options.go +++ b/internal/api/v20240610preview/generated/options.go @@ -7,9 +7,9 @@ package generated -// HcpClusterVersionOperationsClientListByLocationOptions contains the optional parameters for the HcpClusterVersionOperationsClient.NewListByLocationPager +// HcpClusterVersionsClientListByLocationOptions contains the optional parameters for the HcpClusterVersionsClient.NewListByLocationPager // method. -type HcpClusterVersionOperationsClientListByLocationOptions struct { +type HcpClusterVersionsClientListByLocationOptions struct { // placeholder for future optional parameters } diff --git a/internal/api/v20240610preview/generated/responses.go b/internal/api/v20240610preview/generated/responses.go index bc3483392..0d0916d7f 100644 --- a/internal/api/v20240610preview/generated/responses.go +++ b/internal/api/v20240610preview/generated/responses.go @@ -7,10 +7,10 @@ package generated -// HcpClusterVersionOperationsClientListByLocationResponse contains the response from method HcpClusterVersionOperationsClient.NewListByLocationPager. -type HcpClusterVersionOperationsClientListByLocationResponse struct { - // The response of a HcpOpenShiftVersions list operation. - HcpOpenShiftVersionsListResult +// HcpClusterVersionsClientListByLocationResponse contains the response from method HcpClusterVersionsClient.NewListByLocationPager. +type HcpClusterVersionsClientListByLocationResponse struct { + // The response of a HcpOpenShiftVersionResource list operation. + HcpOpenShiftVersionResourceListResult } // HcpOpenShiftClustersClientAdminCredentialsResponse contains the response from method HcpOpenShiftClustersClient.AdminCredentials. diff --git a/package-lock.json b/package-lock.json index bbabd4599..a08caee31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "@azure-tools/typespec-autorest": "^0.42.1", "@azure-tools/typespec-azure-core": "^0.42.0", "@azure-tools/typespec-azure-resource-manager": "^0.42.1", + "@azure-tools/typespec-azure-rulesets": "^0.42.1", "@typespec/http": "^0.56.0", "@typespec/openapi": "^0.56.0", "@typespec/openapi3": "^0.56.0", @@ -66,10 +67,24 @@ "@typespec/versioning": "~0.56.0" } }, + "node_modules/@azure-tools/typespec-azure-rulesets": { + "version": "0.42.1", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-rulesets/-/typespec-azure-rulesets-0.42.1.tgz", + "integrity": "sha512-GRiMErWJ96DvDBQMVgGI1sgMTOegXxpx7w6enZyEF0BaodxGfObJyl1TrMb9Pj6NAZfV5Q6uJAfXFbpF1MVDCw==", + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "@azure-tools/typespec-azure-core": "~0.42.0", + "@azure-tools/typespec-azure-resource-manager": "~0.42.1", + "@azure-tools/typespec-client-generator-core": "~0.42.3", + "@typespec/compiler": "~0.56.0" + } + }, "node_modules/@azure-tools/typespec-client-generator-core": { - "version": "0.42.2", - "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.42.2.tgz", - "integrity": "sha512-Hei86GqNFfKpFhivZPpKo1ktSRQMnZKjLoMwIumklmMpeo5KgyzEgRSpJEiS+zmPZELs2Fu07VgfvpW0IXurUg==", + "version": "0.42.3", + "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.42.3.tgz", + "integrity": "sha512-ZDVVIY1uJ8EaI4QhCdQmTdKVACm4xYn/I7ySpwv4oxk9X8kZFhxx+PKNHAlx34mhOf4oF0PW3wCN5DMeU6asYg==", "peer": true, "dependencies": { "change-case": "~5.4.4", diff --git a/package.json b/package.json index bc786d405..33e69f8fa 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "@azure-tools/typespec-autorest": "^0.42.1", "@azure-tools/typespec-azure-core": "^0.42.0", "@azure-tools/typespec-azure-resource-manager": "^0.42.1", + "@azure-tools/typespec-azure-rulesets": "^0.42.1", "@typespec/http": "^0.56.0", "@typespec/openapi": "^0.56.0", "@typespec/openapi3": "^0.56.0",