Merge pull request #996 from replicatedhq/laverya/add-containerd-rook…

…143-test

add a testgrid run with containerd and rook 1.4.3

testgrid/tgrun/pkg/instances/k8s119_containerd_rook_block.go

@@ -0,0 +1,47 @@
+package instances
+
+import (
+	kurlv1beta1 "github.com/replicatedhq/kurl/kurlkinds/pkg/apis/cluster/v1beta1"
+	"github.com/replicatedhq/kurl/testgrid/tgrun/pkg/scheduler/types"
+)
+
+func init() {
+	RegisterInstance(
+		types.Instance{
+			InstallerSpec: types.InstallerSpec{
+				Kubernetes: kurlv1beta1.Kubernetes{
+					Version: "1.19.3",
+				},
+				Weave: &kurlv1beta1.Weave{
+					Version: "2.7.0",
+				},
+				Containerd: &kurlv1beta1.Containerd{
+					Version: "1.3.7",
+				},
+				Rook: &kurlv1beta1.Rook{
+					Version:               "1.4.3",
+					IsBlockStorageEnabled: true,
+				},
+				Contour: &kurlv1beta1.Contour{
+					Version: "1.7.0",
+				},
+				Registry: &kurlv1beta1.Registry{
+					Version: "2.7.1",
+				},
+				Ekco: &kurlv1beta1.Ekco{
+					Version: "0.7.0",
+				},
+				Fluentd: &kurlv1beta1.Fluentd{
+					FullEFKStack: true,
+					Version:      "1.7.4",
+				},
+				CertManager: &kurlv1beta1.CertManager{
+					Version: "1.0.3",
+				},
+				Kotsadm: &kurlv1beta1.Kotsadm{
+					Version: "1.25.2",
+				},
+			},
+		},
+	)
+}

testgrid/tgrun/pkg/scheduler/types/types.go

@@ -65,4 +65,5 @@ type InstallerSpec struct {
 	FirewalldConfig *kurlv1beta1.FirewalldConfig `json:"firewalldConfig,omitempty"`
 	Ekco            *kurlv1beta1.Ekco            `json:"ekco,omitempty"`
 	Collectd        *kurlv1beta1.Collectd        `json:"collectd,omitempty"`
+	CertManager     *kurlv1beta1.CertManager     `json:"certManager,omitempty"`
 }