enable test handler for containerd runtime

upodroid · upodroid · commit 6e4b84d3703f · 2023-10-25T20:48:06.000+01:00
diff --git a/Makefile b/Makefile
@@ -266,7 +266,7 @@ gcs-publish-ci: gsutil version-dist-ci
 	@echo "== Uploading kops =="
 	gsutil -h "Cache-Control:private, max-age=0, no-transform" -m cp -n -r ${UPLOAD}/kops/* ${GCS_LOCATION}
 	echo "VERSION: ${VERSION}"
-	echo "${GCS_URL}/${VERSION}" > ${UPLOAD}/${LATEST_FILE}
+	echo "${GCS_URL}${VERSION}" > ${UPLOAD}/${LATEST_FILE}
 	gsutil -h "Cache-Control:private, max-age=0, no-transform" cp ${UPLOAD}/${LATEST_FILE} ${GCS_LOCATION}
 
 .PHONY: gen-cli-docs
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -921,6 +921,10 @@ spec:
                     description: State directory for execution state files (default
                       "/run/containerd").
                     type: string
+                  testHandlerEnabled:
+                    description: TestHandlerEnabled enables a runtime called test-handler,
+                      specific to k/k e2e tests
+                    type: boolean
                   version:
                     description: Version used to pick the containerd package.
                     type: string
diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
@@ -225,6 +225,10 @@ spec:
                     description: State directory for execution state files (default
                       "/run/containerd").
                     type: string
+                  testHandlerEnabled:
+                    description: TestHandlerEnabled enables a runtime called test-handler,
+                      specific to k/k e2e tests
+                    type: boolean
                   version:
                     description: Version used to pick the containerd package.
                     type: string
diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
@@ -492,6 +492,9 @@ func (b *ContainerdBuilder) buildContainerdConfig() (string, error) {
 	if containerd.SeLinuxEnabled {
 		config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "enable_selinux"}, true)
 	}
+	if containerd.TestHandlerEnabled {
+		config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "test-handler", "runtime_type"}, "io.containerd.runc.v2")
+	}
 	if b.NodeupConfig.KubeletConfig.PodInfraContainerImage != "" {
 		config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "sandbox_image"}, b.NodeupConfig.KubeletConfig.PodInfraContainerImage)
 	}
diff --git a/pkg/apis/kops/containerdconfig.go b/pkg/apis/kops/containerdconfig.go
@@ -51,6 +51,8 @@ type ContainerdConfig struct {
 	SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
 	// NRI configures the Node Resource Interface.
 	NRI *NRIConfig `json:"nri,omitempty"`
+	// TestHandlerEnabled enables a runtime called test-handler, specific to k/k e2e tests
+	TestHandlerEnabled bool `json:"testHandlerEnabled,omitempty"`
 }
 
 type NRIConfig struct {
diff --git a/pkg/apis/kops/v1alpha2/containerdconfig.go b/pkg/apis/kops/v1alpha2/containerdconfig.go
@@ -46,6 +46,8 @@ type ContainerdConfig struct {
 	SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
 	// NRI configures the Node Resource Interface.
 	NRI *NRIConfig `json:"nri,omitempty"`
+	// TestHandlerEnabled enables a runtime called test-handler, specific to k/k e2e tests
+	TestHandlerEnabled bool `json:"testHandlerEnabled,omitempty"`
 }
 
 type NRIConfig struct {
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha3/containerdconfig.go b/pkg/apis/kops/v1alpha3/containerdconfig.go
@@ -46,6 +46,8 @@ type ContainerdConfig struct {
 	SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
 	// NRI configures the Node Resource Interface.
 	NRI *NRIConfig `json:"nri,omitempty"`
+	// TestHandlerEnabled enables a runtime called test-handler, specific to k/k e2e tests
+	TestHandlerEnabled bool `json:"testHandlerEnabled,omitempty"`
 }
 
 type NRIConfig struct {
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
diff --git a/tests/e2e/kubetest2-kops/deployer/common.go b/tests/e2e/kubetest2-kops/deployer/common.go
@@ -20,14 +20,12 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"k8s.io/klog/v2"
 	"k8s.io/kops/tests/e2e/kubetest2-kops/gce"
-	"k8s.io/kops/tests/e2e/pkg/kops"
 	"k8s.io/kops/tests/e2e/pkg/target"
 	"k8s.io/kops/tests/e2e/pkg/util"
 	"sigs.k8s.io/kubetest2/pkg/boskos"
@@ -51,14 +49,6 @@ func (d *deployer) initialize() error {
 			return fmt.Errorf("init failed to check up flags: %v", err)
 		}
 	}
-	if d.KopsVersionMarker != "" {
-		d.KopsBinaryPath = path.Join(d.commonOptions.RunDir(), "kops")
-		baseURL, err := kops.DownloadKops(d.KopsVersionMarker, d.KopsBinaryPath)
-		if err != nil {
-			return fmt.Errorf("init failed to download kops from url: %v", err)
-		}
-		d.KopsBaseURL = baseURL
-	}
 
 	switch d.CloudProvider {
 	case "aws":
diff --git a/tests/e2e/kubetest2-kops/deployer/up.go b/tests/e2e/kubetest2-kops/deployer/up.go
@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	osexec "os/exec"
+	"path"
 	"strings"
 	"time"
 
@@ -41,6 +42,17 @@ func (d *deployer) Up() error {
 		return err
 	}
 
+	// kops is fetched when --up is called instead of init to support a scenario where k/k is being built
+	// and a kops build is not ready yet
+	if d.KopsVersionMarker != "" {
+		d.KopsBinaryPath = path.Join(d.commonOptions.RunDir(), "kops")
+		baseURL, err := kops.DownloadKops(d.KopsVersionMarker, d.KopsBinaryPath)
+		if err != nil {
+			return fmt.Errorf("init failed to download kops from url: %v", err)
+		}
+		d.KopsBaseURL = baseURL
+	}
+
 	if d.terraform == nil {
 		klog.Info("Cleaning up any leaked resources from previous cluster")
 		// Intentionally ignore errors:
@@ -118,6 +130,7 @@ func (d *deployer) createCluster(zones []string, adminAccess string, yes bool) e
 		"--kubernetes-version", d.KubernetesVersion,
 		"--ssh-public-key", d.SSHPublicKeyPath,
 		"--set", "cluster.spec.nodePortAccess=0.0.0.0/0",
+		"--set", "spec.containerd.testHandlerEnabled=true",
 	}
 	if yes {
 		args = append(args, "--yes")
diff --git a/tests/e2e/scenarios/build/run-test.sh b/tests/e2e/scenarios/build/run-test.sh
@@ -23,10 +23,11 @@ make test-e2e-install
 
 cd "${GOPATH}"/src/k8s.io/kubernetes
 
+# this job assumes pull-kops-e2e-k8s-aws-calico is always ran on presubmits
 kubetest2 kops -v=6 \
     --up --down --build --build-kubernetes=true --target-build-arch=linux/amd64 \
     --cloud-provider=gce --admin-access=0.0.0.0/0 \
-    --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci.txt \
+    --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/pulls/pull-kops-e2e-k8s-aws-calico/pull-"${PULL_PULL_SHA}"/latest-ci.txt \
     --create-args "--networking=kubenet --set=spec.nodeProblemDetector.enabled=true" \
     --test=kops \
     -- \

Original file line number	Diff line number	Diff line change
`@@ -492,6 +492,9 @@ func (b *ContainerdBuilder) buildContainerdConfig() (string, error) {`
`492`	`492`	`if containerd.SeLinuxEnabled {`
`493`	`493`	`config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "enable_selinux"}, true)`
`494`	`494`	`}`
	`495`	`+ if containerd.TestHandlerEnabled {`
	`496`	`+ config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "containerd", "runtimes", "test-handler", "runtime_type"}, "io.containerd.runc.v2")`
	`497`	`+ }`
`495`	`498`	`if b.NodeupConfig.KubeletConfig.PodInfraContainerImage != "" {`
`496`	`499`	`config.SetPath([]string{"plugins", "io.containerd.grpc.v1.cri", "sandbox_image"}, b.NodeupConfig.KubeletConfig.PodInfraContainerImage)`
`497`	`500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ type ContainerdConfig struct {`
`51`	`51`	SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
`52`	`52`	`// NRI configures the Node Resource Interface.`
`53`	`53`	NRI *NRIConfig `json:"nri,omitempty"`
	`54`	`+ // TestHandlerEnabled enables a runtime called test-handler, specific to k/k e2e tests`
	`55`	+ TestHandlerEnabled bool `json:"testHandlerEnabled,omitempty"`
`54`	`56`	`}`
`55`	`57`
`56`	`58`	`type NRIConfig struct {`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ type ContainerdConfig struct {`
`46`	`46`	SeLinuxEnabled bool `json:"selinuxEnabled,omitempty"`
`47`	`47`	`// NRI configures the Node Resource Interface.`
`48`	`48`	NRI *NRIConfig `json:"nri,omitempty"`
	`49`	`+ // TestHandlerEnabled enables a runtime called test-handler, specific to k/k e2e tests`
	`50`	+ TestHandlerEnabled bool `json:"testHandlerEnabled,omitempty"`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`type NRIConfig struct {`