Merge pull request #958 from 01org/topic/cri-o

pod: Support new CRI-O namespaces
intel · Jun 8, 2017 · 65245ec · 65245ec
2 parents 4073858 + da039db
commit 65245ec
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 18 deletions.
diff --git a/src/pod.c b/src/pod.c
@@ -18,19 +18,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-/* Sandbox rootfs */
-#define CC_POD_SANDBOX_ROOTFS "workloads"
-
-/* CRI-O/ocid namespaces */
-#define CC_POD_OCID_NAMESPACE "ocid/"
-#define CC_POD_OCID_NAMESPACE_SIZE 5
-
-#define CC_POD_OCID_CONTAINER_TYPE "ocid/container_type"
-#define CC_POD_OCID_SANDBOX        "sandbox"
-#define CC_POD_OCID_CONTAINER      "container"
-
-#define CC_POD_OCID_SANDBOX_NAME "ocid/sandbox_name"
-
 #include <errno.h>
 #include <string.h>
 #include <sys/mount.h>
@@ -40,11 +27,39 @@
 #include <glib.h>
 #include <gio/gunixconnection.h>
 
+#include "common.h"
 #include "pod.h"
 #include "process.h"
 #include "proxy.h"
 #include "state.h"
 
+/* Sandbox rootfs */
+#define CC_POD_SANDBOX_ROOTFS "workloads"
+
+/* ocid namespaces */
+#define CC_POD_OCID_NAMESPACE "ocid/"
+#define CC_POD_OCID_NAMESPACE_SIZE 5
+#define CC_POD_OCID_SANDBOX_NAME "ocid/sandbox_name"
+#define CC_POD_OCID_CONTAINER_TYPE "ocid/container_type"
+
+/* CRI-O namespaces */
+#define CC_POD_CRIO_NAMESPACE "io.kubernetes.cri-o."
+#define CC_POD_CRIO_NAMESPACE_SIZE 20
+#define CC_POD_CRIO_SANDBOX_NAME "io.kubernetes.cri-o.SandboxName"
+#define CC_POD_CRIO_CONTAINER_TYPE "io.kubernetes.cri-o.ContainerType"
+
+#define CC_POD_OCID_SANDBOX        "sandbox"
+#define CC_POD_OCID_CONTAINER      "container"
+
+enum pod_namespace_id {
+	CC_POD_OCID = 0,
+	CC_POD_CRIO,
+	CC_POD_INVALID = -1
+};
+
+static char *sandbox_name[] = {CC_POD_OCID_SANDBOX_NAME, CC_POD_CRIO_SANDBOX_NAME};
+static char *container_type[] = {CC_POD_OCID_CONTAINER_TYPE, CC_POD_CRIO_CONTAINER_TYPE};
+
 /**
  * Creates a mount point structure for a
  * pod container rootfs.
@@ -105,6 +120,35 @@ add_container_mount(struct cc_oci_config *config) {
 	return false;
 }
 
+/**
+ * Returns a pod namespace ID from an OCI annotation.
+ *
+ * \param annotation \ref oci_cfg_annotation.
+ *
+ * \return a valid pod namespace ID on success, and CC_POD_INVALID on failure.
+ */
+private enum pod_namespace_id
+pod_namespace_present(struct oci_cfg_annotation *annotation)
+{
+	if (annotation == NULL || annotation->key == NULL) {
+		return CC_POD_INVALID;
+	}
+
+	/* We only handle CRI-O and ocid annotations for now */
+	/* Let's check for CRI-O first */
+	if (strncmp(annotation->key, CC_POD_CRIO_NAMESPACE,
+		    CC_POD_CRIO_NAMESPACE_SIZE) == 0) {
+		return CC_POD_CRIO;
+	}
+
+	/* Then we check for the legacy ocid namespace */
+	if (strncmp(annotation->key, CC_POD_OCID_NAMESPACE,
+		    CC_POD_OCID_NAMESPACE_SIZE) == 0) {
+		return CC_POD_OCID;
+	}
+
+	return CC_POD_INVALID;
+}
 
 /**
  * Handle pod related OCI annotations.
@@ -119,6 +163,8 @@ add_container_mount(struct cc_oci_config *config) {
 int
 cc_pod_handle_annotations(struct cc_oci_config *config, struct oci_cfg_annotation *annotation)
 {
+	enum pod_namespace_id namespace_id;
+
 	if (! (config && annotation)) {
 		return -EINVAL;
 	}
@@ -127,9 +173,8 @@ cc_pod_handle_annotations(struct cc_oci_config *config, struct oci_cfg_annotatio
 		return -EINVAL;
 	}
 
-	/* We only handle CRI-O/ocid annotations for now */
-	if (strncmp(annotation->key, CC_POD_OCID_NAMESPACE,
-		    CC_POD_OCID_NAMESPACE_SIZE) != 0) {
+	namespace_id = pod_namespace_present(annotation);
+	if (namespace_id == CC_POD_INVALID) {
 		return 0;
 	}
 
@@ -140,7 +185,7 @@ cc_pod_handle_annotations(struct cc_oci_config *config, struct oci_cfg_annotatio
 		}
 	}
 
-	if (g_strcmp0(annotation->key, CC_POD_OCID_CONTAINER_TYPE) == 0) {
+	if (g_strcmp0(annotation->key, container_type[namespace_id]) == 0) {
 		if (g_strcmp0(annotation->value, CC_POD_OCID_SANDBOX) == 0) {
 			config->pod->sandbox = true;
 			config->pod->sandbox_name = g_strdup(config->optarg_container_id);
@@ -158,7 +203,7 @@ cc_pod_handle_annotations(struct cc_oci_config *config, struct oci_cfg_annotatio
 		} else if (g_strcmp0(annotation->value, CC_POD_OCID_CONTAINER) == 0) {
 			config->pod->sandbox = false;
 		}
-	} else if (g_strcmp0(annotation->key, CC_POD_OCID_SANDBOX_NAME) == 0) {
+	} else if (g_strcmp0(annotation->key, sandbox_name[namespace_id]) == 0) {
 		if (config->pod->sandbox_name) {
 			g_free(config->pod->sandbox_name);
 		}

diff --git a/tests/pod_test.c b/tests/pod_test.c
@@ -31,9 +31,16 @@
 #include "oci.h"
 #include "oci-config.h"
 
+enum pod_namespace_id {
+	CC_POD_OCID = 0,
+	CC_POD_CRIO,
+	CC_POD_INVALID = -1
+};
+
 const gchar *cc_pod_container_id(const struct cc_oci_config *config);
 gboolean cc_pod_is_sandbox(const struct cc_oci_config *config);
 gboolean cc_pod_is_vm(const struct cc_oci_config *config);
+enum pod_namespace_id pod_namespace_present(struct oci_cfg_annotation *annotation);
 
 START_TEST(test_cc_pod_container_id) {
 	struct cc_oci_config *config = NULL;
@@ -127,13 +134,35 @@ START_TEST(test_cc_pod_is_vm) {
 	cc_oci_config_free (config);
 } END_TEST
 
+START_TEST(test_pod_namespace) {
+	struct oci_cfg_annotation *annotation = NULL;
+
+	ck_assert(pod_namespace_present(annotation) == CC_POD_INVALID);
+
+	annotation = g_malloc0 (sizeof (struct oci_cfg_annotation));
+	ck_assert(pod_namespace_present(annotation) == CC_POD_INVALID);
+
+	annotation->key = "foo";
+	ck_assert(pod_namespace_present(annotation) == CC_POD_INVALID);
+
+	annotation->key = "ocid/foo";
+	ck_assert(pod_namespace_present(annotation) == CC_POD_OCID);
+
+	annotation->key = "io.kubernetes.cri-o.foo";
+	ck_assert(pod_namespace_present(annotation) == CC_POD_CRIO);
+
+	/* clean up */
+	g_free(annotation);
+} END_TEST
+
 Suite* make_pod_suite(void) {
 	Suite* s = suite_create(__FILE__);
 
 	ADD_TEST (test_cc_pod_container_id, s);
 	ADD_TEST (test_cc_pod_is_pod_sandbox, s);
 	ADD_TEST (test_cc_pod_is_pod_container, s);
 	ADD_TEST (test_cc_pod_is_vm, s);
+	ADD_TEST (test_pod_namespace, s);
 
 	return s;
 }