[release/1.4] append envs from image config to empty slice to avoid env lost

[zhsj]

Backport containerd/containerd#5024 and containerd/containerd#5054

[k8s-ci-robot]

Hi @zhsj. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[kevpar]

LGTM

[Zyqsempai]

LGTM

[mikebrow]

/ok-to-test

[fuweid]

/test pull-cri-containerd-node-e2e

[fuweid]

/ok-to-test

[fuweid]

pull-cri-containerd-node-e2e Pending — Job triggered

The CI doesn't update the status.

[k8s-ci-robot]

@zhsj: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
pull-cri-containerd-node-e2e	e4fcda3	link	/test pull-cri-containerd-node-e2e

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

[fuweid]

zone=us-central1-f --ssh-user=prow --ssh-key=/workspace/.ssh/google_compute_engine --ginkgo-flags=--nodes=8 --focus="[NodeConformance]|[NodeFeature:.+]" --skip="[Flaky]|[Slow]|[Serial]" --test_args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{"name": "containerd.log", "journalctl": ["-u", "containerd"]}" --test-timeout=1h5m0s --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cri-master/image-config-pr.yaml -node-env=PULL_REFS=release/1.4:b4b894c871860664fe5c0509df68da0dbae9f095,1628:e4fcda3215cc607cc1f10657f76cbf85313fd64c (interrupted): exit status 1

Looks like it is CI issue. Not related to the change.

[mikebrow]

@dims did the path change .. cri-c8d-pr-node-e2e for both containerd/containerd and containerd/cri infra?

Looking for address 'bootstrap-e2e-master-ip'
ERROR: (gcloud.compute.addresses.describe) Could not fetch resource:
 - The resource 'projects/cri-c8d-pr-node-e2e/regions/us-central1/addresses/bootstrap-e2e-master-ip' was not found

[mikebrow]

LGTM