Update node for kind cluster on CI

Signed-off-by: Sneha Chhabria <snchh@microsoft.com>
openservicemesh · Jul 20, 2021 · 8c742b8 · 8c742b8
1 parent 6a113b2
commit 8c742b8
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 2 deletions.
diff --git a/.github/workflows/nightly-noinstall.yml b/.github/workflows/nightly-noinstall.yml
@@ -32,6 +32,28 @@ jobs:
             - containerPort: 80
               hostPort: 80
               protocol: TCP
+          - role: worker
+            kubeadmConfigPatches:
+            - |
+              kind: InitConfiguration
+              nodeRegistration:
+                kubeletExtraArgs:
+                  node-labels: "ingress-ready=true"
+            extraPortMappings:
+            - containerPort: 80
+              hostPort: 80
+              protocol: TCP
+          - role: worker
+            kubeadmConfigPatches:
+            - |
+              kind: InitConfiguration
+              nodeRegistration:
+                kubeletExtraArgs:
+                  node-labels: "ingress-ready=true"
+            extraPortMappings:
+            - containerPort: 80
+              hostPort: 80
+              protocol: TCP
           EOF
 
           cat kind-config.yaml

diff --git a/charts/osm/README.md b/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 |

diff --git a/charts/osm/values.yaml b/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

diff --git a/scripts/kind-with-registry.sh b/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}"]

diff --git a/tests/framework/common.go b/tests/framework/common.go
@@ -223,6 +223,34 @@ func (td *OsmTestData) InitTestData(t GinkgoTInterface) error {
 				{
 					Role: v1alpha4.ControlPlaneRole,
 					KubeadmConfigPatches: []string{`kind: InitConfiguration
+nodeRegistration:
+  kubeletExtraArgs:
+    node-labels: "ingress-ready=true"`},
+					ExtraPortMappings: []v1alpha4.PortMapping{
+						{
+							ContainerPort: 80,
+							HostPort:      80,
+							Protocol:      v1alpha4.PortMappingProtocolTCP,
+						},
+					},
+				},
+				{
+					Role: v1alpha4.WorkerRole,
+					KubeadmConfigPatches: []string{`kind: InitConfiguration
+nodeRegistration:
+  kubeletExtraArgs:
+    node-labels: "ingress-ready=true"`},
+					ExtraPortMappings: []v1alpha4.PortMapping{
+						{
+							ContainerPort: 80,
+							HostPort:      80,
+							Protocol:      v1alpha4.PortMappingProtocolTCP,
+						},
+					},
+				},
+				{
+					Role: v1alpha4.WorkerRole,
+					KubeadmConfigPatches: []string{`kind: InitConfiguration
 nodeRegistration:
   kubeletExtraArgs:
     node-labels: "ingress-ready=true"`},
@@ -238,6 +266,8 @@ nodeRegistration:
 		}
 		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")