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

add EKS 1.30 and 1.31 for testing #1736

Merged
merged 5 commits into from
Jan 14, 2025
Merged

add EKS 1.30 and 1.31 for testing #1736

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
15dd17c
add EKS 1.30 and 1.31 for testing
roystchiang Jan 8, 2025
cfcb7db
add lambda layer for kubectl for EKS 1.30 and 1.31
roystchiang Jan 14, 2025
3effcd4
add more 1.30 and 1.31 clusters
roystchiang Jan 14, 2025
1ea09da
add missing dependency for lambda layer kbuectl in package.json
roystchiang Jan 14, 2025
581979d
update test_config for 1.30 and 1.31
roystchiang Jan 14, 2025
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
52 changes: 52 additions & 0 deletions cdk_infra/lib/config/cluster-config/clusters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,28 @@ clusters:
- name: collector-ci-fargate-1-27
version: "1.27"
launch_type: fargate
- name: collector-ci-arm64-1-30
version: "1.30"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updating test_config is probably the last change need

launch_type: ec2
instance_type: m6g.large
- name: collector-ci-amd64-1-30
version: "1.30"
launch_type: ec2
instance_type: "m5.large"
- name: collector-ci-fargate-1-30
version: "1.30"
launch_type: fargate
- name: collector-ci-arm64-1-31
version: "1.31"
launch_type: ec2
instance_type: m6g.large
- name: collector-ci-amd64-1-31
version: "1.31"
launch_type: ec2
instance_type: "m5.large"
- name: collector-ci-fargate-1-31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we shall add the same for operator-ci-* and java-instrumentation-operator-*

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah I can.

where are java-instrumentation-operator-ci and operator-ci referenced? I tried looking for them but I didn't, so I didn't update

version: "1.31"
launch_type: fargate
# java agent test clustesr
- name: java-instrumentation-operator-ci-amd64-1-24
version: "1.24"
Expand All @@ -66,6 +88,16 @@ clusters:
launch_type: ec2
instance_type: m6g.large
cert_manager: true
- name: java-instrumentation-operator-ci-arm64-1-30
version: "1.30"
launch_type: ec2
instance_type: m6g.large
cert_manager: true
- name: java-instrumentation-operator-ci-arm64-1-31
version: "1.31"
launch_type: ec2
instance_type: m6g.large
cert_manager: true
# operator test clusters
- name: operator-ci-amd64-1-24
version: "1.24"
Expand Down Expand Up @@ -107,3 +139,23 @@ clusters:
launch_type: ec2
instance_type: m6g.large
cert_manager: true
- name: operator-ci-amd64-1-30
version: "1.30"
launch_type: ec2
instance_type: m5.large
cert_manager: true
- name: operator-ci-arm64-1-30
version: "1.30"
launch_type: ec2
instance_type: m6g.large
cert_manager: true
- name: operator-ci-amd64-1-31
version: "1.31"
launch_type: ec2
instance_type: m5.large
cert_manager: true
- name: operator-ci-arm64-1-31
version: "1.31"
launch_type: ec2
instance_type: m6g.large
cert_manager: true
6 changes: 6 additions & 0 deletions cdk_infra/lib/utils/eks/kubectlLayer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { KubectlV24Layer } from '@aws-cdk/lambda-layer-kubectl-v24';
import { KubectlV25Layer } from '@aws-cdk/lambda-layer-kubectl-v25';
import { KubectlV26Layer } from '@aws-cdk/lambda-layer-kubectl-v26';
import { KubectlV27Layer } from '@aws-cdk/lambda-layer-kubectl-v27';
import { KubectlV30Layer } from '@aws-cdk/lambda-layer-kubectl-v30';
import { KubectlV31Layer } from '@aws-cdk/lambda-layer-kubectl-v31';

export function GetLayer(
scope: Construct,
Expand All @@ -19,6 +21,10 @@ export function GetLayer(
return new KubectlV26Layer(scope, 'v26Layer');
case '1.27':
return new KubectlV27Layer(scope, 'v27Layer');
case '1.30':
return new KubectlV30Layer(scope, 'v30Layer');
case '1.31':
return new KubectlV31Layer(scope, 'v31Layer');
default:
throw new Error(`invalid kubernetes version: ${k8sVersion.version}`);
}
Expand Down
2 changes: 1 addition & 1 deletion cdk_infra/lib/utils/eks/validate-interface-schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ec2ClusterInterface } from '../../interfaces/eks/ec2cluster-interface';
const validateSchema = require('yaml-schema-validator');

const supportedLaunchTypes = new Set(['fargate', 'ec2']);
const supportedVersions = new Set(['1.24', '1.25', '1.26', '1.27']);
const supportedVersions = new Set(['1.24', '1.25', '1.26', '1.27', '1.30', '1.31']);
const supportedCPUArchitectures = new Set(['m5', 'm6g', 't4g']);
const supportedNodeSizes = new Set([
'medium',
Expand Down
32 changes: 32 additions & 0 deletions cdk_infra/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions cdk_infra/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
"@aws-cdk/lambda-layer-kubectl-v25": "^2.0.4",
"@aws-cdk/lambda-layer-kubectl-v26": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v27": "^2.1.0",
"@aws-cdk/lambda-layer-kubectl-v30": "^2.0.0",
"@aws-cdk/lambda-layer-kubectl-v31": "^2.0.0",
"aws-cdk-lib": "^2.174.0",
"constructs": "^10.4.2",
"js-yaml": "^4.1.0",
Expand Down
Loading