diff --git a/kata-deploy/examples/nginx-deployment-nemu.yaml b/kata-deploy/examples/nginx-deployment-nemu.yaml deleted file mode 100644 index 907e3c69d4..0000000000 --- a/kata-deploy/examples/nginx-deployment-nemu.yaml +++ /dev/null @@ -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 diff --git a/kata-deploy/examples/test-deploy-kata-nemu.yaml b/kata-deploy/examples/test-deploy-kata-nemu.yaml deleted file mode 100644 index b15904d208..0000000000 --- a/kata-deploy/examples/test-deploy-kata-nemu.yaml +++ /dev/null @@ -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 diff --git a/kata-deploy/k8s-1.13/kata-nemu-runtimeClass.yaml b/kata-deploy/k8s-1.13/kata-nemu-runtimeClass.yaml deleted file mode 100644 index 9d2ee06503..0000000000 --- a/kata-deploy/k8s-1.13/kata-nemu-runtimeClass.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -kind: RuntimeClass -apiVersion: node.k8s.io/v1alpha1 -metadata: - name: kata-nemu -handler: kata-nemu diff --git a/kata-deploy/k8s-1.14/kata-nemu-runtimeClass.yaml b/kata-deploy/k8s-1.14/kata-nemu-runtimeClass.yaml deleted file mode 100644 index 41298fe2b6..0000000000 --- a/kata-deploy/k8s-1.14/kata-nemu-runtimeClass.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -kind: RuntimeClass -apiVersion: node.k8s.io/v1beta1 -metadata: - name: kata-nemu -handler: kata-nemu diff --git a/kata-deploy/scripts/kata-deploy-docker.sh b/kata-deploy/scripts/kata-deploy-docker.sh index 7e32b40b49..c9b0a24e3b 100755 --- a/kata-deploy/scripts/kata-deploy-docker.sh +++ b/kata-deploy/scripts/kata-deploy-docker.sh @@ -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", diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh index 847cc27af9..172899c067 100755 --- a/kata-deploy/scripts/kata-deploy.sh +++ b/kata-deploy/scripts/kata-deploy.sh @@ -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 <