Skip to content

Commit

Permalink
changes for M2 integration (#201)
Browse files Browse the repository at this point in the history
* Users/jagamu/enable workload identity for aio (#1)

* enable workloadidentity for AIO

* check for apiserver readiness after apiserver restart

* Users/jagamu/wi changes for k8s (#2)

* ensure connected status

* enable WI for k8s for AIO

* use same timeout as Connect-AksEdgeArc

* align tags with AKSEE PS (#3)

* fix serviceaccountissuer for K8s (#4)

* handle az cli cmd errors gracefully and cleanup logging (#5)

* handle az cli cmd errors gracefully and cleanup logging

* use Arc PublicPreview bits

* add CustomLocationsOid parameter

* script cleanup, integrate gateway feature (#6)

* script cleanup, integrate gateway feature

* integrate arc gateway

* use connected.whl version supporting WLIF & Gateway together (#7)

* initial changes for easier merge with main

* use latest public preview version of connectedk8s

* remove canary region - eastus2euap

* use jagadishmurugan till the time the changes are merged to main

* use latest public preview connectedk8s drop

* proxy support

* remove default no_proxy settings to avoid ACSA extension failure

* replace fork to Azure
  • Loading branch information
jagadishmurugan authored Oct 3, 2024
1 parent 2ecc6df commit 7f4a481
Show file tree
Hide file tree
Showing 4 changed files with 205 additions and 54 deletions.
6 changes: 4 additions & 2 deletions tools/modules/AksEdgeDeploy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ The `Start-AideWorkflow` function in the modole does the following:

```json
{
"SchemaVersion": "1.1",
"SchemaVersion": "1.2",
"Version": "1.0",
"AksEdgeProduct" : "AKS Edge Essentials - K3s",
"AksEdgeConfig": {
Expand Down Expand Up @@ -50,7 +50,8 @@ The `Start-AideWorkflow` function in the modole does the following:
"TenantId":"",
"ResourceGroupName": "aksedge-rg",
"ServicePrincipalName" : "aksedge-sp",
"Location" : "EastUS"
"Location" : "EastUS",
"EnableWorkloadIdentity": true
}
}
```
Expand Down Expand Up @@ -81,6 +82,7 @@ Find below the details of the supported parameters in the json file.
|| CustomLocationOID | Optional | GUID | ObjectID for the custom location resource provider |
|| `Auth`.ServicePrincipalId |Mandatory | GUID | Specify service principal appID to use|
|| `Auth`.Password |Mandatory| String | Specify the password (in clear) |
|| EnableWorkloadIdentity |Optional| Boolean | Enable secure workload access to azure resource |
|InstallOptions| InstallPath | Optional | String | Path to install the product |
|| VhdxPath | Optional | String | Path to store the vhdx files |
|VSwitch| Name | Optional | String | Name for the external switch, mandatory for ScalableCluster|
Expand Down
11 changes: 10 additions & 1 deletion tools/modules/AksEdgeDeploy/aide-ucschema.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"properties": {
"SchemaVersion": {
"type": "string",
"default": "1.1",
"default": "1.2",
"description": "Version of the schema/format of the json"
},
"Version": {
Expand Down Expand Up @@ -72,6 +72,15 @@
"description": "Password corresponding to ServicePrincipalId to onboard Arc-enabled Server/Kubernetes"
}
}
},
"EnableWorkloadIdentity": {
"type": "boolean"
},
"EnableKeyManagement": {
"type": "boolean"
},
"GatewayResourceId": {
"type": "string"
}
}
},
Expand Down
7 changes: 5 additions & 2 deletions tools/modules/AksEdgeDeploy/aide-userconfig.puml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jsonDiagram {
</style>
#highlight "SchemaVersion"
{
"SchemaVersion":"1.1",
"SchemaVersion":"1.2",
"Version":"1.0",
"AksEdgeProduct" : [
"AKS Edge Essentials - K8s",
Expand All @@ -40,7 +40,10 @@ jsonDiagram {
"Auth": {
"ServicePrincipalId" : "GUID",
"Password" : "String"
}
},
"EnableWorkloadIdentity" : "Boolean",
"EnableKeyManagement" : "Boolean",
"GatewayResourceId": "String"
}
,
"InstallOptions":{
Expand Down
Loading

0 comments on commit 7f4a481

Please sign in to comment.