From f96b48becac1d265e5c90a24674f8ced75484332 Mon Sep 17 00:00:00 2001
From: Saikrishna <saikrishna.edupuganti@intel.com>
Date: Fri, 4 Jan 2019 20:55:14 +0000
Subject: [PATCH] Make naming consistent, kata points to kata-qemu

Runtime class kata-qemu created and older kata point to kata-qemu
handler. Now all the handlers match the crio.conf settings.

Signed-off-by: Saikrishna Edupuganti <saikrishna.edupuganti@intel.com>
---
 .../8-kata/kata-qemu-runtimeClass.yaml             | 10 +++++++++-
 ...deploy-fire.yaml => test-deploy-kata-fire.yaml} | 12 ++++++------
 ...deploy-kata.yaml => test-deploy-kata-qemu.yaml} | 14 +++++++-------
 3 files changed, 22 insertions(+), 14 deletions(-)
 rename clr-k8s-examples/tests/{test-deploy-fire.yaml => test-deploy-kata-fire.yaml} (78%)
 rename clr-k8s-examples/tests/{test-deploy-kata.yaml => test-deploy-kata-qemu.yaml} (76%)

diff --git a/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml b/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml
index cf61111..d3fec57 100644
--- a/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml
+++ b/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml
@@ -1,6 +1,14 @@
+---
 kind: RuntimeClass
 apiVersion: node.k8s.io/v1alpha1
 metadata:
     name: kata
 spec:
-    runtimeHandler: kata
+    runtimeHandler: kata-qemu
+---
+kind: RuntimeClass
+apiVersion: node.k8s.io/v1alpha1
+metadata:
+    name: kata-qemu
+spec:
+    runtimeHandler: kata-qemu
diff --git a/clr-k8s-examples/tests/test-deploy-fire.yaml b/clr-k8s-examples/tests/test-deploy-kata-fire.yaml
similarity index 78%
rename from clr-k8s-examples/tests/test-deploy-fire.yaml
rename to clr-k8s-examples/tests/test-deploy-kata-fire.yaml
index 50d9d78..5342520 100644
--- a/clr-k8s-examples/tests/test-deploy-fire.yaml
+++ b/clr-k8s-examples/tests/test-deploy-kata-fire.yaml
@@ -2,17 +2,17 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    run: php-apache-fire
-  name: php-apache-fire
+    run: php-apache-kata-fc
+  name: php-apache-kata-fc
 spec:
   replicas: 1
   selector:
     matchLabels:
-      run: php-apache-fire
+      run: php-apache-kata-fc
   template:
     metadata:
       labels:
-        run: php-apache-fire
+        run: php-apache-kata-fc
     spec:
       runtimeClassName: kata-fc
       containers:
@@ -30,13 +30,13 @@ spec:
 apiVersion: v1 
 kind: Service
 metadata:
-  name: php-apache-fire
+  name: php-apache-kata-fc
 spec:
   ports:
   - port: 80
     protocol: TCP
     targetPort: 80
   selector:
-    run: php-apache-fire
+    run: php-apache-kata-fc
   sessionAffinity: None
   type: ClusterIP
diff --git a/clr-k8s-examples/tests/test-deploy-kata.yaml b/clr-k8s-examples/tests/test-deploy-kata-qemu.yaml
similarity index 76%
rename from clr-k8s-examples/tests/test-deploy-kata.yaml
rename to clr-k8s-examples/tests/test-deploy-kata-qemu.yaml
index c2e5108..5947359 100644
--- a/clr-k8s-examples/tests/test-deploy-kata.yaml
+++ b/clr-k8s-examples/tests/test-deploy-kata-qemu.yaml
@@ -2,22 +2,22 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    run: php-apache-kata
-  name: php-apache-kata
+    run: php-apache-kata-qemu
+  name: php-apache-kata-qemu
 spec:
   replicas: 1
   selector:
     matchLabels:
-      run: php-apache-kata
+      run: php-apache-kata-qemu
   template:
     metadata:
       annotations:
         io.kubernetes.cri-o.TrustedSandbox: "false"
         io.kubernetes.cri.untrusted-workload: "true"
       labels:
-        run: php-apache-kata
+        run: php-apache-kata-qemu
     spec:
-      runtimeClassName: kata
+      runtimeClassName: kata-qemu
       containers:
       - image: k8s.gcr.io/hpa-example
         imagePullPolicy: Always
@@ -33,13 +33,13 @@ spec:
 apiVersion: v1 
 kind: Service
 metadata:
-  name: php-apache-kata
+  name: php-apache-kata-qemu
 spec:
   ports:
   - port: 80
     protocol: TCP
     targetPort: 80
   selector:
-    run: php-apache-kata
+    run: php-apache-kata-qemu
   sessionAffinity: None
   type: ClusterIP