Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate KubernetesConfiguration from generation to main #24903

Merged
merged 2 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
# is regenerated.
# ----------------------------------------------------------------------------------
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs)
param([switch]$Isolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs, [Switch]$DisableAfterBuildTasks)
$ErrorActionPreference = 'Stop'

if($PSEdition -ne 'Core') {
Expand Down Expand Up @@ -169,4 +169,14 @@ if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
. (Join-Path $PSScriptRoot 'generate-portal-ux.ps1')
}

if (-not $DisableAfterBuildTasks){
$afterBuildTasksPath = Join-Path $PSScriptRoot ''
$afterBuildTasksArgs = ConvertFrom-Json 'true' -AsHashtable
if(Test-Path -Path $afterBuildTasksPath -PathType leaf){
Write-Host -ForegroundColor Green 'Running after build tasks...'
. $afterBuildTasksPath @afterBuildTasksArgs
}
}


Write-Host -ForegroundColor Green '-------------Done-------------'
Original file line number Diff line number Diff line change
Expand Up @@ -249,19 +249,6 @@ function New-AzKubernetesExtension {
Write-Error "Please select ClusterType from the following three values: 'ManagedClusters', 'ConnectedClusters', 'ProvisionedClusters'"
}

if ($Name -ieq 'flux') {
if ($Name -ceq 'flux') {
if ($IdentityType -cne 'SystemAssigned') {
Write-Error "The value of the parameter -IdentityType must be 'SystemAssigned'."
return
}
}
else {
Write-Error "The value of the parameter -Name must be 'flux'."
return
}
}

write-host "Azure Kubernetes Configuration Extension is being created, need to wait a few minutes..."
Az.KubernetesConfiguration.internal\New-AzKubernetesExtension @PSBoundParameters
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function setupEnv() {
New-AzResourceGroup -Name $env.resourceGroup -Location $env.location

write-host "2. az aks create..."
az aks create --name $env.k8sName1 --resource-group $env.resourceGroup --kubernetes-version 1.25.5 --vm-set-type AvailabilitySet
az aks create --name $env.k8sName1 --resource-group $env.resourceGroup --kubernetes-version 1.29.2 --vm-set-type AvailabilitySet

write-host "3. az aks get-credentials..."
az aks get-credentials --name $env.k8sName1 --resource-group $env.resourceGroup
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Generated by: Microsoft Corporation
#
# Generated on: 23/04/2024
# Generated on: 5/13/2024
#

@{
Expand Down Expand Up @@ -58,14 +58,14 @@ RequiredAssemblies =
'KubernetesConfiguration.Autorest/bin/Az.KubernetesConfiguration.private.dll'

# Script files (.ps1) that are run in the caller's environment prior to importing this module.
# ScriptsToProcess = @()
ScriptsToProcess = @()

# Type files (.ps1xml) to be loaded when importing this module
# TypesToProcess = @()
TypesToProcess = @()

# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess =
'KubernetesConfiguration.Autorest\Az.KubernetesConfiguration.format.ps1xml'
'KubernetesConfiguration.Autorest/Az.KubernetesConfiguration.format.ps1xml'

# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
NestedModules = @('KubernetesConfiguration.Autorest/Az.KubernetesConfiguration.psm1')
Expand Down Expand Up @@ -111,7 +111,7 @@ PrivateData = @{
PSData = @{

# Tags applied to this module. These help with module discovery in online galleries.
Tags = 'Azure','ResourceManager','ARM','PSModule','KubernetesConfiguration'
Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'KubernetesConfiguration'

# A URL to the license for this module.
LicenseUri = 'https://aka.ms/azps-license'
Expand All @@ -136,7 +136,7 @@ PrivateData = @{

} # End of PSData hashtable

} # End of PrivateData hashtable
} # End of PrivateData hashtable

# HelpInfo URI of this module
# HelpInfoURI = ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Fixed issue that `New-AzKubernetesExtension` installing Flux fails with error "Failed to perform resource identity operation" [#22455]

## Version 0.7.1
* Introduced secrets detection feature to safeguard sensitive data.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ Get Async Operation status
```
Get-AzKubernetesConfigFluxOperationStatus -ClusterName <String> -ClusterType <String>
-FluxConfigurationName <String> -OperationId <String> -ResourceGroupName <String> [-SubscriptionId <String[]>]
[-DefaultProfile <PSObject>] [<CommonParameters>]
[-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>] [<CommonParameters>]
```

### GetViaIdentity
```
Get-AzKubernetesConfigFluxOperationStatus -InputObject <IKubernetesConfigurationIdentity>
[-DefaultProfile <PSObject>] [<CommonParameters>]
[-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>] [<CommonParameters>]
```

## DESCRIPTION
Expand Down Expand Up @@ -138,6 +138,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -ResourceGroupName
The name of the resource group.
The name is case insensitive.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ Gets details of the Source Control Configuration.
### List (Default)
```
Get-AzKubernetesConfiguration -ClusterName <String> -ClusterType <String> -ResourceGroupName <String>
[-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
[-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>]
[<CommonParameters>]
```

### Get
```
Get-AzKubernetesConfiguration -ClusterName <String> -ClusterType <String> -ResourceGroupName <String>
[-SubscriptionId <String[]>] -Name <String> [-DefaultProfile <PSObject>]
[-SubscriptionId <String[]>] -Name <String> [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>]
[<CommonParameters>]
```

### GetViaIdentity
```
Get-AzKubernetesConfiguration -InputObject <IKubernetesConfigurationIdentity> [-DefaultProfile <PSObject>]
[<CommonParameters>]
[-ProgressAction <ActionPreference>] [<CommonParameters>]
```

## DESCRIPTION
Expand Down Expand Up @@ -144,6 +144,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -ResourceGroupName
The name of the resource group.
The name is case insensitive.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ Gets details of the Flux Configuration.
### List (Default)
```
Get-AzKubernetesConfigurationFlux -ClusterName <String> -ClusterType <String> -ResourceGroupName <String>
[-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
[-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>]
[<CommonParameters>]
```

### Get
```
Get-AzKubernetesConfigurationFlux -ClusterName <String> -ClusterType <String> -ResourceGroupName <String>
[-SubscriptionId <String[]>] -Name <String> [-DefaultProfile <PSObject>]
[-SubscriptionId <String[]>] -Name <String> [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>]
[<CommonParameters>]
```

### GetViaIdentity
```
Get-AzKubernetesConfigurationFlux -InputObject <IKubernetesConfigurationIdentity> [-DefaultProfile <PSObject>]
[<CommonParameters>]
[-ProgressAction <ActionPreference>] [<CommonParameters>]
```

## DESCRIPTION
Expand Down Expand Up @@ -143,6 +143,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -ResourceGroupName
The name of the resource group.
The name is case insensitive.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ Gets Kubernetes Cluster Extension.
### List (Default)
```
Get-AzKubernetesExtension -ClusterName <String> -ClusterType <String> -ResourceGroupName <String>
[-SubscriptionId <String[]>] [-DefaultProfile <PSObject>]
[-SubscriptionId <String[]>] [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>]
[<CommonParameters>]
```

### Get
```
Get-AzKubernetesExtension -ClusterName <String> -ClusterType <String> -ResourceGroupName <String>
[-SubscriptionId <String[]>] -Name <String> [-DefaultProfile <PSObject>]
[-SubscriptionId <String[]>] -Name <String> [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>]
[<CommonParameters>]
```

### GetViaIdentity
```
Get-AzKubernetesExtension -InputObject <IKubernetesConfigurationIdentity> [-DefaultProfile <PSObject>]
[<CommonParameters>]
[-ProgressAction <ActionPreference>] [<CommonParameters>]
```

## DESCRIPTION
Expand Down Expand Up @@ -144,6 +144,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -ResourceGroupName
The name of the resource group.
The name is case insensitive.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ New-AzKubernetesConfiguration -ClusterName <String> -ClusterType <String> -Name
[-EnableHelmOperator] [-HelmOperatorChartValue <String>] [-HelmOperatorChartVersion <String>]
[-OperatorInstanceName <String>] [-OperatorNamespace <String>] [-OperatorParam <String>]
[-OperatorScope <OperatorScopeType>] [-OperatorType <OperatorType>] [-ClusterScoped] [-RepositoryUrl <String>]
[-SshKnownHost <String>] [-DefaultProfile <PSObject>] [-WhatIf]
[-SshKnownHost <String>] [-DefaultProfile <PSObject>] [-ProgressAction <ActionPreference>] [-WhatIf]
[-Confirm] [<CommonParameters>]
```

Expand Down Expand Up @@ -271,6 +271,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -RepositoryUrl
Url of the SourceControl Repository.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ New-AzKubernetesConfigurationFlux -ClusterName <String> -ClusterType <String> -N
[-ServicePrincipalClientCertificate <String>] [-ServicePrincipalClientCertificatePassword <String>]
[-ServicePrincipalClientCertificateSendChain] [-ServicePrincipalClientId <String>]
[-ServicePrincipalClientSecret <String>] [-ServicePrincipalTenantId <String>] [-SourceKind <SourceKindType>]
[-Suspend] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-WhatIf]
[-Suspend] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait] [-ProgressAction <ActionPreference>] [-WhatIf]
[-Confirm] [<CommonParameters>]
```

Expand Down Expand Up @@ -533,6 +533,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -RepositoryRefBranch
The git repository branch name to checkout.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ New-AzKubernetesExtension -ClusterName <String> -ClusterType <String> -Name <Str
[-IdentityType <ResourceIdentityType>] [-TargetNamespace <String>] [-PlanName <String>]
[-PlanProduct <String>] [-PlanPromotionCode <String>] [-PlanPublisher <String>] [-PlanVersion <String>]
[-ReleaseTrain <String>] [-Version <String>] [-DefaultProfile <PSObject>] [-AsJob] [-NoWait]
[-WhatIf] [-Confirm] [<CommonParameters>]
[-ProgressAction <ActionPreference>] [-WhatIf] [-Confirm] [<CommonParameters>]
```

## DESCRIPTION
Expand Down Expand Up @@ -319,6 +319,21 @@ Accept pipeline input: False
Accept wildcard characters: False
```

### -ProgressAction
{{ Fill ProgressAction Description }}

```yaml
Type: System.Management.Automation.ActionPreference
Parameter Sets: (All)
Aliases: proga

Required: False
Position: Named
Default value: None
Accept pipeline input: False
Accept wildcard characters: False
```

### -ReleaseNamespace
Namespace where the extension Release must be placed, for a Cluster scoped extension.
If this namespace does not exist, it will be created
Expand Down
Loading