 28e4fb25f4
			
		
	
	28e4fb25f4
	
	
	
		
			
			cri-o has annotations for pod name, namespace and container name:
https://github.com/containers/podman/blob/master/pkg/annotations/annotations.go
But so far containerd had only the container name.
This patch will be useful for seccomp agents to have a different
behaviour depending on the pod (see runtime-spec PR 1074 and runc PR
2682). This should simplify the code in:
b2d423695d/pkg/kuberesolver/kuberesolver.go (L16-L27)
Signed-off-by: Alban Crequy <alban@kinvolk.io>
		
	
		
			
				
	
	
		
			94 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			94 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // +build windows
 | |
| 
 | |
| /*
 | |
|    Copyright The containerd Authors.
 | |
| 
 | |
|    Licensed under the Apache License, Version 2.0 (the "License");
 | |
|    you may not use this file except in compliance with the License.
 | |
|    You may obtain a copy of the License at
 | |
| 
 | |
|        http://www.apache.org/licenses/LICENSE-2.0
 | |
| 
 | |
|    Unless required by applicable law or agreed to in writing, software
 | |
|    distributed under the License is distributed on an "AS IS" BASIS,
 | |
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | |
|    See the License for the specific language governing permissions and
 | |
|    limitations under the License.
 | |
| */
 | |
| 
 | |
| package server
 | |
| 
 | |
| import (
 | |
| 	"github.com/containerd/containerd"
 | |
| 	"github.com/containerd/containerd/oci"
 | |
| 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
 | |
| 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
 | |
| 	"github.com/pkg/errors"
 | |
| 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 | |
| 
 | |
| 	"github.com/containerd/containerd/pkg/cri/annotations"
 | |
| 	customopts "github.com/containerd/containerd/pkg/cri/opts"
 | |
| )
 | |
| 
 | |
| func (c *criService) sandboxContainerSpec(id string, config *runtime.PodSandboxConfig,
 | |
| 	imageConfig *imagespec.ImageConfig, nsPath string, runtimePodAnnotations []string) (*runtimespec.Spec, error) {
 | |
| 	// Creates a spec Generator with the default spec.
 | |
| 	specOpts := []oci.SpecOpts{
 | |
| 		oci.WithEnv(imageConfig.Env),
 | |
| 		oci.WithHostname(config.GetHostname()),
 | |
| 	}
 | |
| 	if imageConfig.WorkingDir != "" {
 | |
| 		specOpts = append(specOpts, oci.WithProcessCwd(imageConfig.WorkingDir))
 | |
| 	}
 | |
| 
 | |
| 	if len(imageConfig.Entrypoint) == 0 && len(imageConfig.Cmd) == 0 {
 | |
| 		// Pause image must have entrypoint or cmd.
 | |
| 		return nil, errors.Errorf("invalid empty entrypoint and cmd in image config %+v", imageConfig)
 | |
| 	}
 | |
| 	specOpts = append(specOpts, oci.WithProcessArgs(append(imageConfig.Entrypoint, imageConfig.Cmd...)...))
 | |
| 
 | |
| 	specOpts = append(specOpts,
 | |
| 		// Clear the root location since hcsshim expects it.
 | |
| 		// NOTE: readonly rootfs doesn't work on windows.
 | |
| 		customopts.WithoutRoot,
 | |
| 		customopts.WithWindowsNetworkNamespace(nsPath),
 | |
| 	)
 | |
| 
 | |
| 	specOpts = append(specOpts, customopts.WithWindowsDefaultSandboxShares)
 | |
| 
 | |
| 	for pKey, pValue := range getPassthroughAnnotations(config.Annotations,
 | |
| 		runtimePodAnnotations) {
 | |
| 		specOpts = append(specOpts, customopts.WithAnnotation(pKey, pValue))
 | |
| 	}
 | |
| 
 | |
| 	specOpts = append(specOpts,
 | |
| 		customopts.WithAnnotation(annotations.ContainerType, annotations.ContainerTypeSandbox),
 | |
| 		customopts.WithAnnotation(annotations.SandboxID, id),
 | |
| 		customopts.WithAnnotation(annotations.SandboxNamespace, config.GetMetadata().GetNamespace()),
 | |
| 		customopts.WithAnnotation(annotations.SandboxName, config.GetMetadata().GetName()),
 | |
| 		customopts.WithAnnotation(annotations.SandboxLogDir, config.GetLogDirectory()),
 | |
| 	)
 | |
| 
 | |
| 	return c.runtimeSpec(id, "", specOpts...)
 | |
| }
 | |
| 
 | |
| // No sandbox container spec options for windows yet.
 | |
| func (c *criService) sandboxContainerSpecOpts(config *runtime.PodSandboxConfig, imageConfig *imagespec.ImageConfig) ([]oci.SpecOpts, error) {
 | |
| 	return nil, nil
 | |
| }
 | |
| 
 | |
| // No sandbox files needed for windows.
 | |
| func (c *criService) setupSandboxFiles(id string, config *runtime.PodSandboxConfig) error {
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // No sandbox files needed for windows.
 | |
| func (c *criService) cleanupSandboxFiles(id string, config *runtime.PodSandboxConfig) error {
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| // No task options needed for windows.
 | |
| func (c *criService) taskOpts(runtimeType string) []containerd.NewTaskOpts {
 | |
| 	return nil
 | |
| }
 |