yujunjun/graphrag-accelerator
1
0
Fork 0
mirror of https://github.com/Azure-Samples/graphrag-accelerator.git synced 2025-06-27 04:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix overlapping CIDR block (#209)

Browse Source
This commit is contained in:
Josh Bradley 2024-12-14 00:59:41 -05:00 committed by GitHub
parent dd6ed869f3
commit ac13ee1757
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.devcontainer/devcontainer.json
View File

@ -19,8 +19,9 @@
"PATH": "${containerEnv:PATH}", "PATH": "${containerEnv:PATH}",
// Add src folder to PYTHONPATH so that we can import modules that // Add src folder to PYTHONPATH so that we can import modules that
// are in the source dir // are in the source dir
"PYTHONPATH": "/graphrag-accelerator/backend/:$PATH", "PYTHONPATH": "/graphrag-accelerator/backend/:$PATH"
"AZURE_CLI_DISABLE_CONNECTION_VERIFICATION": "1" // disable SSL verification for Azure CLI if working in CodeSpaces
// "AZURE_CLI_DISABLE_CONNECTION_VERIFICATION": "1"
}, },
"mounts": [ "mounts": [
// NOTE: we reference both HOME and USERPROFILE environment variables to simultaneously support both Windows and Unix environments // NOTE: we reference both HOME and USERPROFILE environment variables to simultaneously support both Windows and Unix environments

8
.dockerignore
View File

@ -2,12 +2,12 @@ notebooks
# Environments # Environments
.env .env
.venv
env/ env/
venv/
ENV/ ENV/
env.bak/ **/env.bak
venv.bak/ **/venv.bak
**/.venv
**/venv
.github .github
.git .git

2
docker/Dockerfile-backend
View File

@ -18,7 +18,7 @@ RUN cd backend \
&& poetry install && poetry install
# download all nltk data that graphrag requires # download all nltk data that graphrag requires
RUN python -m nltk.downloader punkt averaged_perceptron_tagger maxent_ne_chunker words wordnet RUN python -c "import nltk;nltk.download(['punkt','averaged_perceptron_tagger','maxent_ne_chunker','words','wordnet'])"
WORKDIR /backend WORKDIR /backend
EXPOSE 80 EXPOSE 80

5
infra/core/aks/aks.bicep
View File

@ -132,8 +132,9 @@ resource aks 'Microsoft.ContainerService/managedClusters@2024-02-01' = {
} }
} }
networkProfile: { networkProfile: {
serviceCidr: '10.2.0.0/16' serviceCidr: '10.3.0.0/16' // must not overlap with any subnet IP ranges
dnsServiceIP: '10.2.0.10' dnsServiceIP: '10.3.0.10' // must be within the range specified in serviceCidr
podCidr: '10.244.0.0/16' // IP range from which to assign pod IPs
} }
autoUpgradeProfile: autoUpgradeProfile autoUpgradeProfile: autoUpgradeProfile
oidcIssuerProfile: { oidcIssuerProfile: {

39
infra/core/cosmosdb/cosmosdb.bicep
View File

@ -89,45 +89,6 @@ resource graphragDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@20
} }
} }
//// comment out entitiesContainer resource as the set of entity configuration API endpoints that use this have been disabled for now
// resource entitiesContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2022-11-15' = {
// parent: graphragDatabase
// name: 'entities'
// properties: {
// resource: {
// id: 'entities'
// indexingPolicy: {
// indexingMode: 'consistent'
// automatic: true
// includedPaths: [
// {
// path: '/*'
// }
// ]
// excludedPaths: [
// {
// path: '/"_etag"/?'
// }
// ]
// }
// partitionKey: {
// paths: [
// '/id'
// ]
// kind: 'Hash'
// version: 2
// }
// uniqueKeyPolicy: {
// uniqueKeys: []
// }
// conflictResolutionPolicy: {
// mode: 'LastWriterWins'
// conflictResolutionPath: '/_ts'
// }
// }
// }
// }
resource jobsContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2022-11-15' = { resource jobsContainer 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2022-11-15' = {
parent: graphragDatabase parent: graphragDatabase
name: 'jobs' name: 'jobs'

6
infra/main.bicep
View File

@ -127,14 +127,14 @@ resource vnet 'Microsoft.Network/virtualNetworks@2024-01-01' = {
properties: { properties: {
addressSpace: { addressSpace: {
addressPrefixes: [ addressPrefixes: [
'10.0.0.0/8' '10.1.0.0/16'
] ]
} }
subnets: [ subnets: [
{ {
name: '${abbrs.networkVirtualNetworksSubnets}apim' name: '${abbrs.networkVirtualNetworksSubnets}apim'
properties: { properties: {
addressPrefix: '10.0.0.0/16' addressPrefix: '10.1.0.0/24'
networkSecurityGroup: { networkSecurityGroup: {
id: nsg.outputs.id id: nsg.outputs.id
} }
@ -151,7 +151,7 @@ resource vnet 'Microsoft.Network/virtualNetworks@2024-01-01' = {
{ {
name: '${abbrs.networkVirtualNetworksSubnets}aks' name: '${abbrs.networkVirtualNetworksSubnets}aks'
properties: { properties: {
addressPrefix: '10.1.0.0/16' addressPrefix: '10.1.1.0/24'
serviceEndpoints: [ serviceEndpoints: [
{ {
service: 'Microsoft.Storage' service: 'Microsoft.Storage'