mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-22 08:18:32 +00:00
Specify hook structure instead of importing Podman
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
e91ffef258
commit
c1c1d5cf8e
@ -1,5 +1,5 @@
|
|||||||
/**
|
/**
|
||||||
# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
|
# Copyright (c) 2021-2022, NVIDIA CORPORATION. All rights reserved.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@ -12,7 +12,8 @@
|
|||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
*/
|
**/
|
||||||
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -22,8 +23,6 @@ import (
|
|||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
|
"github.com/NVIDIA/nvidia-container-toolkit/internal/config"
|
||||||
hooks "github.com/containers/podman/v4/pkg/hooks/1.0.0"
|
|
||||||
rspec "github.com/opencontainers/runtime-spec/specs-go"
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
cli "github.com/urfave/cli/v2"
|
cli "github.com/urfave/cli/v2"
|
||||||
)
|
)
|
||||||
@ -164,20 +163,20 @@ func getHookPath(hooksDir string, hookFilename string) string {
|
|||||||
return filepath.Join(hooksDir, hookFilename)
|
return filepath.Join(hooksDir, hookFilename)
|
||||||
}
|
}
|
||||||
|
|
||||||
func generateOciHook(toolkitDir string) hooks.Hook {
|
func generateOciHook(toolkitDir string) podmanHook {
|
||||||
hookPath := filepath.Join(toolkitDir, config.NVIDIAContainerRuntimeHookExecutable)
|
hookPath := filepath.Join(toolkitDir, config.NVIDIAContainerRuntimeHookExecutable)
|
||||||
envPath := "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" + toolkitDir
|
envPath := "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:" + toolkitDir
|
||||||
always := true
|
always := true
|
||||||
|
|
||||||
hook := hooks.Hook{
|
hook := podmanHook{
|
||||||
Version: "1.0.0",
|
Version: "1.0.0",
|
||||||
Stages: []string{"prestart"},
|
Stages: []string{"prestart"},
|
||||||
Hook: rspec.Hook{
|
Hook: specHook{
|
||||||
Path: hookPath,
|
Path: hookPath,
|
||||||
Args: []string{filepath.Base(config.NVIDIAContainerRuntimeHookExecutable), "prestart"},
|
Args: []string{filepath.Base(config.NVIDIAContainerRuntimeHookExecutable), "prestart"},
|
||||||
Env: []string{envPath},
|
Env: []string{envPath},
|
||||||
},
|
},
|
||||||
When: hooks.When{
|
When: When{
|
||||||
Always: &always,
|
Always: &always,
|
||||||
Commands: []string{".*"},
|
Commands: []string{".*"},
|
||||||
},
|
},
|
||||||
|
50
tools/container/crio/hooks.go
Normal file
50
tools/container/crio/hooks.go
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
/**
|
||||||
|
# Copyright (c) 2022, NVIDIA CORPORATION. All rights reserved.
|
||||||
|
#
|
||||||
|
# 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 main
|
||||||
|
|
||||||
|
// podmanHook is the hook configuration structure.
|
||||||
|
// This is taken from `Hook` at https://github.com/containers/podman/blob/3c53200e9d61fdf95fe1da825bb2a89372551350/pkg/hooks/1.0.0/hook.go#L18
|
||||||
|
type podmanHook struct {
|
||||||
|
Version string `json:"version"`
|
||||||
|
Hook specHook `json:"hook"`
|
||||||
|
When When `json:"when"`
|
||||||
|
Stages []string `json:"stages"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// specHook specifies a command that is run at a particular event in the lifecycle of a container
|
||||||
|
// This is taken from `Hook` at https://github.com/opencontainers/runtime-spec/blob/9ee22abf867e374c5464c7bbe0d0db01482254ab/specs-go/config.go#L128
|
||||||
|
type specHook struct {
|
||||||
|
Path string `json:"path"`
|
||||||
|
Args []string `json:"args,omitempty"`
|
||||||
|
Env []string `json:"env,omitempty"`
|
||||||
|
Timeout *int `json:"timeout,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// When holds hook-injection conditions.
|
||||||
|
// This is taken from `When` at https://github.com/containers/podman/blob/3c53200e9d61fdf95fe1da825bb2a89372551350/pkg/hooks/1.0.0/when.go#L11
|
||||||
|
type When struct {
|
||||||
|
Always *bool `json:"always,omitempty"`
|
||||||
|
Annotations map[string]string `json:"annotations,omitempty"`
|
||||||
|
Commands []string `json:"commands,omitempty"`
|
||||||
|
HasBindMounts *bool `json:"hasBindMounts,omitempty"`
|
||||||
|
|
||||||
|
// Or enables any-of matching.
|
||||||
|
//
|
||||||
|
// Deprecated: this property is for is backwards-compatibility with
|
||||||
|
// 0.1.0 hooks. It will be removed when we drop support for them.
|
||||||
|
Or bool `json:"-"`
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user