Update node for kind cluster on CI

Signed-off-by: Sneha Chhabria <snchh@microsoft.com>

.github/workflows/nightly-noinstall.yml

@@ -32,6 +32,8 @@ jobs:
             - containerPort: 80
               hostPort: 80
               protocol: TCP
+          - role: worker
+          - role: worker
           EOF
 
           cat kind-config.yaml

charts/osm/README.md

@@ -81,7 +81,7 @@ The following table lists the configurable parameters of the osm chart and their
 | OpenServiceMesh.enforceSingleMesh | bool | `false` | Enforce only deploying one mesh in the cluster |
 | OpenServiceMesh.envoyLogLevel | string | `"error"` | Log level for the Envoy proxy sidecar |
 | OpenServiceMesh.featureFlags.enableAsyncProxyServiceMapping | bool | `false` | Enable async proxy-service mapping |
-| OpenServiceMesh.featureFlags.enableCRDConverter | bool | `false` | Enable CRD conversion webhook. When enabled, a conversion webhook will be deployed to perform API version conversions for custom resources. |
+| OpenServiceMesh.featureFlags.enableCRDConverter | bool | `true` | Enable CRD conversion webhook. When enabled, a conversion webhook will be deployed to perform API version conversions for custom resources. |
 | OpenServiceMesh.featureFlags.enableEgressPolicy | bool | `true` | Enable OSM's Egress policy API. When enabled, fine grained control over Egress (external) traffic is enforced |
 | OpenServiceMesh.featureFlags.enableIngressBackendPolicy | bool | `false` | Enables OSM's IngressBackend policy API. When enabled, OSM will use the IngressBackend API allow ingress traffic to mesh backends |
 | OpenServiceMesh.featureFlags.enableMulticlusterMode | bool | `false` | Enable Multicluster mode. When enabled, multicluster mode will be enabled in OSM |

charts/osm/values.yaml

@@ -256,7 +256,7 @@ OpenServiceMesh:
     enableValidatingWebhook: false
     # -- Enable CRD conversion webhook.
     # When enabled, a conversion webhook will be deployed to perform API version conversions for custom resources.
-    enableCRDConverter: false
+    enableCRDConverter: true
     # -- Enables OSM's IngressBackend policy API.
     # When enabled, OSM will use the IngressBackend API allow ingress traffic to mesh backends
     enableIngressBackendPolicy: false

scripts/kind-with-registry.sh

@@ -42,6 +42,10 @@ echo "Registry Host: ${reg_host}"
 cat <<EOF | kind create cluster --name "${KIND_CLUSTER_NAME}" --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+- role: worker
+- role: worker
 containerdConfigPatches:
 - |-
   [plugins."io.containerd.grpc.v1.cri".registry.mirrors."localhost:${reg_port}"]

tests/framework/common.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"math"
 	"math/big"
@@ -234,10 +235,26 @@ nodeRegistration:
 						},
 					},
 				},
+				{
+					Role: v1alpha4.WorkerRole,
+					KubeadmConfigPatches: []string{`kind: InitConfiguration
+nodeRegistration:
+  kubeletExtraArgs:
+    node-labels: "ingress-ready=true"`},
+				},
+				{
+					Role: v1alpha4.WorkerRole,
+					KubeadmConfigPatches: []string{`kind: InitConfiguration
+nodeRegistration:
+  kubeletExtraArgs:
+    node-labels: "ingress-ready=true"`},
+				},
 			},
 		}
 		if Td.ClusterVersion != "" {
 			clusterConfig.Nodes[0].Image = fmt.Sprintf("kindest/node:%s", td.ClusterVersion)
+			clusterConfig.Nodes[1].Image = fmt.Sprintf("kindest/node:%s", td.ClusterVersion)
+			clusterConfig.Nodes[2].Image = fmt.Sprintf("kindest/node:%s", td.ClusterVersion)
 		}
 		if err := td.ClusterProvider.Create(td.ClusterName, cluster.CreateWithV1Alpha4Config(clusterConfig)); err != nil {
 			return errors.Wrap(err, "failed to create kind cluster")
@@ -346,14 +363,21 @@ func (td *OsmTestData) LoadImagesToKind(imageNames []string) error {
 	if err != nil {
 		return errors.Wrap(err, "failed to get image data")
 	}
+
+	imageReader, _ := ioutil.ReadAll(imageData)
+	reader := bytes.NewReader(imageReader)
 	defer imageData.Close() //nolint: errcheck,gosec
 	nodes, err := td.ClusterProvider.ListNodes(td.ClusterName)
 	if err != nil {
 		return errors.Wrap(err, "failed to list kind nodes")
 	}
+
 	for _, n := range nodes {
 		td.T.Log("Loading images onto node", n)
-		if err := nodeutils.LoadImageArchive(n, imageData); err != nil {
+		if _, err := reader.Seek(0, io.SeekStart); err != nil {
+			return errors.Wrap(err, "failed to reset images")
+		}
+		if err = nodeutils.LoadImageArchive(n, reader); err != nil {
 			return errors.Wrap(err, "failed to load images")
 		}
 	}
@@ -492,7 +516,7 @@ func (td *OsmTestData) InstallOSM(instOpts InstallOSMOpts) error {
 		return errors.Wrap(err, "failed to run osm install")
 	}
 
-	// Ensure osm-injector and osm-controller are ready
+	// Ensure osm-injector, osm-controller and osm-crd-converter are ready
 	err = td.waitForOSMControlPlane(30 * time.Second)
 	if err != nil {
 		return err

tests/framework/common_apps.go

@@ -463,9 +463,9 @@ func (td *OsmTestData) GetPrometheusPodHandle(ns string, prometheusPodName strin
 }
 
 func (td *OsmTestData) waitForOSMControlPlane(timeout time.Duration) error {
-	var errController, errInjector error
+	var errController, errInjector, errCrdConverter error
 	waitGroup := sync.WaitGroup{}
-	waitGroup.Add(2)
+	waitGroup.Add(3)
 
 	go func() {
 		errController = td.WaitForPodsRunningReady(td.OsmNamespace, timeout, 1, &metav1.LabelSelector{
@@ -485,9 +485,18 @@ func (td *OsmTestData) waitForOSMControlPlane(timeout time.Duration) error {
 		waitGroup.Done()
 	}()
 
+	go func() {
+		errCrdConverter = td.WaitForPodsRunningReady(td.OsmNamespace, timeout, 1, &metav1.LabelSelector{
+			MatchLabels: map[string]string{
+				"app": "osm-crd-converter",
+			},
+		})
+		waitGroup.Done()
+	}()
+
 	waitGroup.Wait()
 
-	if errController != nil || errInjector != nil {
+	if errController != nil || errInjector != nil || errCrdConverter != nil {
 		return errors.New(fmt.Sprintf("OSM Control plane was not ready in time (%v, %v)", errController, errInjector))
 	}