Skip to content

Commit

Permalink
#1649 Remove deprecated increase & decrease capacity tests
Browse files Browse the repository at this point in the history
Signed-off-by: denverwilliams <[email protected]>
  • Loading branch information
denverwilliams committed Sep 29, 2022
1 parent 2c0606c commit 981182a
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 63 deletions.
121 changes: 60 additions & 61 deletions src/tasks/workload/compatibility.cr
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ task "rollback" do |_, args|
end

desc "Test increasing/decreasing capacity"
# task "increase_decrease_capacity", ["increase_capacity", "decrease_capacity"] do |t, args|
task "increase_decrease_capacity" do |t, args|
VERBOSE_LOGGING.info "increase_decrease_capacity" if check_verbose(args)
CNFManager::Task.task_runner(args) do |args, config|
Expand Down Expand Up @@ -232,66 +231,66 @@ Learn more on remediation by viewing our USAGE.md doc at https://bit.ly/capacity
TEMPLATE
end

desc "Test increasing capacity by setting replicas to 1 and then increasing to 3"
task "increase_capacity" do |_, args|
CNFManager::Task.task_runner(args) do |args, config|
VERBOSE_LOGGING.info "increase_capacity" if check_verbose(args)
emoji_increase_capacity="📦📈"

target_replicas = "3"
base_replicas = "1"
# TODO scale replicatsets separately
# https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#scaling-a-replicaset
# resource["kind"].as_s.downcase == "replicaset"
task_response = CNFManager.cnf_workload_resources(args, config) do | resource|
if resource["kind"].as_s.downcase == "deployment" ||
resource["kind"].as_s.downcase == "statefulset"
final_count = change_capacity(base_replicas, target_replicas, args, config, resource)
target_replicas == final_count
else
true
end
end
# if target_replicas == final_count
if task_response.none?(false)
upsert_passed_task("increase_capacity", "✔️ PASSED: Replicas increased to #{target_replicas} #{emoji_increase_capacity}")
else
upsert_failed_task("increase_capacity", increase_decrease_capacity_failure_msg(target_replicas, emoji_increase_capacity))
end
end
end

desc "Test decrease capacity by setting replicas to 3 and then decreasing to 1"
task "decrease_capacity" do |_, args|
hi = CNFManager::Task.task_runner(args) do |args, config|
VERBOSE_LOGGING.info "decrease_capacity" if check_verbose(args)
target_replicas = "1"
base_replicas = "3"
task_response = CNFManager.cnf_workload_resources(args, config) do | resource|
# TODO scale replicatsets separately
# https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#scaling-a-replicaset
# resource["kind"].as_s.downcase == "replicaset"
if resource["kind"].as_s.downcase == "deployment" ||
resource["kind"].as_s.downcase == "statefulset"
final_count = change_capacity(base_replicas, target_replicas, args, config, resource)
target_replicas == final_count
else
true
end
end
emoji_decrease_capacity="📦📉"

# if target_replicas == final_count
if task_response.none?(false)
ret = upsert_passed_task("decrease_capacity", "✔️ PASSED: Replicas decreased to #{target_replicas} #{emoji_decrease_capacity}")
else
ret = upsert_failed_task("decrease_capacity", increase_decrease_capacity_failure_msg(target_replicas, emoji_decrease_capacity))
end
puts "1 ret: #{ret}"
ret
end
puts "hi: #{hi}"
end
# desc "Test increasing capacity by setting replicas to 1 and then increasing to 3"
# task "increase_capacity" do |_, args|
# CNFManager::Task.task_runner(args) do |args, config|
# VERBOSE_LOGGING.info "increase_capacity" if check_verbose(args)
# emoji_increase_capacity="📦📈"

# target_replicas = "3"
# base_replicas = "1"
# # TODO scale replicatsets separately
# # https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#scaling-a-replicaset
# # resource["kind"].as_s.downcase == "replicaset"
# task_response = CNFManager.cnf_workload_resources(args, config) do | resource|
# if resource["kind"].as_s.downcase == "deployment" ||
# resource["kind"].as_s.downcase == "statefulset"
# final_count = change_capacity(base_replicas, target_replicas, args, config, resource)
# target_replicas == final_count
# else
# true
# end
# end
# # if target_replicas == final_count
# if task_response.none?(false)
# upsert_passed_task("increase_capacity", "✔️ PASSED: Replicas increased to #{target_replicas} #{emoji_increase_capacity}")
# else
# upsert_failed_task("increase_capacity", increase_decrease_capacity_failure_msg(target_replicas, emoji_increase_capacity))
# end
# end
# end

# desc "Test decrease capacity by setting replicas to 3 and then decreasing to 1"
# task "decrease_capacity" do |_, args|
# hi = CNFManager::Task.task_runner(args) do |args, config|
# VERBOSE_LOGGING.info "decrease_capacity" if check_verbose(args)
# target_replicas = "1"
# base_replicas = "3"
# task_response = CNFManager.cnf_workload_resources(args, config) do | resource|
# # TODO scale replicatsets separately
# # https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/#scaling-a-replicaset
# # resource["kind"].as_s.downcase == "replicaset"
# if resource["kind"].as_s.downcase == "deployment" ||
# resource["kind"].as_s.downcase == "statefulset"
# final_count = change_capacity(base_replicas, target_replicas, args, config, resource)
# target_replicas == final_count
# else
# true
# end
# end
# emoji_decrease_capacity="📦📉"

# # if target_replicas == final_count
# if task_response.none?(false)
# ret = upsert_passed_task("decrease_capacity", "✔️ PASSED: Replicas decreased to #{target_replicas} #{emoji_decrease_capacity}")
# else
# ret = upsert_failed_task("decrease_capacity", increase_decrease_capacity_failure_msg(target_replicas, emoji_decrease_capacity))
# end
# puts "1 ret: #{ret}"
# ret
# end
# puts "hi: #{hi}"
# end


def change_capacity(base_replicas, target_replica_count, args, config, resource = {kind: "",
Expand Down
2 changes: 1 addition & 1 deletion tools/github-runner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM myoung34/github-runner:2.296.2-ubuntu-bionic
FROM myoung34/github-runner:2.297.0-ubuntu-bionic

ARG CRYSTAL_VERSION=1.0.0
ARG CRYSTAL_URL=https://github.com/crystal-lang/crystal/releases/download
Expand Down
2 changes: 1 addition & 1 deletion tools/github-runner/create_runners.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ VIPS=(

RUNNER_COUNT=0
for node in "${!RUNNERS[@]}"; do
export RUNNER_IMAGE="conformance/github-runner:v2.296.2" # don't forget the v
export RUNNER_IMAGE="conformance/github-runner:v2.297.0" # don't forget the v
ssh root@${RUNNERS[$node]} "docker pull $RUNNER_IMAGE"
RUNNERS_PER_NODE=4
until [ $RUNNERS_PER_NODE -eq 0 ]; do
Expand Down

0 comments on commit 981182a

Please sign in to comment.