Merge pull request #4514 from stevenhorsman/CCv0-update-crictl-pod-config

doc: Update crictl pod-config
This commit is contained in:
Steve Horsman 2022-06-24 08:38:39 +01:00 committed by GitHub
commit 0782f4a43b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 3 deletions

View File

@ -432,8 +432,8 @@ call_crictl_create_cc_pod() {
# Update iptables to allow forwarding to the cni0 bridge avoiding issues caused by the docker0 bridge # Update iptables to allow forwarding to the cni0 bridge avoiding issues caused by the docker0 bridge
sudo iptables -P FORWARD ACCEPT sudo iptables -P FORWARD ACCEPT
# Create crictl pod config # get_pod_config in tests_common exports `pod_config` that points to the prepared pod config yaml
local pod_config="${FIXTURES_DIR}/pod-config.yaml" get_pod_config
crictl_delete_cc_pod_if_exists "${crictl_sandbox_name}" crictl_delete_cc_pod_if_exists "${crictl_sandbox_name}"
crictl_create_cc_pod "${pod_config}" crictl_create_cc_pod "${pod_config}"
@ -442,7 +442,9 @@ call_crictl_create_cc_pod() {
call_crictl_create_cc_container() { call_crictl_create_cc_container() {
# Create container configuration yaml based on our test copy of busybox # Create container configuration yaml based on our test copy of busybox
local pod_config="${FIXTURES_DIR}/pod-config.yaml" # get_pod_config in tests_common exports `pod_config` that points to the prepared pod config yaml
get_pod_config
local container_config="${FIXTURES_DIR}/${CONTAINER_CONFIG_FILE:-container-config.yaml}" local container_config="${FIXTURES_DIR}/${CONTAINER_CONFIG_FILE:-container-config.yaml}"
local pod_name=${crictl_sandbox_name} local pod_name=${crictl_sandbox_name}
crictl_create_cc_container ${pod_name} ${pod_config} ${container_config} crictl_create_cc_container ${pod_name} ${pod_config} ${container_config}

View File

@ -27,6 +27,8 @@ $ image="quay.io/prometheus/busybox:latest"
$ cat << EOF > "${pod_yaml}" $ cat << EOF > "${pod_yaml}"
metadata: metadata:
name: busybox-sandbox1 name: busybox-sandbox1
uid: $(uuidgen)
namespace: default
EOF EOF
$ cat << EOF > "${container_yaml}" $ cat << EOF > "${container_yaml}"
metadata: metadata:

View File

@ -32,6 +32,7 @@ The `nydus-sandbox.yaml` looks like below:
metadata: metadata:
attempt: 1 attempt: 1
name: nydus-sandbox name: nydus-sandbox
uid: nydus-uid
namespace: default namespace: default
log_directory: /tmp log_directory: /tmp
linux: linux:

View File

@ -42,6 +42,8 @@ $ image="quay.io/prometheus/busybox:latest"
$ cat << EOF > "${pod_yaml}" $ cat << EOF > "${pod_yaml}"
metadata: metadata:
name: busybox-sandbox1 name: busybox-sandbox1
uid: $(uuidgen)
namespace: default
EOF EOF
$ cat << EOF > "${container_yaml}" $ cat << EOF > "${container_yaml}"
metadata: metadata: