From eff1fc9021f40bc05e30a4efaaa997d002ff30a8 Mon Sep 17 00:00:00 2001
From: Eric Ernst <eric.ernst@intel.com>
Date: Fri, 4 Jan 2019 11:03:31 -0800
Subject: [PATCH] update runtimeClass, binary naming

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
---
 .../{fire-runtimeClass.yaml => kata-fc-runtimeClass.yaml} | 4 ++--
 ...kata-runtimeClass.yaml => kata-qemu-runtimeClass.yaml} | 0
 clr-k8s-examples/README.md                                | 4 ++--
 clr-k8s-examples/Vagrantfile                              | 2 +-
 .../{setup_firecracker.sh => setup_kata_firecracker.sh}   | 8 ++++----
 clr-k8s-examples/tests/test-deploy-fire.yaml              | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename clr-k8s-examples/8-kata/{fire-runtimeClass.yaml => kata-fc-runtimeClass.yaml} (59%)
 rename clr-k8s-examples/8-kata/{kata-runtimeClass.yaml => kata-qemu-runtimeClass.yaml} (100%)
 rename clr-k8s-examples/{setup_firecracker.sh => setup_kata_firecracker.sh} (87%)

diff --git a/clr-k8s-examples/8-kata/fire-runtimeClass.yaml b/clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml
similarity index 59%
rename from clr-k8s-examples/8-kata/fire-runtimeClass.yaml
rename to clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml
index 687f9a5..5ae4d88 100644
--- a/clr-k8s-examples/8-kata/fire-runtimeClass.yaml
+++ b/clr-k8s-examples/8-kata/kata-fc-runtimeClass.yaml
@@ -1,6 +1,6 @@
 kind: RuntimeClass
 apiVersion: node.k8s.io/v1alpha1
 metadata:
-    name: fire
+    name: kata-fc
 spec:
-    runtimeHandler: fire
+    runtimeHandler: kata-fc
diff --git a/clr-k8s-examples/8-kata/kata-runtimeClass.yaml b/clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml
similarity index 100%
rename from clr-k8s-examples/8-kata/kata-runtimeClass.yaml
rename to clr-k8s-examples/8-kata/kata-qemu-runtimeClass.yaml
diff --git a/clr-k8s-examples/README.md b/clr-k8s-examples/README.md
index d54b70f..afa84e1 100644
--- a/clr-k8s-examples/README.md
+++ b/clr-k8s-examples/README.md
@@ -24,7 +24,7 @@ This script ensures the following
 
 ### Enabling experimental firecracker support
 
-> EXPERIMENTAL: Optionally run [`setup_firecracker.sh`](setup_firecracker.sh) to be
+> EXPERIMENTAL: Optionally run [`setup_kata_firecracker.sh`](setup_kata_firecracker.sh) to be
 able to use firecracker VMM with Kata.
 
 The firecracker setup switches the setup to use a sparse file backed loop device for
@@ -77,7 +77,7 @@ An example is
 
 ### Running Kata Workloads with Firecracker
 
-> EXPERIMENTAL: If firecracker setup has been enabled, runtime class set to "fire" will launch the POD/Deployment
+> EXPERIMENTAL: If firecracker setup has been enabled, runtime class set to "kata-fc" will launch the POD/Deployment
 with firecracker as the isolation mechanism for Kata.
 
 An example is
diff --git a/clr-k8s-examples/Vagrantfile b/clr-k8s-examples/Vagrantfile
index 46555e5..5b1c61c 100644
--- a/clr-k8s-examples/Vagrantfile
+++ b/clr-k8s-examples/Vagrantfile
@@ -75,7 +75,7 @@ Vagrant.configure("2") do |config|
       # Bad hack for the vagrant libvirt boxes. WIll be removed once they are fixed.
       c.vm.provision "shell", privileged: false, inline: "sudo usermod --password vagrant root"
       c.vm.provision "shell", privileged: false, path: "setup_system.sh"
-      c.vm.provision "shell", privileged: false, path: "setup_firecracker.sh"
+      c.vm.provision "shell", privileged: false, path: "setup_kata_firecracker.sh"
     end
   end
 end
diff --git a/clr-k8s-examples/setup_firecracker.sh b/clr-k8s-examples/setup_kata_firecracker.sh
similarity index 87%
rename from clr-k8s-examples/setup_firecracker.sh
rename to clr-k8s-examples/setup_kata_firecracker.sh
index 1910821..b2368cf 100755
--- a/clr-k8s-examples/setup_firecracker.sh
+++ b/clr-k8s-examples/setup_kata_firecracker.sh
@@ -62,13 +62,13 @@ sudo systemctl enable --now devicemapper
 
 # For now till we address https://github.com/kubernetes-sigs/cri-o/issues/1991
 # use a shell script to expose firecracker through kata
-cat <<EOT | sudo tee /usr/bin/kata-runtime-fire
+cat <<EOT | sudo tee /usr/bin/kata-fc
 #!/bin/bash
 
 /usr/bin/kata-runtime --kata-config /etc/kata-containers/configuration_firecracker.toml "\$@"
 EOT
 
-sudo chmod +x /usr/bin/kata-runtime-fire
+sudo chmod +x /usr/bin/kata-fc
 
 # Add firecracker as a second runtime
 # Also setup crio to use devicemapper
@@ -76,8 +76,8 @@ sudo chmod +x /usr/bin/kata-runtime-fire
 sudo mkdir -p /etc/crio/
 sudo cp /usr/share/defaults/crio/crio.conf /etc/crio/crio.conf
 
-echo -e "\n[crio.runtime.runtimes.kata]\nruntime_path = \"/usr/bin/kata-runtime\"" | sudo tee -a /etc/crio/crio.conf
-echo -e "\n[crio.runtime.runtimes.fire]\nruntime_path = \"/usr/bin/kata-runtime-fire\"" | sudo tee -a /etc/crio/crio.conf
+echo -e "\n[crio.runtime.runtimes.kata-qemu]\nruntime_path = \"/usr/bin/kata-runtime\"" | sudo tee -a /etc/crio/crio.conf
+echo -e "\n[crio.runtime.runtimes.kata-fc]\nruntime_path = \"/usr/bin/kata-fc\"" | sudo tee -a /etc/crio/crio.conf
 
 sudo sed -i 's|\(\[crio\.runtime\]\)|\1\nmanage_network_ns_lifecycle = true|' /etc/crio/crio.conf
 
diff --git a/clr-k8s-examples/tests/test-deploy-fire.yaml b/clr-k8s-examples/tests/test-deploy-fire.yaml
index a0cb338..50d9d78 100644
--- a/clr-k8s-examples/tests/test-deploy-fire.yaml
+++ b/clr-k8s-examples/tests/test-deploy-fire.yaml
@@ -14,7 +14,7 @@ spec:
       labels:
         run: php-apache-fire
     spec:
-      runtimeClassName: fire
+      runtimeClassName: kata-fc
       containers:
       - image: k8s.gcr.io/hpa-example
         imagePullPolicy: Always