kata-deploy: remove nemu

nemu is no longer supported, so remove it from kata-deploy.

Signed-off-by: Salvador Fuentes <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes 2019-11-15 17:08:46 -06:00 committed by Archana Shinde
parent 5431096f13
commit c78f10f9aa
6 changed files with 0 additions and 99 deletions

View File

@ -1,20 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: nginx-deployment-nemu
spec:
selector:
matchLabels:
app: nginx
replicas: 2
template:
metadata:
labels:
app: nginx
spec:
runtimeClassName: kata-nemu
containers:
- name: nginx
image: nginx:1.14
ports:
- containerPort: 80

View File

@ -1,42 +0,0 @@
apiVersion: apps/v1
kind: Deployment
metadata:
labels:
run: php-apache-kata-nemu
name: php-apache-kata-nemu
spec:
replicas: 1
selector:
matchLabels:
run: php-apache-kata-nemu
template:
metadata:
labels:
run: php-apache-kata-nemu
spec:
runtimeClassName: kata-nemu
containers:
- image: k8s.gcr.io/hpa-example
imagePullPolicy: Always
name: php-apache
ports:
- containerPort: 80
protocol: TCP
resources:
requests:
cpu: 200m
restartPolicy: Always
---
apiVersion: v1
kind: Service
metadata:
name: php-apache-kata-nemu
spec:
ports:
- port: 80
protocol: TCP
targetPort: 80
selector:
run: php-apache-kata-nemu
sessionAffinity: None
type: ClusterIP

View File

@ -1,6 +0,0 @@
---
kind: RuntimeClass
apiVersion: node.k8s.io/v1alpha1
metadata:
name: kata-nemu
handler: kata-nemu

View File

@ -1,6 +0,0 @@
---
kind: RuntimeClass
apiVersion: node.k8s.io/v1beta1
metadata:
name: kata-nemu
handler: kata-nemu

View File

@ -43,10 +43,6 @@ function configure_docker() {
"kata-qemu-virtiofs": {
"path": "/opt/kata/bin/kata-runtime",
"runtimeArgs": [ "--kata-config", "/opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml" ]
},
"kata-nemu": {
"path": "/opt/kata/bin/kata-runtime",
"runtimeArgs": [ "--kata-config", "/opt/kata/share/defaults/kata-containers/configuration-nemu.toml" ]
},
"kata-fc": {
"path": "/opt/kata/bin/kata-runtime",

View File

@ -15,7 +15,6 @@ containerd_conf_file_backup="${containerd_conf_file}.bak"
shims=(
"fc"
"nemu"
"qemu"
"qemu-virtiofs"
"cloud-hypervisor"
@ -72,9 +71,6 @@ function configure_crio() {
local kata_fc_path="/opt/kata/bin/kata-fc"
local kata_fc_conf="crio.runtime.runtimes.kata-fc"
local kata_nemu_path="/opt/kata/bin/kata-nemu"
local kata_nemu_conf="crio.runtime.runtimes.kata-nemu"
local kata_qemu_path="/opt/kata/bin/kata-qemu"
local kata_qemu_conf="crio.runtime.runtimes.kata-qemu"
@ -107,19 +103,6 @@ EOT
EOT
fi
# add kata-nemu config
if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then
echo "Configuration exists $kata_nemu_conf, overwriting"
sed -i "/^\[$kata_nemu_conf\]/,+1s#runtime_path.*#runtime_path = \"${kata_nemu_path}\"#" $crio_conf_file
else
cat <<EOT | tee -a "$crio_conf_file"
# Path to the Kata Containers runtime binary that uses the NEMU hypervisor.
[$kata_nemu_conf]
runtime_path = "${kata_nemu_path}"
EOT
fi
# add kata-fc config
if grep -q "^\[$kata_fc_conf\]" $crio_conf_file; then
echo "Configuration exists for $kata_fc_conf, overwriting"
@ -181,10 +164,6 @@ function configure_containerd() {
runtime_type = "io.containerd.kata-qemu-virtiofs.v2"
[plugins.cri.containerd.runtimes.kata-qemu-virtiofs.options]
ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml"
[plugins.cri.containerd.runtimes.kata-nemu]
runtime_type = "io.containerd.kata-nemu.v2"
[plugins.cri.containerd.runtimes.kata-nemu.options]
ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-nemu.toml"
[plugins.cri.containerd.runtimes.kata-clh]
runtime_type = "io.containerd.kata-clh.v2"
[plugins.cri.containerd.runtimes.kata-clh.options]