Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] ACK Infra prow updates #398

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] ACK Infra prow updates #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions infra/lib/ci-cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export type CIClusterRuntimeProps = {};
export type CIClusterProps = CIClusterCompileTimeProps & CIClusterRuntimeProps;

export class CICluster extends Construct {
readonly testCluster: eks.Cluster;
readonly testCluster: eks.ICluster;

readonly namespaceManifests: eks.KubernetesManifest[];

Expand All @@ -45,11 +45,11 @@ export class CICluster extends Construct {
// Create a set of fargate profiles that run the required services within
// the cluster. Without Flux and Karpenter, the cluster can't load the
// appropriate settings to autoscale for the rest of the namespaces
const fargateProfiles: Map<string, eks.FargateProfileOptions> = new Map([

const fargateProfiles: Map<string, { selectors: {namespace: string; }[]; }> = new Map([
["flux", { selectors: [{ namespace: "flux-system" }] }],
["karpenter", { selectors: [{ namespace: "karpenter" }] }],
]);

const blueprintStack = blueprints.EksBlueprint.builder()
.account(Stack.of(this).account)
.region(Stack.of(this).region)
Expand All @@ -65,14 +65,16 @@ export class CICluster extends Construct {
})
)
.addOns(
new blueprints.addons.CertManagerAddOn(),
// new blueprints.addons.ClusterAutoScalerAddOn(),
new blueprints.addons.AwsLoadBalancerControllerAddOn(),
new blueprints.addons.CertManagerAddOn(),
new blueprints.addons.AdotCollectorAddOn(),
new blueprints.addons.VpcCniAddOn(),
new blueprints.addons.KarpenterAddOn({ version: "v0.24.0" }),
new blueprints.addons.EbsCsiDriverAddOn(),
new blueprints.addons.KarpenterAddOn({ version: "v0.31.3" }),
new blueprints.addons.ExternalDnsAddOn({
hostedZoneResources: [GlobalResources.HostedZone],
})
}),
)
.build(this, CLUSTER_NAME);

Expand Down
2 changes: 1 addition & 1 deletion infra/lib/prow-service-accounts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export type ProwServiceAccountsProps = {
stackPartition: string;
region: string;

prowCluster: eks.Cluster;
prowCluster: eks.ICluster;
namespaceManifests: eks.KubernetesManifest[];

tideStatusBucket: s3.IBucket;
Expand Down
Loading