diff --git a/examples/blueprint-construct/index.ts b/examples/blueprint-construct/index.ts index 925b5f8a5..6f34e4460 100644 --- a/examples/blueprint-construct/index.ts +++ b/examples/blueprint-construct/index.ts @@ -63,7 +63,7 @@ export default class BlueprintConstruct { new blueprints.addons.PrometheusNodeExporterAddOn(), new blueprints.addons.AdotCollectorAddOn({ namespace:'adot', - version: 'v0.88.0-eksbuild.2' + version: 'auto' }), new blueprints.addons.AmpAddOn({ ampPrometheusEndpoint: ampWorkspace.attrPrometheusEndpoint, diff --git a/lib/addons/adot/index.ts b/lib/addons/adot/index.ts index 90a2153ad..200a7459a 100644 --- a/lib/addons/adot/index.ts +++ b/lib/addons/adot/index.ts @@ -5,7 +5,6 @@ import { createNamespace, dependable, loadYaml, readYamlDocument, supportsALL } import { CertManagerAddOn } from "../cert-manager"; import { CoreAddOn, CoreAddOnProps } from "../core-addon"; import { getAdotCollectorPolicyDocument } from "./iam-policy"; -import { semverComparator } from "../helm-addon/helm-version-checker"; import { KubernetesVersion } from "aws-cdk-lib/aws-eks"; const versionMap: Map = new Map([ @@ -47,12 +46,6 @@ export class AdotCollectorAddOn extends CoreAddOn { } @dependable(CertManagerAddOn.name) deploy(clusterInfo: ClusterInfo): Promise { - if (semverComparator("0.88",this.coreAddOnProps.version)) { - console.log("Used Adot Addon Version is Valid"); - } - else { - throw new Error(`Adot Addon Version is not Valid and greater than 0.88.0`); - } const addOnPromise = super.deploy(clusterInfo); return addOnPromise; diff --git a/lib/builders/windows-builder.ts b/lib/builders/windows-builder.ts index 0053533a8..d5ab092eb 100644 --- a/lib/builders/windows-builder.ts +++ b/lib/builders/windows-builder.ts @@ -195,7 +195,7 @@ export class WindowsBuilder extends BlueprintBuilder { public enableKarpenter(): WindowsBuilder { return this.addOns( new addons.KarpenterAddOn(this.karpenterProps) - ) + ); } public withKarpenterProps(props:addons.KarpenterAddOnProps) : this { @@ -249,7 +249,7 @@ function getInstanceType(nodegroupOptions: eks.NodegroupOptions, windowsOptions: function buildGenericNodeGroup(options: WindowsOptions, overrideOptions?: eks.NodegroupOptions): clusterproviders.ManagedNodeGroup { let currentOptions = options.genericNodeGroupOptions; - if ( overrideOptions ) { currentOptions = merge(options.genericNodeGroupOptions, overrideOptions) } + if ( overrideOptions ) { currentOptions = merge(options.genericNodeGroupOptions, overrideOptions); } return { id: currentOptions.nodegroupName || "",