Skip to content

Commit 3123c85

Browse files
authored
Merge pull request #116 from aws-observability/fix/blueprintsRelease
Upgrade Versions due to Blueprints Release
2 parents 8f07b19 + d1f6206 commit 3123c85

File tree

6 files changed

+22
-17
lines changed

6 files changed

+22
-17
lines changed

lib/existing-eks-opensource-observability-pattern/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ export default class ExistingEksOpenSourceobservabilityPattern {
118118
.account(account)
119119
.region(region)
120120
.version('auto')
121-
.enableOpenSourcePatternAddOns(ampAddOnProps)
121+
.enableOpenSourcePatternAddOns()
122+
.withAmpProps(ampAddOnProps)
122123
.clusterProvider(importClusterProvider)
123124
.resourceProvider(blueprints.GlobalResources.Vpc, new blueprints.VpcProvider(vpcId)) // this is required with import cluster provider
124125
.resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))

lib/multi-acc-new-eks-mixed-observability-pattern/amp-monitoring.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ export default class AmpMonitoringConstruct {
6363
.account(account)
6464
.region(region)
6565
.version('auto')
66-
.enableOpenSourcePatternAddOns(ampAddOnProps)
66+
.enableOpenSourcePatternAddOns()
67+
.withAmpProps(ampAddOnProps)
6768
.resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
6869
.addOns(...addOns)
6970
.teams(new team.TeamGeordi, new team.CorePlatformTeam);

lib/single-new-eks-opensource-observability-pattern/gpu-index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ export default class SingleNewEksGpuOpenSourceObservabilityPattern {
7575
.account(account)
7676
.region(region)
7777
.version('auto')
78-
.enableOpenSourcePatternAddOns(ampAddOnProps)
78+
.enableOpenSourcePatternAddOns()
79+
.withAmpProps(ampAddOnProps)
7980
.resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
8081
.clusterProvider(
8182
new blueprints.GenericClusterProvider({

lib/single-new-eks-opensource-observability-pattern/graviton-index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ export default class SingleNewEksGravitonOpenSourceObservabilityPattern {
9292
.account(account)
9393
.region(region)
9494
.version('auto')
95-
.enableOpenSourcePatternAddOns(ampAddOnProps,"v1.27.1-eksbuild.1")
95+
.enableOpenSourcePatternAddOns()
96+
.withAmpProps(ampAddOnProps)
9697
.resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
9798
.clusterProvider(new blueprints.MngClusterProvider(mngProps))
9899
.addOns(...addOns)

lib/single-new-eks-opensource-observability-pattern/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ export default class SingleNewEksOpenSourceobservabilityPattern {
100100
.account(account)
101101
.region(region)
102102
.version('auto')
103-
.enableOpenSourcePatternAddOns(ampAddOnProps)
103+
.enableOpenSourcePatternAddOns()
104+
.withAmpProps(ampAddOnProps)
104105
.resourceProvider(ampWorkspaceName, new blueprints.CreateAmpProvider(ampWorkspaceName, ampWorkspaceName))
105106
.addOns(...addOns)
106107
.build(scope, stackId);

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@
1010
"lint": "npx eslint . --ext .js,.jsx,.ts,.tsx"
1111
},
1212
"devDependencies": {
13-
"@aws-quickstart/eks-blueprints": "^1.11.3",
13+
"@aws-quickstart/eks-blueprints": "^1.12.0",
1414
"@types/jest": "^29.5.1",
15-
"@types/node": "^18.15.12",
16-
"@typescript-eslint/eslint-plugin": "^5.59.0",
17-
"@typescript-eslint/parser": "^5.59.0",
15+
"@types/node": "^18.17.5",
16+
"@typescript-eslint/eslint-plugin": "^6.4.0",
17+
"@typescript-eslint/parser": "^6.4.0",
1818
"copyfiles": "^2.4.1",
1919
"eslint": "^8.38.0",
20-
"jest": "^29.5.0",
20+
"jest": "^29.6.2",
2121
"ts-jest": "^29.1.0",
2222
"ts-node": "^10.9.1",
23-
"typescript": "^5.0.4"
23+
"typescript": "^5.2.2"
2424
},
2525
"dependencies": {
26-
"@aws-quickstart/eks-blueprints": "^1.11.3",
27-
"aws-cdk": "2.91.0",
26+
"@aws-quickstart/eks-blueprints": "^1.12.0",
27+
"aws-cdk": "2.99.1",
2828
"aws-sdk": "^2.1455.0",
29-
"constructs": "^10.0.0",
29+
"constructs": "^10.2.33",
3030
"eks-blueprints-cdk-kubeflow-ext": "0.1.9",
3131
"source-map-support": "^0.5.21"
3232
},
3333
"overrides": {
34-
"@aws-quickstart/eks-blueprints": "^1.11.3",
35-
"aws-cdk": "2.91.0",
34+
"@aws-quickstart/eks-blueprints": "^1.12.0",
35+
"aws-cdk": "2.99.1",
3636
"xml2js": "0.5.0"
3737
}
38-
}
38+
}

0 commit comments

Comments
 (0)