Adding E2e multicluster test #342

fjglira · 2024-09-17T19:32:59Z

Fixes #91

Description of the changes and steps added to this PR:

Updated the common script to be able to run multicluster setup using the upstream setup kind script
Updated both setup scripts to add the capability to create multicluster setup on kind
Add multicluster test cases
Modify the k8s client init to be able to set from different kubeconfig files (This will be improved in a consecutive PR)
Moved GetVersionFromIstiod() to common utils
Added istioctl util to be able to run istioctl commands in the e2e framework
Modify kubectl to add the possibility to use different kubeconfig files (Pending the refactor of the kubectl util to be more flexible)
Add download istioctl binary and set variable to the make file
Created the util certs to avoid having to create the certificates by using the Make file from upstream

fjglira · 2024-09-17T19:34:37Z

@nrfox I opened a new PR with all the changes

fjglira · 2024-09-17T20:02:38Z

pkg/test/util/supportedversion/supportedversion.go

+	Major   int      `json:"major"`
+	Minor   int      `json:"minor"`
+	Patch   int      `json:"patch"`


@luksa Hi, I added a way to parse the Major, Minor and Patch version to allow skip test later based on istio version being tested

fjglira · 2024-09-17T20:03:41Z

tests/e2e/util/kubectl/kubectl.go

@@ -41,8 +49,8 @@ func kubectl(format string, args ...interface{}) string {
 }

 // CreateFromString creates a resource from the given yaml string
-func CreateFromString(yamlString string) error {
-	cmd := kubectl("create -f -")
+func CreateFromString(yamlString string, kubeconfig ...string) error {


@luksa I opened a new Issue to refactor kubectl to manage better the kubeconfig after this PR is merged. I think is big enough to add more changes here

fjglira · 2024-09-17T20:04:17Z

tests/e2e/util/certs/certs.go

+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package certs


@nrfox moved here all the certs generations and push logic

fjglira · 2024-09-17T20:04:54Z

tests/e2e/util/common/e2e_utils.go

@@ -53,6 +61,36 @@ func GetList(ctx context.Context, cl client.Client, list client.ObjectList, opts
 	return list, err
 }

+// GetPodNameByLabel returns the name of the pod with the given label
+func GetPodNameByLabel(ctx context.Context, cl client.Client, ns, labelKey, labelValue string) (string, error) {


Moved as generic the getPodName by label @nrfox

fjglira · 2024-09-17T20:05:12Z

tests/e2e/util/common/e2e_utils.go

+}
+
+// GetSVCAddress returns the address of the service with the given name
+func GetSVCLoadBalancerAddress(ctx context.Context, cl client.Client, ns, svcName string) (string, error) {


Also created a generic way to get svc ip @nrfox

fjglira · 2024-09-18T12:45:34Z

/test e2e-kind-olm

fjglira · 2024-09-18T13:35:20Z

/test e2e-kind-olm

fjglira · 2024-09-18T14:07:30Z

/test e2e-kind-olm

fjglira · 2024-09-19T14:27:28Z

/test e2e-kind-olm

Signed-off-by: frherrer <frherrer@redhat.com>

…YAML Signed-off-by: frherrer <frherrer@redhat.com>

nrfox

Some nits but otherwise LGTM

tests/e2e/multicluster/multicluster_multiprimary_test.go

nrfox · 2024-09-19T17:42:12Z

tests/e2e/multicluster/multicluster_primaryremote_test.go

+						// Wait for the RemoteIstio CR to be created, this can be moved to a condition verification, but the resource it not will be Ready at this point
+						time.Sleep(5 * time.Second)


Is this necessary? From the moment you create the RemoteIstio it should be created.

I'm trying to find a way to wait for the resource because if I do not add the sleep it fails sometimes

@fjglira What exactly do you need to wait for? What fails when you remove this sleep?

Hey @nrfox and @luksa, for some reason, when you create the remote secret on Cluster 1 right after creating the RemoteIstio resource on Cluster 2, we get a ReconcileError and the test fails

I'd say we should investigate this further but that doesn't have to block this PR.

tests/e2e/multicluster/multicluster_primaryremote_test.go

tests/e2e/util/istioctl/istioctl.go

Signed-off-by: frherrer <frherrer@redhat.com>

fjglira · 2024-09-20T14:29:50Z

Hi, I updated the PR with all the fix from the review @nrfox @luksa

* upstream/main: (24 commits) Update/Fix Istioctl links and docs (istio-ecosystem#349) Fix broken url for sample gateway (istio-ecosystem#377) Implement e2e dualStack control plane tests (istio-ecosystem#373) Improve pull request template (istio-ecosystem#376) Add ability to specify resources in helm chart (istio-ecosystem#375) Update dependencies and fix transform (istio-ecosystem#374) E2E kubectl util refactor (istio-ecosystem#368) Update helm chart README (istio-ecosystem#370) Add pull request template (istio-ecosystem#366) Fix formatting in the charts readme page (istio-ecosystem#364) Add CODE-OF-CONDUCT to the project (istio-ecosystem#362) Update test labels in the wayofwork documentation (istio-ecosystem#359) Automatically adjust default release channel (istio-ecosystem#353) Adding wait after olm install in olm test setup (istio-ecosystem#357) Adding E2e multicluster test (istio-ecosystem#342) Use Kubernetes defaults for imagePullPolicy (istio-ecosystem#352) Add External Controlplane to user docs (istio-ecosystem#335) Show name of active revision in Istio/RemoteIstio status (istio-ecosystem#350) added helm overrides for proxy image as is available for operator (istio-ecosystem#339) Update latest Istio version to latest commit upstream (istio-ecosystem#348) ...

* upstream/main: (25 commits) Adding default value for IP_FAMILY (istio-ecosystem#378) Update/Fix Istioctl links and docs (istio-ecosystem#349) Fix broken url for sample gateway (istio-ecosystem#377) Implement e2e dualStack control plane tests (istio-ecosystem#373) Improve pull request template (istio-ecosystem#376) Add ability to specify resources in helm chart (istio-ecosystem#375) Update dependencies and fix transform (istio-ecosystem#374) E2E kubectl util refactor (istio-ecosystem#368) Update helm chart README (istio-ecosystem#370) Add pull request template (istio-ecosystem#366) Fix formatting in the charts readme page (istio-ecosystem#364) Add CODE-OF-CONDUCT to the project (istio-ecosystem#362) Update test labels in the wayofwork documentation (istio-ecosystem#359) Automatically adjust default release channel (istio-ecosystem#353) Adding wait after olm install in olm test setup (istio-ecosystem#357) Adding E2e multicluster test (istio-ecosystem#342) Use Kubernetes defaults for imagePullPolicy (istio-ecosystem#352) Add External Controlplane to user docs (istio-ecosystem#335) Show name of active revision in Istio/RemoteIstio status (istio-ecosystem#350) added helm overrides for proxy image as is available for operator (istio-ecosystem#339) ...

* upstream/main: (26 commits) Fix error handling in deployBookinfo (istio-ecosystem#384) Adding default value for IP_FAMILY (istio-ecosystem#378) Update/Fix Istioctl links and docs (istio-ecosystem#349) Fix broken url for sample gateway (istio-ecosystem#377) Implement e2e dualStack control plane tests (istio-ecosystem#373) Improve pull request template (istio-ecosystem#376) Add ability to specify resources in helm chart (istio-ecosystem#375) Update dependencies and fix transform (istio-ecosystem#374) E2E kubectl util refactor (istio-ecosystem#368) Update helm chart README (istio-ecosystem#370) Add pull request template (istio-ecosystem#366) Fix formatting in the charts readme page (istio-ecosystem#364) Add CODE-OF-CONDUCT to the project (istio-ecosystem#362) Update test labels in the wayofwork documentation (istio-ecosystem#359) Automatically adjust default release channel (istio-ecosystem#353) Adding wait after olm install in olm test setup (istio-ecosystem#357) Adding E2e multicluster test (istio-ecosystem#342) Use Kubernetes defaults for imagePullPolicy (istio-ecosystem#352) Add External Controlplane to user docs (istio-ecosystem#335) Show name of active revision in Istio/RemoteIstio status (istio-ecosystem#350) ...

* upstream/main: (27 commits) Implement e2e dualStack data plane tests (istio-ecosystem#383) Fix error handling in deployBookinfo (istio-ecosystem#384) Adding default value for IP_FAMILY (istio-ecosystem#378) Update/Fix Istioctl links and docs (istio-ecosystem#349) Fix broken url for sample gateway (istio-ecosystem#377) Implement e2e dualStack control plane tests (istio-ecosystem#373) Improve pull request template (istio-ecosystem#376) Add ability to specify resources in helm chart (istio-ecosystem#375) Update dependencies and fix transform (istio-ecosystem#374) E2E kubectl util refactor (istio-ecosystem#368) Update helm chart README (istio-ecosystem#370) Add pull request template (istio-ecosystem#366) Fix formatting in the charts readme page (istio-ecosystem#364) Add CODE-OF-CONDUCT to the project (istio-ecosystem#362) Update test labels in the wayofwork documentation (istio-ecosystem#359) Automatically adjust default release channel (istio-ecosystem#353) Adding wait after olm install in olm test setup (istio-ecosystem#357) Adding E2e multicluster test (istio-ecosystem#342) Use Kubernetes defaults for imagePullPolicy (istio-ecosystem#352) Add External Controlplane to user docs (istio-ecosystem#335) ...

* upstream/main: (28 commits) Clean up code (istio-ecosystem#392) Implement e2e dualStack data plane tests (istio-ecosystem#383) Fix error handling in deployBookinfo (istio-ecosystem#384) Adding default value for IP_FAMILY (istio-ecosystem#378) Update/Fix Istioctl links and docs (istio-ecosystem#349) Fix broken url for sample gateway (istio-ecosystem#377) Implement e2e dualStack control plane tests (istio-ecosystem#373) Improve pull request template (istio-ecosystem#376) Add ability to specify resources in helm chart (istio-ecosystem#375) Update dependencies and fix transform (istio-ecosystem#374) E2E kubectl util refactor (istio-ecosystem#368) Update helm chart README (istio-ecosystem#370) Add pull request template (istio-ecosystem#366) Fix formatting in the charts readme page (istio-ecosystem#364) Add CODE-OF-CONDUCT to the project (istio-ecosystem#362) Update test labels in the wayofwork documentation (istio-ecosystem#359) Automatically adjust default release channel (istio-ecosystem#353) Adding wait after olm install in olm test setup (istio-ecosystem#357) Adding E2e multicluster test (istio-ecosystem#342) Use Kubernetes defaults for imagePullPolicy (istio-ecosystem#352) ...

fjglira requested a review from a team as a code owner September 17, 2024 19:32

istio-testing added the size/XXL label Sep 17, 2024

fjglira requested a review from nrfox September 17, 2024 19:33

fjglira commented Sep 17, 2024

View reviewed changes

fjglira force-pushed the add-multicluster-e2e branch from 6ab2d7c to 5583c4e Compare September 18, 2024 12:25

fjglira added 4 commits September 19, 2024 15:28

Adding E2e multicluster test

1ba881d

Signed-off-by: frherrer <frherrer@redhat.com>

Add istioctl util go build

a16b5ce

Signed-off-by: frherrer <frherrer@redhat.com>

Delete kind config breaking the test

960c5a8

Signed-off-by: frherrer <frherrer@redhat.com>

Removing references to raw.githubusercontent on multicluster related …

4f7b3e6

…YAML Signed-off-by: frherrer <frherrer@redhat.com>

fjglira force-pushed the add-multicluster-e2e branch from bcc3dee to 4f7b3e6 Compare September 19, 2024 15:29

nrfox reviewed Sep 19, 2024

View reviewed changes

Updates from review: improve cleanup, minor fixes

e60f6e6

Signed-off-by: frherrer <frherrer@redhat.com>

fjglira requested review from luksa and nrfox September 20, 2024 14:29

nrfox approved these changes Sep 23, 2024

View reviewed changes

istio-testing merged commit ab57cdf into istio-ecosystem:main Sep 23, 2024
12 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding E2e multicluster test #342

Adding E2e multicluster test #342

fjglira commented Sep 17, 2024

fjglira commented Sep 17, 2024

fjglira Sep 17, 2024

fjglira Sep 17, 2024

fjglira Sep 17, 2024

fjglira Sep 17, 2024

fjglira Sep 17, 2024

fjglira commented Sep 18, 2024

fjglira commented Sep 18, 2024

fjglira commented Sep 18, 2024

fjglira commented Sep 19, 2024

nrfox left a comment

nrfox Sep 19, 2024

fjglira Sep 20, 2024

luksa Sep 20, 2024

fjglira Sep 20, 2024

nrfox Sep 23, 2024

fjglira commented Sep 20, 2024

		// Wait for the RemoteIstio CR to be created, this can be moved to a condition verification, but the resource it not will be Ready at this point
		time.Sleep(5 * time.Second)

Adding E2e multicluster test #342

Adding E2e multicluster test #342

Conversation

fjglira commented Sep 17, 2024

fjglira commented Sep 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fjglira commented Sep 18, 2024

fjglira commented Sep 18, 2024

fjglira commented Sep 18, 2024

fjglira commented Sep 19, 2024

nrfox left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fjglira commented Sep 20, 2024