Skip to content

Commit f687998

Browse files
mengqiymengqiy
authored
Merge branch 'awslabs:main' into SAtoken
2 parents a0c6b70 + e458f88 commit f687998

File tree

10 files changed

+63
-73
lines changed

10 files changed

+63
-73
lines changed

‎infrastructure/package-lock.json

+38-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎operator/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ require (
7272
google.golang.org/appengine v1.6.7 // indirect
7373
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
7474
google.golang.org/grpc v1.56.3 // indirect
75-
google.golang.org/protobuf v1.30.0 // indirect
75+
google.golang.org/protobuf v1.33.0 // indirect
7676
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7777
gopkg.in/inf.v0 v0.9.1 // indirect
7878
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

‎operator/go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -2005,8 +2005,9 @@ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
20052005
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
20062006
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
20072007
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2008-
google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
20092008
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2009+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
2010+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
20102011
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
20112012
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
20122013
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎substrate/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ require (
137137
google.golang.org/appengine v1.6.7 // indirect
138138
google.golang.org/genproto v0.0.0-20221227171554-f9683d7f8bef // indirect
139139
google.golang.org/grpc v1.52.0 // indirect
140-
google.golang.org/protobuf v1.28.1 // indirect
140+
google.golang.org/protobuf v1.33.0 // indirect
141141
gopkg.in/inf.v0 v0.9.1 // indirect
142142
gopkg.in/yaml.v2 v2.4.0 // indirect
143143
gopkg.in/yaml.v3 v3.0.1 // indirect

‎substrate/go.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -2289,8 +2289,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
22892289
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
22902290
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
22912291
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2292-
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
22932292
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
2293+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
2294+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
22942295
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
22952296
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
22962297
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎tests/assets/eks_node_group_launch_template.json

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
"ClusterName": {
1010
"Type": "String",
1111
"Description": "Name of the Cluster"
12+
},
13+
"SSHKeyName": {
14+
"Type": "String",
15+
"Description": "SSH Key Name for EC2 instances"
1216
}
1317
},
1418
"Resources": {
@@ -17,6 +21,7 @@
1721
"Properties": {
1822
"LaunchTemplateName": { "Ref": "LaunchTemplateName" },
1923
"LaunchTemplateData": {
24+
"KeyName": { "Ref": "SSHKeyName" },
2025
"BlockDeviceMappings": [
2126
{
2227
"DeviceName": "/dev/xvda",

‎tests/tasks/generators/clusterloader/load-slos.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
git checkout $(params.cl2-branch)
6262
git branch
6363
- name: prepare-loadtest
64-
image: golang:1.22
64+
image: golang:1.23
6565
workingDir: $(workspaces.source.path)
6666
script: |
6767
S3_RESULT_PATH=$(params.results-bucket)

‎tests/tasks/setup/eks/awscli-cfn-lt.yaml

+12-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,17 @@ spec:
4141
fi
4242
4343
curl -s $(params.ng-cfn-url) -o ./amazon-ng-cfn
44-
44+
45+
SSH_KEY_NAME=scaletest-nodegroups-ssh-key
46+
if [[ "$(aws ec2 --region "$(params.region)" describe-key-pairs --key-names "$SSH_KEY_NAME" --query 'KeyPairs[0].KeyName' --output text)" == "$SSH_KEY_NAME" ]]; then
47+
echo "KeyPair '$SSH_KEY_NAME' already exists."
48+
else
49+
echo "KeyPair not found. Creating a new keypair."
50+
# Given these are temp nodes, outputting key for devs to copy it to use for debugging
51+
#ToDo - store it in s3 for devs to download it.
52+
aws ec2 create-key-pair --region $(params.region) --key-name $SSH_KEY_NAME --query 'KeyMaterial' --output text
53+
fi
54+
4555
launch_template_name=$(params.cluster-name)-launchTemplate
4656
STACK_NAME=$(params.stack-name)
4757
STACK_STATUS=$(aws cloudformation describe-stacks --query 'Stacks[?StackName==`'${STACK_NAME}'`].StackStatus' --output text --region $(params.region))
@@ -52,6 +62,7 @@ spec:
5262
--template-body file://$(pwd)/amazon-ng-cfn \
5363
--parameters ParameterKey=LaunchTemplateName,ParameterValue=$launch_template_name\
5464
ParameterKey=ClusterName,ParameterValue=$(params.cluster-name)\
65+
ParameterKey=SSHKeyName,ParameterValue=$SSH_KEY_NAME\
5566
--region $(params.region)
5667
5768
aws cloudformation wait stack-create-complete --stack-name $STACK_NAME --region $(params.region)

‎tests/tasks/setup/eks/awscli-cp-with-vpc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
# Apiserver is not recongnizing deamonset for sometime inconsistently, need to see if livez/readyz are healthy
7676
while true; do date && kubectl get --raw "/readyz" --v=10 && break ; sleep 5; done
7777
#ToDo remove this, adding to help eks networking evaluate ec2 DescribeNetworkInterface feature performance
78-
kubectl set image daemonset/aws-node -n kube-system aws-node=public.ecr.aws/e4l5e7p8/amazon/amazon-k8s-cni:v1.18.3-scalability-rc1
78+
kubectl set image daemonset/aws-node -n kube-system aws-node=public.ecr.aws/b4u2x4n7/cni:v1.19.1-rc1
7979
kubectl set env daemonset/aws-node -n kube-system ENABLE_PREFIX_DELEGATION=true
8080
# install csi drivers.
8181
kubectl apply -k "github.com/kubernetes-sigs/aws-ebs-csi-driver/deploy/kubernetes/overlays/stable/?ref=$(params.aws-ebs-csi-driver-version)"

‎tests/tasks/setup/eks/awscli-mng.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ spec:
6969
asgs=$((nodes/max_nodes))
7070
echo "asgs: $asgs"
7171
node_group=$(params.nodegroup-prefix)$(params.cluster-name)-nodes
72-
7372
create_and_validate_dp_nodes()
7473
{
7574
node_group_name=$node_group-$1

0 commit comments

Comments
 (0)