virtcontainers: remove all the code related to HasCRIContainerType

All the code related to HasCRIContainerType is useless and no longer needed since the CRIContainerType annotation is not considered for constraining or not the sandbox Signed-off-by: Julio Montes <[email protected]>
kata-containers · Apr 28, 2020 · 5cfae21 · 5cfae21
1 parent cff5392
commit 5cfae21
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/virtcontainers/pkg/oci/utils.go b/virtcontainers/pkg/oci/utils.go
@@ -843,8 +843,6 @@ func SandboxConfig(ocispec specs.Spec, runtime RuntimeConfig, bundlePath, cid, c
 		// Spec: &ocispec,
 
 		Experimental: runtime.Experimental,
-
-		HasCRIContainerType: HasCRIContainerType(ocispec.Annotations),
 	}
 
 	if err := addAnnotations(ocispec, &sandboxConfig); err != nil {
@@ -1013,14 +1011,3 @@ func GetOCIConfig(status vc.ContainerStatus) (specs.Spec, error) {
 
 	return *status.Spec, nil
 }
-
-// HasCRIContainerType returns true if annottations contain
-// a CRI container type annotation
-func HasCRIContainerType(annotations map[string]string) bool {
-	for _, key := range CRIContainerTypeKeyList {
-		if _, ok := annotations[key]; ok {
-			return true
-		}
-	}
-	return false
-}
diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go
@@ -123,9 +123,6 @@ type SandboxConfig struct {
 
 	DisableGuestSeccomp bool
 
-	// HasCRIContainerType specifies whether container type was set explicitly through annotations or not.
-	HasCRIContainerType bool
-
 	// Experimental features enabled
 	Experimental []exp.Feature
 
@@ -2135,8 +2132,6 @@ func (s *Sandbox) setupSandboxCgroup() error {
 		return nil
 	}
 
-	s.Logger().WithField("hasCRIContainerType", s.config.HasCRIContainerType).Debug("Setting sandbox cgroup")
-
 	s.state.CgroupPath, err = vccgroups.ValidCgroupPath(spec.Linux.CgroupsPath, s.config.SystemdCgroup)
 	if err != nil {
 		return fmt.Errorf("Invalid cgroup path: %v", err)