From 37948f179e03e75d0eabb4f23feb2bad67c34144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Edouard=20Br=C3=A9t=C3=A9ch=C3=A9?=
<charled.breteche@gmail.com>
Date: Thu, 10 Nov 2022 00:53:48 +0100
Subject: [PATCH] fix: kuttl test external-service (#5287)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
Signed-off-by: Charles-Edouard Brétéché <charles.edouard@nirmata.com>
---
.../cornercases/external-metrics/00-keda.yaml | 6 ++++++
.../external-metrics/01-cluster-policy.yaml | 6 ++++++
.../external-metrics/02-policy.yaml | 6 ++++++
.../external-metrics/02-sleep.yaml | 5 -----
.../external-metrics/03-assert.yaml | 9 ---------
.../external-metrics/99-cleanup.yaml | 4 ----
...-assert.yaml => cluster-policy-ready.yaml} | 5 ++++-
...clusterpolicy.yaml => cluster-policy.yaml} | 0
.../external-metrics/keda-ready.yaml | 19 +++++++++++++++++++
.../{01-manifests.yaml => keda.yaml} | 2 --
.../{05-assert.yaml => policy-ready.yaml} | 5 ++++-
.../{05-policy.yaml => policy.yaml} | 0
12 files changed, 45 insertions(+), 22 deletions(-)
create mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/00-keda.yaml
create mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-cluster-policy.yaml
create mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-policy.yaml
delete mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-sleep.yaml
delete mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/03-assert.yaml
delete mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/99-cleanup.yaml
rename test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/{04-assert.yaml => cluster-policy-ready.yaml} (57%)
rename test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/{04-clusterpolicy.yaml => cluster-policy.yaml} (100%)
create mode 100644 test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda-ready.yaml
rename test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/{01-manifests.yaml => keda.yaml} (99%)
rename test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/{05-assert.yaml => policy-ready.yaml} (63%)
rename test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/{05-policy.yaml => policy.yaml} (100%)
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/00-keda.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/00-keda.yaml
new file mode 100644
index 0000000000..05d2215faf
--- /dev/null
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/00-keda.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- keda.yaml
+assert:
+- keda-ready.yaml
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-cluster-policy.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-cluster-policy.yaml
new file mode 100644
index 0000000000..70b5a38aa1
--- /dev/null
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-cluster-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- cluster-policy.yaml
+assert:
+- cluster-policy-ready.yaml
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-policy.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-policy.yaml
new file mode 100644
index 0000000000..57ffd5631d
--- /dev/null
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-policy.yaml
@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+apply:
+- policy.yaml
+assert:
+- policy-ready.yaml
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-sleep.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-sleep.yaml
deleted file mode 100644
index f34516fc2d..0000000000
--- a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/02-sleep.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-# Need to wait for the KEDA images to be pulled, Pods run, and external metrics API group to be properly registered and served.
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
- - command: sleep 20
\ No newline at end of file
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/03-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/03-assert.yaml
deleted file mode 100644
index c2ade741b9..0000000000
--- a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/03-assert.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: keda-metrics-apiserver
- namespace: keda
-status:
- availableReplicas: 1
- readyReplicas: 1
- replicas: 1
\ No newline at end of file
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/99-cleanup.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/99-cleanup.yaml
deleted file mode 100644
index 1eb8dbd558..0000000000
--- a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/99-cleanup.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kuttl.dev/v1beta1
-kind: TestStep
-commands:
- - command: kubectl delete -f 01-manifests.yaml,04-clusterpolicy.yaml,05-policy.yaml --force --wait=false --ignore-not-found=true
\ No newline at end of file
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/04-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/cluster-policy-ready.yaml
similarity index 57%
rename from test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/04-assert.yaml
rename to test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/cluster-policy-ready.yaml
index 9d36296cef..5770a6453c 100644
--- a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/04-assert.yaml
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/cluster-policy-ready.yaml
@@ -3,4 +3,7 @@ kind: ClusterPolicy
metadata:
name: external-metrics-policy
status:
- ready: true
\ No newline at end of file
+ conditions:
+ - reason: Succeeded
+ status: "True"
+ type: Ready
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/04-clusterpolicy.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/cluster-policy.yaml
similarity index 100%
rename from test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/04-clusterpolicy.yaml
rename to test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/cluster-policy.yaml
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda-ready.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda-ready.yaml
new file mode 100644
index 0000000000..059335ea54
--- /dev/null
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda-ready.yaml
@@ -0,0 +1,19 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: keda-metrics-apiserver
+ namespace: keda
+status:
+ availableReplicas: 1
+ readyReplicas: 1
+ replicas: 1
+---
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+ name: scaledobjects.keda.sh
+---
+apiVersion: apiregistration.k8s.io/v1
+kind: APIService
+metadata:
+ name: v1beta1.external.metrics.k8s.io
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-manifests.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda.yaml
similarity index 99%
rename from test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-manifests.yaml
rename to test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda.yaml
index 02598d5442..982f284573 100644
--- a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/01-manifests.yaml
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/keda.yaml
@@ -12,7 +12,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.0
- creationTimestamp: null
labels:
app.kubernetes.io/part-of: keda-operator
app.kubernetes.io/version: 2.8.0
@@ -411,7 +410,6 @@ rules:
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
- creationTimestamp: null
labels:
app.kubernetes.io/name: keda-operator
app.kubernetes.io/part-of: keda-operator
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/05-assert.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/policy-ready.yaml
similarity index 63%
rename from test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/05-assert.yaml
rename to test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/policy-ready.yaml
index 1f89a4d159..a963ab024b 100644
--- a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/05-assert.yaml
+++ b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/policy-ready.yaml
@@ -4,4 +4,7 @@ metadata:
name: external-metrics-policy-default
namespace: default
status:
- ready: true
\ No newline at end of file
+ conditions:
+ - reason: Succeeded
+ status: "True"
+ type: Ready
diff --git a/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/05-policy.yaml b/test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/policy.yaml
similarity index 100%
rename from test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/05-policy.yaml
rename to test/conformance/kuttl/validate/clusterpolicy/cornercases/external-metrics/policy.yaml