Merge branch 'glooctl-check-kube' of github.com:solo-io/gloo into glo…

…octl-check-kube
kgateway-dev · Jun 19, 2024 · 5b4a0ae · 5b4a0ae
2 parents 0da26b1 + 2e2d9ba
commit 5b4a0ae
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/composite-actions/kubernetes-e2e-tests/action.yaml b/.github/workflows/composite-actions/kubernetes-e2e-tests/action.yaml
@@ -37,5 +37,5 @@ runs:
     if: ${{ failure() }}
     uses: actions/upload-artifact@v4
     with:
-      name: bug-report
+      name: bug-report-${{ inputs.cluster-name }}
       path: ./_test/bug_report/${{ inputs.cluster-name }}
diff --git a/changelog/v1.18.0-beta1/update-kube2e-tests.yaml b/changelog/v1.18.0-beta1/update-kube2e-tests.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: NON_USER_FACING
+    description: >-
+      Update how bugs report for gateway kube2e
+      Update all glooctl check tests to omit xds-metrics. This is a short term fix for nackdetector in solo-projects.
+      Add TODO to fix the underlying issue along with a link to a related envoy issue.
diff --git a/test/kubernetes/e2e/features/glooctl/check_suite.go b/test/kubernetes/e2e/features/glooctl/check_suite.go
@@ -21,6 +21,9 @@ type checkSuite struct {
 	testInstallation *e2e.TestInstallation
 }
 
+// NewChecksuite for glooctl check validation
+// TODO(nfuden): Fix clusterloadassignment issues that forced xds-metrics to be excluded.
+// Consider https://github.com/envoyproxy/envoy/issues/7529#issuecomment-1227724217
 func NewCheckSuite(ctx context.Context, testInst *e2e.TestInstallation) suite.TestingSuite {
 	return &checkSuite{
 		ctx:              ctx,
@@ -49,7 +52,7 @@ func (s *checkSuite) TestCheckExclude() {
 
 func (s *checkSuite) TestCheckReadOnly() {
 	output, err := s.testInstallation.Actions.Glooctl().Check(s.ctx,
-		"-n", s.testInstallation.Metadata.InstallNamespace, "--read-only")
+		"-n", s.testInstallation.Metadata.InstallNamespace, "--read-only", "-x", "xds-metrics")
 	s.NoError(err)
 
 	for _, expectedOutput := range checkOutputByKey {
@@ -69,6 +72,6 @@ func (s *checkSuite) TestCheckKubeContext() {
 
 	// When passing the kube-context of the running cluster, `glooctl check` should succeed
 	_, err = s.testInstallation.Actions.Glooctl().Check(s.ctx,
-		"-n", s.testInstallation.Metadata.InstallNamespace, "--kube-context", s.testInstallation.ClusterContext.KubeContext)
+		"-n", s.testInstallation.Metadata.InstallNamespace, "--kube-context", s.testInstallation.ClusterContext.KubeContext, "-x", "xds-metrics")
 	s.NoError(err)
 }