Skip to content

Commit

Permalink
Revert "PVRE reporting for short lived instances (#427)"
Browse files Browse the repository at this point in the history
This reverts commit 5f48bf6.
hakuna-matatah committed Dec 2, 2023

Verified

This commit was signed with the committer’s verified signature.
snyk-bot Snyk bot
1 parent 85ec60e commit 25e9f3b
Showing 7 changed files with 3 additions and 190 deletions.
67 changes: 0 additions & 67 deletions tests/assets/eks_nodeGroup_LaunchTemplate.yaml

This file was deleted.

25 changes: 1 addition & 24 deletions tests/pipelines/eks/awscli-cl2-load-with-addons.yaml
Original file line number Diff line number Diff line change
@@ -16,7 +16,6 @@ spec:
- name: slack-message
- name: amp-workspace-id
- name: vpc-cfn-url
- name: ng-cfn-url
- name: kubernetes-version
- name: service-role-cfn-url
default: "https://raw.githubusercontent.com/awslabs/kubernetes-iteration-toolkit/main/tests/assets/eks_service_role.json"
@@ -90,26 +89,6 @@ spec:
workspaces:
- name: config
workspace: config
- name: create-launch-template
params:
- name: cluster-name
value: $(params.cluster-name)
- name: stack-name
value: $(params.cluster-name)-launch-template
- name: kubernetes-version
value: "$(params.kubernetes-version)"
- name: ng-cfn-url
value: "$(params.ng-cfn-url)"
- name: endpoint
value: $(params.endpoint)
runAfter:
- create-eks-cluster
taskRef:
kind: Task
name: awscli-eks-cfn-launch-template
workspaces:
- name: config
workspace: config
- name: create-mng-monitoring-nodes
params:
- name: cluster-name
@@ -129,7 +108,7 @@ spec:
- name: nodegroup-prefix
value: "monitoring-"
runAfter:
- create-launch-template
- create-eks-cluster
taskRef:
kind: Task
name: awscli-eks-nodegroup-create
@@ -235,8 +214,6 @@ spec:
value: $(params.cluster-name)-service-role
- name: node-role-stack-name
value: $(params.cluster-name)-node-role
- name: launch-template-stack-name
value: $(params.cluster-name)-launch-template
taskRef:
kind: Task
name: awscli-eks-cluster-teardown
25 changes: 1 addition & 24 deletions tests/pipelines/eks/awscli-eks-cl2-load.yaml
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@ spec:
- name: slack-hook
- name: slack-message
- name: vpc-cfn-url
- name: ng-cfn-url
- name: kubernetes-version
default: "1.23"
- name: amp-workspace-id
@@ -89,26 +88,6 @@ spec:
workspaces:
- name: config
workspace: config
- name: create-cfn-launch-template
params:
- name: cluster-name
value: $(params.cluster-name)
- name: stack-name
value: $(params.cluster-name)-launch-template
- name: kubernetes-version
value: "$(params.kubernetes-version)"
- name: ng-cfn-url
value: "$(params.ng-cfn-url)"
- name: endpoint
value: $(params.endpoint)
runAfter:
- create-eks-cluster
taskRef:
kind: Task
name: awscli-eks-cfn-launch-template
workspaces:
- name: config
workspace: config
- name: create-mng-monitoring-nodes
params:
- name: cluster-name
@@ -128,7 +107,7 @@ spec:
- name: nodegroup-prefix
value: "monitoring-"
runAfter:
- create-cfn-launch-template
- create-eks-cluster
taskRef:
kind: Task
name: awscli-eks-nodegroup-create
@@ -222,8 +201,6 @@ spec:
value: $(params.cluster-name)-service-role
- name: node-role-stack-name
value: $(params.cluster-name)-node-role
- name: launch-template-stack-name
value: $(params.cluster-name)-launch-template
taskRef:
kind: Task
name: awscli-eks-cluster-teardown
69 changes: 0 additions & 69 deletions tests/tasks/setup/eks/awscli-cfn-lt.yaml

This file was deleted.

3 changes: 0 additions & 3 deletions tests/tasks/setup/eks/awscli-mng.yaml
Original file line number Diff line number Diff line change
@@ -75,11 +75,9 @@ spec:
asgs=$((nodes/max_nodes))
echo "asgs: $asgs"
node_group=$(params.nodegroup-prefix)$(params.cluster-name)-nodes
create_and_validate_dp_nodes()
{
node_group_name=$node_group-$1
launch_template_name=$(params.cluster-name)-launchTemplate
CREATED_NODEGROUP=$(aws eks $ENDPOINT_FLAG --region $(params.region) list-nodegroups --cluster-name $(params.cluster-name) --query 'nodegroups[?@==`'$node_group_name'`]' --output text)
EC2_INSTANCES=$3
if [ "$CREATED_NODEGROUP" == "" ]; then
@@ -88,7 +86,6 @@ spec:
--cluster-name $(params.cluster-name) \
--nodegroup-name $node_group_name \
--node-role $NODE_ROLE_ARN \
--launch-template name=$launch_template_name\
--region $(params.region) \
--instance-types $EC2_INSTANCES \
--scaling-config minSize=$(params.min-nodes),maxSize=$2,desiredSize=$2 \
2 changes: 0 additions & 2 deletions tests/tasks/teardown/awscli-eks.yaml
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@ spec:
default: "Job is completed"
- name: service-role-stack-name
- name: node-role-stack-name
- name: launch-template-stack-name
steps:
- name: delete-cluster
image: alpine/k8s:1.23.7
@@ -43,7 +42,6 @@ spec:
script: |
aws cloudformation delete-stack --stack-name $(params.service-role-stack-name)
aws cloudformation delete-stack --stack-name $(params.node-role-stack-name)
aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name)
- name: send-slack-notification
image: alpine/k8s:1.23.7
script: |
2 changes: 1 addition & 1 deletion tests/tasks/teardown/awscli-vpc-delete.yaml
Original file line number Diff line number Diff line change
@@ -29,4 +29,4 @@ spec:
aws cloudformation delete-stack --region $(params.region) --stack-name $(params.stack-name)
# Wait for the stack to be deleted
aws cloudformation wait stack-delete-complete --region $(params.region) --stack-name $(params.stack-name)
echo "Stack deleted successfully!"
echo "Stack deleted successfully!"

0 comments on commit 25e9f3b

Please sign in to comment.