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.

Sign up for GitHub

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

Jump to bottom

Removing the RP and Gateway SA creation functions #3615

Merged
merged 5 commits into from
Jun 11, 2024
Merged

Removing the RP and Gateway SA creation functions #3615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33e117a
Removing the RP and Gateway SA creation functions
azoppiserpa Jun 5, 2024
b99e58c
removing parameters
azoppiserpa Jun 10, 2024
eb4ac47
npm fix
azoppiserpa Jun 10, 2024
5875f5d
removing unnecessary package locks
azoppiserpa Jun 10, 2024
2ee5231
replacing my package-lock with masters
azoppiserpa Jun 11, 2024
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
3 changes: 0 additions & 3 deletions pkg/deploy/assets/gateway-production-parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
"gatewayServicePrincipalId": {
"value": ""
},
"gatewayStorageAccountDomain": {
"value": ""
},
"gatewayVmSize": {
"value": "Standard_D4s_v3"
},
Expand Down
12 changes: 0 additions & 12 deletions pkg/deploy/assets/gateway-production.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@
"gatewayServicePrincipalId": {
"type": "string"
},
"gatewayStorageAccountDomain": {
"type": "string"
},
"gatewayVmSize": {
"type": "string",
"defaultValue": "Standard_D4s_v3"
Expand Down Expand Up @@ -106,15 +103,6 @@
}
},
"resources": [
{
"sku": {
"name": "Standard_LRS"
},
"location": "[resourceGroup().location]",
"name": "[substring(parameters('gatewayStorageAccountDomain'), 0, indexOf(parameters('gatewayStorageAccountDomain'), '.'))]",
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2019-06-01"
},
{
"sku": {
"name": "Standard"
Expand Down
3 changes: 0 additions & 3 deletions pkg/deploy/assets/rp-production-parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@
"sshPublicKey": {
"value": ""
},
"storageAccountDomain": {
"value": ""
},
"subscriptionResourceGroupName": {
"value": ""
},
Expand Down
12 changes: 0 additions & 12 deletions pkg/deploy/assets/rp-production.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,6 @@
"sshPublicKey": {
"type": "string"
},
"storageAccountDomain": {
"type": "string"
},
"subscriptionResourceGroupName": {
"type": "string"
},
Expand Down Expand Up @@ -534,15 +531,6 @@
"[resourceId('Microsoft.Storage/storageAccounts', substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.')))]"
]
},
{
"sku": {
"name": "Standard_LRS"
},
"location": "[resourceGroup().location]",
"name": "[substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.'))]",
"type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2019-06-01"
},
{
"properties": {
"severity": 2,
Expand Down
4 changes: 0 additions & 4 deletions pkg/deploy/generator/resources_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,3 @@ func (g *generator) gatewayRBAC() []*arm.Resource {
),
}
}

func (g *generator) gatewayStorageAccount() *arm.Resource {
return g.storageAccount("[substring(parameters('gatewayStorageAccountDomain'), 0, indexOf(parameters('gatewayStorageAccountDomain'), '.'))]", nil, nil)
}
4 changes: 0 additions & 4 deletions pkg/deploy/generator/resources_rp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,7 +1558,3 @@ func (g *generator) rpVersionStorageAccount() []*arm.Resource {
},
}
}

func (g *generator) rpStorageAccount() *arm.Resource {
return g.storageAccount("[substring(parameters('storageAccountDomain'), 0, indexOf(parameters('storageAccountDomain'), '.'))]", nil, nil)
}
2 changes: 0 additions & 2 deletions pkg/deploy/generator/templates_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ func (g *generator) gatewayTemplate() *arm.Template {
"gatewayFeatures",
"gatewayMdsdConfigVersion",
"gatewayServicePrincipalId",
"gatewayStorageAccountDomain",
"gatewayVmSize",
"gatewayVmssCapacity",
"keyvaultDNSSuffix",
Expand Down Expand Up @@ -84,7 +83,6 @@ func (g *generator) gatewayTemplate() *arm.Template {
}

t.Resources = append(t.Resources,
g.gatewayStorageAccount(),
g.gatewayLB(),
g.gatewayPLS(),
g.gatewayVMSS(),
Expand Down
2 changes: 0 additions & 2 deletions pkg/deploy/generator/templates_rp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ func (g *generator) rpTemplate() *arm.Template {
"rpParentDomainName",
"rpVmssCapacity",
"sshPublicKey",
"storageAccountDomain",
"subscriptionResourceGroupName",
"vmSize",
"vmssCleanupEnabled",
Expand Down Expand Up @@ -168,7 +167,6 @@ func (g *generator) rpTemplate() *arm.Template {
g.rpLB(),
g.rpLBInternal(),
g.rpVMSS(),
g.rpStorageAccount(),
g.rpLBAlert(30.0, 2, "rp-availability-alert", "PT5M", "PT15M", "DipAvailability"), // triggers on all 3 RPs being down for 10min, can't be >=0.3 due to deploys going down to 32% at times.
g.rpLBAlert(67.0, 3, "rp-degraded-alert", "PT15M", "PT6H", "DipAvailability"), // 1/3 backend down for 1h or 2/3 down for 3h in the last 6h
g.rpLBAlert(33.0, 2, "rp-vnet-alert", "PT5M", "PT5M", "VipAvailability")) // this will trigger only if the Azure network infrastructure between the loadBalancers and VMs is down for 3.5min
Expand Down
Loading
Loading