Skip to content

Commit c38951e

Browse files
bearzz23bearzz23
authored
Revert "Migrate ConnectedKubernetes from generation to main (#25804)" (#25815)
This reverts commit 6d49acd.
1 parent 9f93fee commit c38951e

File tree

163 files changed

+1810
-10317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+1810
-10317
lines changed

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/Az.ConnectedKubernetes.format.ps1xml

Lines changed: 28 additions & 326 deletions
Large diffs are not rendered by default.

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ In this directory, run AutoRest:
4444
> see https://aka.ms/autorest
4545
4646
``` yaml
47-
commit: 0ce2859b2f018adcea3d14346951ff4270dcff3d
47+
commit: ac6324d13863e8157f4b392ef0ceef1e86eea935
4848
require:
4949
- $(this-folder)/../../readme.azure.noprofile.md
5050
input-file:
51-
- $(repo)/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2024-07-01-preview/connectedClusters.json
51+
- $(repo)/specification/hybridkubernetes/resource-manager/Microsoft.Kubernetes/preview/2022-10-01-preview/connectedClusters.json
5252

5353
title: ConnectedKubernetes
5454
module-version: 0.1.0

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/UX/Microsoft.Kubernetes/connectedClusters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"resourceType": "connectedClusters",
3-
"apiVersion": "2024-07-01-preview",
3+
"apiVersion": "2022-10-01-preview",
44
"learnMore": {
55
"url": "https://learn.microsoft.com/powershell/module/az.connectedkubernetes"
66
},

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/custom/New-AzConnectedKubernetes.ps1

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ New-AzConnectedKubernetes -ClusterName azps_test_cluster -ResourceGroupName azps
2525
New-AzConnectedKubernetes -ClusterName azps_test_cluster1 -ResourceGroupName azps_test_group -Location eastus -KubeConfig $HOME\.kube\config -KubeContext azps_aks_t01
2626
2727
.Outputs
28-
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster
28+
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster
2929
.Link
3030
https://learn.microsoft.com/powershell/module/az.connectedkubernetes/new-azconnectedkubernetes
3131
#>
3232
function New-AzConnectedKubernetes {
33-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster])]
33+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster])]
3434
[CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
3535
param(
3636
[Parameter(Mandatory)]
@@ -173,24 +173,6 @@ function New-AzConnectedKubernetes {
173173
# OID of 'custom-locations' app.
174174
${CustomLocationsOid},
175175

176-
[Parameter()]
177-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
178-
[System.Management.Automation.SwitchParameter]
179-
# Whether to enable oidc issuer for workload identity integration.
180-
${OidcIssuerProfileEnabled},
181-
182-
[Parameter()]
183-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
184-
[System.String]
185-
# The issuer url for public cloud clusters - AKS, EKS, GKE - used for the workload identity feature.
186-
${OidcIssuerProfileSelfHostedIssuerUrl},
187-
188-
[Parameter()]
189-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
190-
[System.Management.Automation.SwitchParameter]
191-
# Whether to enable or disable the workload identity Webhook
192-
${WorkloadIdentityEnabled},
193-
194176
[Parameter()]
195177
[System.Management.Automation.SwitchParameter]
196178
# Accept EULA of ConnectedKubernetes, legal term will pop up without this parameter provided
@@ -544,26 +526,6 @@ function New-AzConnectedKubernetes {
544526
} catch {
545527
throw "Unable to install helm chart at $ChartPath"
546528
}
547-
548-
if ($PSBoundParameters.ContainsKey('OidcIssuerProfileEnabled') -or $PSBoundParameters.ContainsKey('WorkloadIdentityEnabled') ) {
549-
$ExistConnectedKubernetes = Get-AzConnectedKubernetes -ResourceGroupName $ResourceGroupName -ClusterName $ClusterName @CommonPSBoundParameters
550-
551-
Write-Host "Cluster configuration is in progress..."
552-
$timeout = [datetime]::Now.AddMinutes(60)
553-
554-
while (($ExistConnectedKubernetes.ArcAgentProfileAgentState -ne "Succeeded") -and ($ExistConnectedKubernetes.ArcAgentProfileAgentState -ne "Failed") -and ([datetime]::Now -lt $timeout)) {
555-
Start-Sleep -Seconds 30
556-
$ExistConnectedKubernetes = Get-AzConnectedKubernetes -ResourceGroupName $ResourceGroupName -ClusterName $ClusterName @CommonPSBoundParameters
557-
}
558-
559-
if ($ExistConnectedKubernetes.ArcAgentProfileAgentState -eq "Succeeded") {
560-
Write-Host "Cluster configuration succeeded."
561-
} elseif ($ExistConnectedKubernetes.ArcAgentProfileAgentState -eq "Failed") {
562-
Write-Error "Cluster configuration failed."
563-
} else {
564-
Write-Error "Cluster configuration timed out after 60 minutes."
565-
}
566-
}
567529
Return $Response
568530
}
569531
}

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/custom/Update-AzConnectedKubernetes.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Get-AzConnectedKubernetes -ClusterName azps_test_cluster -ResourceGroupName azps
2727
.Inputs
2828
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.IConnectedKubernetesIdentity
2929
.Outputs
30-
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster
30+
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster
3131
.Notes
3232
COMPLEX PARAMETER PROPERTIES
3333
@@ -42,7 +42,7 @@ INPUTOBJECT <IConnectedKubernetesIdentity>: Identity Parameter
4242
https://learn.microsoft.com/powershell/module/az.connectedkubernetes/update-azconnectedkubernetes
4343
#>
4444
function Update-AzConnectedKubernetes {
45-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster])]
45+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster])]
4646
[CmdletBinding(DefaultParameterSetName='UpdateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
4747
param(
4848
[Parameter(ParameterSetName='UpdateExpanded', Mandatory)]
@@ -99,7 +99,7 @@ param(
9999

100100
[Parameter()]
101101
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
102-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedClusterPatchTags]))]
102+
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedClusterPatchTags]))]
103103
[System.Collections.Hashtable]
104104
# Resource tags.
105105
${Tag},

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/examples/New-AzConnectedKubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This command creates a connected kubernetes with parameters HttpProxy, HttpsProx
6868

6969
### Example 6: Create a connected kubernetes with parameters HttpProxy, HttpsProxy, NoProxy, Proxy and ProxyCredential.
7070
```powershell
71-
$pwd = ConvertTo-SecureString -String "****" -AsPlainText -Force
71+
$pwd = ConvertTo-SecureString "proxy-password" -AsPlainText -Force
7272
$cred = New-Object System.Management.Automation.PSCredential ("proxy-user", $pwd)
7373
New-AzConnectedKubernetes -ClusterName azps_test_cluster_ahb -ResourceGroupName azps_test_group -Location eastus -KubeConfig $HOME\.kube\config -KubeContext azps_aks_t01 -HttpProxy "http://proxy-user:proxy-password@proxy-ip:port" -HttpsProxy "http://proxy-user:proxy-password@proxy-ip:port" -NoProxy "localhost,127.0.0.0/8,192.168.0.0/16,172.17.0.0/16,10.96.0.0/12,10.244.0.0/16,10.43.0.0/24,.svc" -Proxy "http://proxy-ip:port" -ProxyCredential $cred
7474
```

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/exports/Get-AzConnectedKubernetes.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Get-AzConnectedKubernetes -InputObject $conAks
3232
.Inputs
3333
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.IConnectedKubernetesIdentity
3434
.Outputs
35-
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster
35+
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster
3636
.Notes
3737
COMPLEX PARAMETER PROPERTIES
3838
@@ -47,7 +47,7 @@ INPUTOBJECT <IConnectedKubernetesIdentity>: Identity Parameter
4747
https://learn.microsoft.com/powershell/module/az.connectedkubernetes/get-azconnectedkubernetes
4848
#>
4949
function Get-AzConnectedKubernetes {
50-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster])]
50+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster])]
5151
[CmdletBinding(DefaultParameterSetName='List1', PositionalBinding=$false)]
5252
param(
5353
[Parameter(ParameterSetName='Get', Mandatory)]

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/exports/Get-AzConnectedKubernetesUserCredential.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ Get-AzConnectedKubernetesUserCredential -ClusterName azps_test_cluster -Resource
2525
Get-AzConnectedKubernetesUserCredential -ClusterName azps_test_cluster -ResourceGroupName azps_test_group -AuthenticationMethod Token -ClientProxy:$false
2626
2727
.Inputs
28-
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IListClusterUserCredentialProperties
28+
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IListClusterUserCredentialProperties
2929
.Outputs
30-
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.ICredentialResults
30+
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.ICredentialResults
3131
.Notes
3232
COMPLEX PARAMETER PROPERTIES
3333
@@ -40,7 +40,7 @@ PROPERTY <IListClusterUserCredentialProperties>: .
4040
https://learn.microsoft.com/powershell/module/az.connectedkubernetes/get-azconnectedkubernetesusercredential
4141
#>
4242
function Get-AzConnectedKubernetesUserCredential {
43-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.ICredentialResults])]
43+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.ICredentialResults])]
4444
[CmdletBinding(DefaultParameterSetName='ListExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
4545
param(
4646
[Parameter(Mandatory)]
@@ -66,7 +66,7 @@ param(
6666

6767
[Parameter(ParameterSetName='List', Mandatory, ValueFromPipeline)]
6868
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
69-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IListClusterUserCredentialProperties]
69+
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IListClusterUserCredentialProperties]
7070
# .
7171
# To construct, see NOTES section for PROPERTY properties and create a hash table.
7272
${Property},

‎src/ConnectedKubernetes/ConnectedKubernetes.Autorest/exports/New-AzConnectedKubernetes.ps1

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ New-AzConnectedKubernetes -ClusterName azps_test_cluster_ahb -ResourceGroupName
3030
.Example
3131
New-AzConnectedKubernetes -ClusterName azps_test_cluster_ahb -ResourceGroupName azps_test_group -Location eastus -KubeConfig $HOME\.kube\config -KubeContext azps_aks_t01 -HttpProxy "http://proxy-user:proxy-password@proxy-ip:port" -HttpsProxy "http://proxy-user:proxy-password@proxy-ip:port" -NoProxy "localhost,127.0.0.0/8,192.168.0.0/16,172.17.0.0/16,10.96.0.0/12,10.244.0.0/16,10.43.0.0/24,.svc" -Proxy "http://proxy-user:proxy-password@proxy-ip:port"
3232
.Example
33-
$pwd = ConvertTo-SecureString -String "****" -AsPlainText -Force
33+
$pwd = ConvertTo-SecureString "proxy-password" -AsPlainText -Force
3434
$cred = New-Object System.Management.Automation.PSCredential ("proxy-user", $pwd)
3535
New-AzConnectedKubernetes -ClusterName azps_test_cluster_ahb -ResourceGroupName azps_test_group -Location eastus -KubeConfig $HOME\.kube\config -KubeContext azps_aks_t01 -HttpProxy "http://proxy-user:proxy-password@proxy-ip:port" -HttpsProxy "http://proxy-user:proxy-password@proxy-ip:port" -NoProxy "localhost,127.0.0.0/8,192.168.0.0/16,172.17.0.0/16,10.96.0.0/12,10.244.0.0/16,10.43.0.0/24,.svc" -Proxy "http://proxy-ip:port" -ProxyCredential $cred
3636
.Example
@@ -39,12 +39,12 @@ New-AzConnectedKubernetes -ClusterName azps_test_cluster -ResourceGroupName azps
3939
New-AzConnectedKubernetes -ClusterName azps_test_cluster -ResourceGroupName azps_test_group -Location eastus -OnboardingTimeout 600
4040
4141
.Outputs
42-
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster
42+
Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster
4343
.Link
4444
https://learn.microsoft.com/powershell/module/az.connectedkubernetes/new-azconnectedkubernetes
4545
#>
4646
function New-AzConnectedKubernetes {
47-
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20240701Preview.IConnectedCluster])]
47+
[OutputType([Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Models.Api20221001Preview.IConnectedCluster])]
4848
[CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
4949
param(
5050
[Parameter(Mandatory)]
@@ -186,24 +186,6 @@ param(
186186
# OID of 'custom-locations' app.
187187
${CustomLocationsOid},
188188

189-
[Parameter()]
190-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
191-
[System.Management.Automation.SwitchParameter]
192-
# Whether to enable oidc issuer for workload identity integration.
193-
${OidcIssuerProfileEnabled},
194-
195-
[Parameter()]
196-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
197-
[System.String]
198-
# The issuer url for public cloud clusters - AKS, EKS, GKE - used for the workload identity feature.
199-
${OidcIssuerProfileSelfHostedIssuerUrl},
200-
201-
[Parameter()]
202-
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
203-
[System.Management.Automation.SwitchParameter]
204-
# Whether to enable or disable the workload identity Webhook
205-
${WorkloadIdentityEnabled},
206-
207189
[Parameter()]
208190
[Microsoft.Azure.PowerShell.Cmdlets.ConnectedKubernetes.Category('Body')]
209191
[System.Management.Automation.SwitchParameter]

0 commit comments

Comments
 (0)