Skip to content

Commit

Permalink
Merge branch 'main' into dcintron/aksavm
Browse files Browse the repository at this point in the history
  • Loading branch information
mosabami authored Oct 11, 2024
2 parents 5488cfd + 9187bd1 commit dff82f2
Show file tree
Hide file tree
Showing 210 changed files with 46,950 additions and 10,021 deletions.
108 changes: 0 additions & 108 deletions .devcontainer/.zshrc

This file was deleted.

81 changes: 47 additions & 34 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,49 @@

{
"name": "Azure CAF rover",
// Update the 'dockerComposeFile' list if you have more compose files or use different names.
"dockerComposeFile": "docker-compose.yml",
// Container user to use in VSCode Online and GitHub Codespaces
"remoteUser": "vscode",
// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
"service": "rover",
// The optional 'workspaceFolder' property is the path VS Code should open by default when
// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
"workspaceFolder": "/tf/caf",
// Use 'settings' to set *default* container specific settings.json values on container create.
// You can edit these settings after create using File > Preferences > Settings > Remote.
"settings": {
"files.eol": "\n",
"terminal.integrated.defaultProfile.linux": "/bin/bash",
"editor.tabSize": 2,
"terminal.integrated.scrollback": 64000,
},
// Uncomment the next line if you want start specific services in your Docker Compose config.
// "runServices": [],
// Uncomment this like if you want to keep your containers running after VS Code shuts down.
// "shutdownAction": "none",
// Uncomment the next line to run commands after the container is created.
//"postCreateCommand": "cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chmod 600 ~/.ssh/* && sudo chown -R $(whoami) /tf/caf && git config --global core.editor vim && pre-commit install && pre-commit autoupdate",
"postCreateCommand": "sudo cp -R /tmp/.ssh-localhost/* ~/.ssh && sudo chown -R $(whoami):$(whoami) /tf/caf ~/.ssh && sudo chmod 400 ~/.ssh/* && git config --global core.editor vi && pre-commit install && pre-commit autoupdate && sudo az aks install-cli",
"postStartCommand": "sudo chmod 666 /var/run/docker.sock",
// Add the IDs of extensions you want installed when the container is created in the array below.
"extensions": [
"4ops.terraform",
"mutantdino.resourcemonitor",
"name": "AKS LZA Dev Container",
"image": "mcr.microsoft.com/devcontainers/base:ubuntu",
"features": {
"ghcr.io/devcontainers/features/azure-cli:1": {},
"ghcr.io/devcontainers/features/terraform:1": {}
},
"customizations": {
"vscode": {
"extensions": [
"ms-azuretools.vscode-bicep",
"eamodio.gitlens",
"golang.go"
]
}
"github.copilot",
"github.copilot-chat",
"gruntfuggly.todo-tree",
"github.vscode-github-actions",
"github.vscode-pull-request-github",
"hashicorp.terraform",
"helixquar.asciidecorator",
"humao.rest-client",
"joffreykern.markdown-toc",
"mhutchie.git-graph",
"ms-azure-devops.azure-pipelines",
"ms-azurecache.vscode-azurecache",
"ms-azuretools.azure-dev",
"ms-azuretools.vscode-azurecontainerapps",
"ms-azuretools.vscode-azureresourcegroups",
"ms-azuretools.vscode-azurestorage",
"ms-azuretools.vscode-azureterraform",
"ms-azuretools.vscode-azurevirtualmachines",
"ms-azuretools.vscode-bicep",
"ms-azuretools.vscode-dapr",
"ms-azuretools.vscode-docker",
"ms-bigdatatools.vscode-asa",
"ms-kubernetes-tools.vscode-aks-tools",
"ms-vscode.azure-account",
"ms-vscode.azure-repos",
"ms-vscode.azurecli",
"msazurermtools.azurerm-vscode-tools",
"stackbreak.comment-divider"
]
}
},
"forwardPorts": [
// Forward ports if needed for local development
],
"postCreateCommand": ".devcontainer/setup.sh"
}
37 changes: 0 additions & 37 deletions .devcontainer/docker-compose.yml

This file was deleted.

11 changes: 11 additions & 0 deletions .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

# Install kubelogin
az aks install-cli

# install kubectl
curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl

# Install Helm
curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
3 changes: 2 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"Jumpstart",
"keyvault",
"Kubelet",
"kubelogin",
"Kubenet",
"Kustomize",
"letsencrypt",
Expand Down Expand Up @@ -106,7 +107,7 @@
"xattr",
"smartbrain"
],
"ignoreWords": ["ACCOUNTNAME","OIDCISSUERURL","UNIQUESTRING"],
"ignoreWords": ["ACCOUNTNAME","OIDCISSUERURL","UNIQUESTRING", "outfile"],
"import": [],
"enableFiletypes": [
"!css",
Expand Down
34 changes: 10 additions & 24 deletions AKS-Landing-Zone-Accelerator.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,31 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.002.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scenarios", "Scenarios", "{26A0F15A-E621-44C1-A5DA-EA0E4E368718}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scenarios", "Scenarios", "{6AECF8CF-34FC-4102-A5AE-F649FDC21692}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing-Scalability", "Testing-Scalability", "{6B4D453A-73F8-48A8-BF50-304B1B4BC52D}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing-Scalability", "Testing-Scalability", "{379D21B8-24B6-401B-A19F-A9D7D4FD1E02}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApi", "Scenarios\Testing-Scalability\dotnet\SimpleApi.csproj", "{D418CBFB-FF6E-48F2-8690-F516E6E41CBE}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scenarios", "Scenarios", "{9733CD30-401E-4C44-AFB8-1DEA545B5DAE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing-Scalability", "Testing-Scalability", "{6493926B-A2F9-49BD-96FE-35AA519863EB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApi", "Scenarios\Testing-Scalability\dotnet\SimpleApi.csproj", "{8810C871-4FAC-405F-8BA4-2D7C11B2FBD8}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApi", "Scenarios\Testing-Scalability\dotnet\SimpleApi.csproj", "{30694D92-2CDD-4C5E-BA67-6777D8778720}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D418CBFB-FF6E-48F2-8690-F516E6E41CBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D418CBFB-FF6E-48F2-8690-F516E6E41CBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D418CBFB-FF6E-48F2-8690-F516E6E41CBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D418CBFB-FF6E-48F2-8690-F516E6E41CBE}.Release|Any CPU.Build.0 = Release|Any CPU
{8810C871-4FAC-405F-8BA4-2D7C11B2FBD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8810C871-4FAC-405F-8BA4-2D7C11B2FBD8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8810C871-4FAC-405F-8BA4-2D7C11B2FBD8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8810C871-4FAC-405F-8BA4-2D7C11B2FBD8}.Release|Any CPU.Build.0 = Release|Any CPU
{30694D92-2CDD-4C5E-BA67-6777D8778720}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{30694D92-2CDD-4C5E-BA67-6777D8778720}.Debug|Any CPU.Build.0 = Debug|Any CPU
{30694D92-2CDD-4C5E-BA67-6777D8778720}.Release|Any CPU.ActiveCfg = Release|Any CPU
{30694D92-2CDD-4C5E-BA67-6777D8778720}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{6B4D453A-73F8-48A8-BF50-304B1B4BC52D} = {26A0F15A-E621-44C1-A5DA-EA0E4E368718}
{D418CBFB-FF6E-48F2-8690-F516E6E41CBE} = {6B4D453A-73F8-48A8-BF50-304B1B4BC52D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {A7C74157-FDE1-49D4-942B-A2BCEE59311E}
{6493926B-A2F9-49BD-96FE-35AA519863EB} = {9733CD30-401E-4C44-AFB8-1DEA545B5DAE}
{8810C871-4FAC-405F-8BA4-2D7C11B2FBD8} = {6493926B-A2F9-49BD-96FE-35AA519863EB}
{379D21B8-24B6-401B-A19F-A9D7D4FD1E02} = {6AECF8CF-34FC-4102-A5AE-F649FDC21692}
{30694D92-2CDD-4C5E-BA67-6777D8778720} = {379D21B8-24B6-401B-A19F-A9D7D4FD1E02}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {1624E49C-0FCF-4216-94EE-B47601C28D73}
SolutionGuid = {0E6CEBEF-05C8-4DD6-B1C9-9698F8FB84E5}
EndGlobalSection
EndGlobal
Loading

0 comments on commit dff82f2

Please sign in to comment.