Merge pull request #829 from aws-quickstart/fix/ObservabilityBuilderFix

Fix for ObservabilityBuilder
aws-quickstart · Aug 28, 2023 · d03b06d · d03b06d
2 parents 65f76b4 + a3e0b73
commit d03b06d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/lib/builders/observability-builder.ts b/lib/builders/observability-builder.ts
@@ -31,8 +31,8 @@ export class ObservabilityBuilder extends BlueprintBuilder {
     public enableMixedPatternAddOns(): ObservabilityBuilder {
         return this.addOns(
             new addons.AwsLoadBalancerControllerAddOn(),
-            new addons.AdotCollectorAddOn(),
             new addons.CertManagerAddOn(),
+            new addons.AdotCollectorAddOn(),
             new addons.CoreDnsAddOn(),
             new addons.KubeProxyAddOn(),
             new addons.KubeStateMetricsAddOn(),
@@ -43,19 +43,19 @@ export class ObservabilityBuilder extends BlueprintBuilder {
     /**
      * This method helps you prepare a blueprint for setting up observability 
      * returning an array of blueprint addons for AWS managed open source services
+     * @param ampAddOnProps AmpAddonProps. This is mandatory.
+     * @param kubeProxyVersion KubeProxy Version. This is optional.
      */
-    public enableOpenSourcePatternAddOns(ampPrometheusEndpoint: string): ObservabilityBuilder {
+    public enableOpenSourcePatternAddOns(ampAddOnProps: addons.AmpAddOnProps, kubeProxyVersion?: string): ObservabilityBuilder {
         return this.addOns(
             new addons.AwsLoadBalancerControllerAddOn(),
-            new addons.AdotCollectorAddOn(),
-            new addons.AmpAddOn({
-                ampPrometheusEndpoint: ampPrometheusEndpoint,
-            }),
             new addons.CertManagerAddOn(),
+            new addons.AdotCollectorAddOn(),
+            new addons.AmpAddOn(ampAddOnProps),
             new addons.CoreDnsAddOn(),
             new addons.ExternalsSecretsAddOn(),
             new addons.GrafanaOperatorAddon(),
-            new addons.KubeProxyAddOn(),
+            new addons.KubeProxyAddOn(kubeProxyVersion),
             new addons.KubeStateMetricsAddOn(),
             new addons.MetricsServerAddOn(),
             new addons.PrometheusNodeExporterAddOn());

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@aws-quickstart/eks-blueprints",
-    "version": "1.11.2",
+    "version": "1.11.3",
     "license": "Apache-2.0",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",