Skip to content

Disk encryption e2e tests ci cluster creation and tests #1822

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

Merged
m1kola merged 2 commits into from
Nov 16, 2021
Merged

Disk encryption e2e tests ci cluster creation and tests #1822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b63c3d
CI cluster creation with disk encryption + E2E tests
rolandmkunkel Nov 1, 2021
8499c97
review comments
rolandmkunkel Nov 9, 2021
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
171 changes: 171 additions & 0 deletions deploy/cluster-development-predeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
{
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"ci": {
"type": "bool",
"defaultValue": false
},
"clusterName": {
"type": "string"
},
"clusterServicePrincipalId": {
"type": "string"
},
"fpServicePrincipalId": {
"type": "string"
},
"kvName": {
"type": "string"
},
"masterAddressPrefix": {
"type": "string"
},
"routes": {
"type": "array",
"defaultValue": []
},
"vnetAddressPrefix": {
"type": "string"
},
"workerAddressPrefix": {
"type": "string"
}
},
"resources": [
{
"properties": {
"addressSpace": {
"addressPrefixes": [
"[parameters('vnetAddressPrefix')]"
]
}
},
"name": "dev-vnet",
"type": "Microsoft.Network/virtualNetworks",
"location": "[resourceGroup().location]",
"condition": "[parameters('ci')]",
"apiVersion": "2020-08-01"
},
{
"properties": {
"routes": "[parameters('routes')]"
},
"name": "[concat(parameters('clusterName'), '-rt')]",
"type": "Microsoft.Network/routeTables",
"location": "[resourceGroup().location]",
"apiVersion": "2020-08-01"
},
{
"properties": {
"addressPrefix": "[parameters('masterAddressPrefix')]",
"routeTable": {
"id": "[resourceid('Microsoft.Network/routeTables', concat(parameters('clusterName'), '-rt'))]",
"tags": null
}
},
"name": "[concat('dev-vnet/', parameters('clusterName'), '-master')]",
"type": "Microsoft.Network/virtualNetworks/subnets",
"apiVersion": "2020-08-01",
"dependsOn": [
"[resourceid('Microsoft.Network/virtualNetworks', 'dev-vnet')]",
"[resourceid('Microsoft.Network/routeTables', concat(parameters('clusterName'), '-rt'))]"
],
"location": "[resourceGroup().location]"
},
{
"properties": {
"addressPrefix": "[parameters('workerAddressPrefix')]",
"routeTable": {
"id": "[resourceid('Microsoft.Network/routeTables', concat(parameters('clusterName'), '-rt'))]",
"tags": null
}
},
"name": "[concat('dev-vnet/', parameters('clusterName'), '-worker')]",
"type": "Microsoft.Network/virtualNetworks/subnets",
"apiVersion": "2020-08-01",
"dependsOn": [
"[resourceid('Microsoft.Network/virtualNetworks/subnets', 'dev-vnet', concat(parameters('clusterName'), '-master'))]",
"[resourceid('Microsoft.Network/routeTables', concat(parameters('clusterName'), '-rt'))]"
],
"location": "[resourceGroup().location]"
},
{
"name": "[parameters('kvName')]",
"type": "Microsoft.KeyVault/vaults",
"location": "[resourceGroup().location]",
"properties": {
"tenantId": "[subscription().tenantId]",
"sku": {
"family": "A",
"name": "standard"
},
"accessPolicies": [],
"enabledForDiskEncryption": true,
"enablePurgeProtection": true
},
"condition": "[parameters('ci')]",
"apiVersion": "2019-09-01"
},
{
"properties": {
"kty": "RSA",
"keySize": 4096
},
"name": "[concat(parameters('kvName'), '/', concat(resourceGroup().name, '-disk-encryption-key'))]",
"type": "Microsoft.KeyVault/vaults/keys",
"location": "[resourceGroup().location]",
"condition": "[parameters('ci')]",
"apiVersion": "2019-09-01",
"dependsOn": [
"[resourceId('Microsoft.KeyVault/vaults', parameters('kvName'))]"
]
},
{
"identity": {
"type": "SystemAssigned"
},
"properties": {
"activeKey": {
"sourceVault": {
"id": "[resourceId('Microsoft.KeyVault/vaults', parameters('kvName'))]"
},
"keyUrl": "[reference(resourceId('Microsoft.KeyVault/vaults/keys', parameters('kvName'), concat(resourceGroup().name, '-disk-encryption-key')), '2019-09-01', 'Full').properties.keyUriWithVersion]"
}
},
"name": "[concat(resourceGroup().name, '-disk-encryption-set')]",
"type": "Microsoft.Compute/diskEncryptionSets",
"location": "[resourceGroup().location]",
"condition": "[parameters('ci')]",
"apiVersion": "2020-12-01",
"dependsOn": [
"[resourceId('Microsoft.KeyVault/vaults/keys', parameters('kvName'), concat(resourceGroup().name, '-disk-encryption-key'))]"
]
},
{
"name": "[concat(parameters('kvName'), '/add')]",
"type": "Microsoft.KeyVault/vaults/accessPolicies",
"location": "[resourceGroup().location]",
"properties": {
"accessPolicies": [
{
"tenantId": "[subscription().tenantId]",
"objectId": "[reference(resourceId('Microsoft.Compute/diskEncryptionSets', concat(resourceGroup().name, '-disk-encryption-set')), '2021-04-01', 'Full').identity.PrincipalId]",
"permissions": {
"keys": [
"get",
"wrapKey",
"unwrapKey"
]
}
}
]
},
"condition": "[parameters('ci')]",
"apiVersion": "2019-09-01",
"dependsOn": [
"[resourceId('Microsoft.Compute/diskEncryptionSets', concat(resourceGroup().name, '-disk-encryption-set'))]"
]
}
]
}
91 changes: 0 additions & 91 deletions deploy/cluster-predeploy.json
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions hack/validate-imports/validate-imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ func acceptableNames(path string) []string {
return []string{"", "utilnamespace"}
case "github.com/Azure/ARO-RP/pkg/util/recover":
return []string{"", "utilrecover"}
case "github.com/Azure/ARO-RP/pkg/util/azureclient/mgmt/keyvault":
return []string{"", "keyvaultclient"}
case "github.com/Azure/ARO-RP/test/database":
return []string{"testdatabase"}
case "github.com/Azure/ARO-RP/test/util/dynamichelper":
Expand Down
20 changes: 10 additions & 10 deletions pkg/deploy/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/deploy/generator/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const (
FileGatewayProduction = "gateway-production.json"
FileGatewayProductionParameters = "gateway-production-parameters.json"

FileClusterPredeploy = "cluster-predeploy.json"
FileClusterPredeploy = "cluster-development-predeploy.json"
fileEnvDevelopment = "env-development.json"
fileDatabaseDevelopment = "databases-development.json"
fileRPDevelopmentPredeploy = "rp-development-predeploy.json"
Expand Down
Loading