Fixing HorizontalPodAutoscalerV2Spec

hagay3 · Jun 28, 2023 · 754f407 · 754f407
1 parent d8a62f5
commit 754f407
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -153,7 +153,7 @@ jobs:
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount  --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'
 
-      - run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2'''
+      - run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2Tag'''
 
   integration-kubernetes-v1-20:
     name: integration-kubernetes-v1-20
@@ -176,7 +176,7 @@ jobs:
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount  --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'
 
-      - run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2'''
+      - run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2Tag'''
 
   integration-kubernetes-v1-21:
     name: integration-kubernetes-v1-21
@@ -199,7 +199,7 @@ jobs:
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount  --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'
 
-      - run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2'''
+      - run: 'sbt ''it:testOnly * -- -l HorizontalPodAutoscalerV2Tag'''
 
   integration-kubernetes-v1-22:
     name: integration-kubernetes-v1-22
@@ -222,7 +222,7 @@ jobs:
           github token: ${{ secrets.GITHUB_TOKEN }}
           start args: '--extra-config=apiserver.disable-admission-plugins=ServiceAccount  --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle'
 
-      - run: 'sbt ''it:testOnly * -- -l CustomResourceTag HorizontalPodAutoscalerV2'''
+      - run: 'sbt ''it:testOnly * -- -l CustomResourceTag -l HorizontalPodAutoscalerV2Tag'''
 
   integration-kubernetes-v1-23:
     name: integration-kubernetes-v1-23

diff --git a/build.sbt b/build.sbt
@@ -96,7 +96,7 @@ def workflowJobMinikube(jobName: String, k8sServerVersion: String, excludedTests
   val finalSbtCommand: String = {
     val additionalFlags: String = {
       if (excludedTestsTags.nonEmpty) {
-        s"* -- -l ${excludedTestsTags.mkString(" ")}"
+        s"* -- ${excludedTestsTags.map(tag => s"-l $tag").mkString(" ")}"
       } else {
         ""
       }
@@ -134,10 +134,10 @@ inThisBuild(List(
   githubWorkflowTargetTags ++= Seq("v*"),
   githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "It/compile"))),
   githubWorkflowAddedJobs := Seq(
-    workflowJobMinikube(jobName = "integration-kubernetes-v1-19", k8sServerVersion = "v1.19.6", List("HorizontalPodAutoscalerV2")),
-    workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11", List("HorizontalPodAutoscalerV2")),
-    workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5", List("HorizontalPodAutoscalerV2")),
-    workflowJobMinikube(jobName = "integration-kubernetes-v1-22", k8sServerVersion = "v1.22.9", List("CustomResourceTag", "HorizontalPodAutoscalerV2")),
+    workflowJobMinikube(jobName = "integration-kubernetes-v1-19", k8sServerVersion = "v1.19.6", List("HorizontalPodAutoscalerV2Tag")),
+    workflowJobMinikube(jobName = "integration-kubernetes-v1-20", k8sServerVersion = "v1.20.11", List("HorizontalPodAutoscalerV2Tag")),
+    workflowJobMinikube(jobName = "integration-kubernetes-v1-21", k8sServerVersion = "v1.21.5", List("HorizontalPodAutoscalerV2Tag")),
+    workflowJobMinikube(jobName = "integration-kubernetes-v1-22", k8sServerVersion = "v1.22.9", List("CustomResourceTag", "HorizontalPodAutoscalerV2Tag")),
     workflowJobMinikube(jobName = "integration-kubernetes-v1-23", k8sServerVersion = "v1.23.6", List("CustomResourceTag")),
     workflowJobMinikube(jobName = "integration-kubernetes-v1-24", k8sServerVersion = "v1.24.1", List("CustomResourceTag"))
   ),

diff --git a/client/src/it/scala/skuber/HorizontalPodAutoscalerV2Spec.scala b/client/src/it/scala/skuber/HorizontalPodAutoscalerV2Spec.scala
@@ -14,7 +14,7 @@ import scala.concurrent.duration._
 
 class HorizontalPodAutoscalerV2Spec extends K8SFixture with Eventually with Matchers with BeforeAndAfterAll with ScalaFutures {
   // Tagging the tests in order to exclude them in earlier CI k8s versions (before 1.23)
-  object HorizontalPodAutoscalerV2 extends Tag("HorizontalPodAutoscalerV2")
+  object HorizontalPodAutoscalerV2Tag extends Tag("HorizontalPodAutoscalerV2Tag")
 
   val horizontalPodAutoscaler1: String = randomUUID().toString
   val horizontalPodAutoscaler2: String = randomUUID().toString
@@ -56,7 +56,7 @@ class HorizontalPodAutoscalerV2Spec extends K8SFixture with Eventually with Matc
 
   behavior of "HorizontalPodAutoscalerV2"
 
-  it should "create a HorizontalPodAutoscaler" taggedAs HorizontalPodAutoscalerV2 in { k8s =>
+  it should "create a HorizontalPodAutoscaler" taggedAs HorizontalPodAutoscalerV2Tag in { k8s =>
 
     println(horizontalPodAutoscaler1)
     k8s.create(getNginxDeployment(deployment1, "1.7.9")).valueT
@@ -65,8 +65,8 @@ class HorizontalPodAutoscalerV2Spec extends K8SFixture with Eventually with Matc
           .withMaxReplicas(2)
           .addResourceMetric(ResourceMetricSource(Resource.cpu, MetricTarget("Utilization", Some(80))))
           .withBehavior(HorizontalPodAutoscalerBehavior(
-            scaleDown = Some(HPAScalingRules(List(HPAScalingPolicy(60, "Pods", 2)))),
-            scaleUp = Some(HPAScalingRules(List(HPAScalingPolicy(120, "Pods", 1))))
+            scaleDown = Some(HPAScalingRules(List(HPAScalingPolicy(60, "Pods", 2)), Some("Max"), Some(100))),
+            scaleUp = Some(HPAScalingRules(List(HPAScalingPolicy(120, "Pods", 1)), Some("Max"), Some(5)))
           )))).valueT
 
     assert(result.name == horizontalPodAutoscaler1)
@@ -75,12 +75,12 @@ class HorizontalPodAutoscalerV2Spec extends K8SFixture with Eventually with Matc
         .withMaxReplicas(2)
         .addResourceMetric(ResourceMetricSource(Resource.cpu, MetricTarget("Utilization", Some(80))))
         .withBehavior(HorizontalPodAutoscalerBehavior(
-          scaleDown = Some(HPAScalingRules(List(HPAScalingPolicy(60, "Pods", 2)))),
-          scaleUp = Some(HPAScalingRules(List(HPAScalingPolicy(120, "Pods", 1))))
+          scaleDown = Some(HPAScalingRules(List(HPAScalingPolicy(60, "Pods", 2)), Some("Max"), Some(100))),
+          scaleUp = Some(HPAScalingRules(List(HPAScalingPolicy(120, "Pods", 1)), Some("Max"), Some(5)))
         ))))
   }
 
-  it should "update a HorizontalPodAutoscaler" taggedAs HorizontalPodAutoscalerV2 in { k8s =>
+  it should "update a HorizontalPodAutoscaler" taggedAs HorizontalPodAutoscalerV2Tag in { k8s =>
 
     k8s.create(getNginxDeployment(deployment2, "1.7.9")).valueT
     val created = k8s.create(HorizontalPodAutoscaler(horizontalPodAutoscaler2).withSpec(HorizontalPodAutoscaler.Spec("v1", "Deployment", "nginx")
@@ -110,7 +110,7 @@ class HorizontalPodAutoscalerV2Spec extends K8SFixture with Eventually with Matc
 
   }
 
-  it should "delete a HorizontalPodAutoscaler" taggedAs HorizontalPodAutoscalerV2 in { k8s =>
+  it should "delete a HorizontalPodAutoscaler" taggedAs HorizontalPodAutoscalerV2Tag in { k8s =>
 
     k8s.create(getNginxDeployment(deployment3, "1.7.9")).valueT
     val created = k8s.create(HorizontalPodAutoscaler(horizontalPodAutoscaler3).withSpec(HorizontalPodAutoscaler.Spec("v1", "Deployment", "nginx")