test: stream logs for CPI and CSI to artifacts

kubernetes-sigs · Jan 15, 2024 · 89dc2ed · 89dc2ed
1 parent 3559ab2
commit 89dc2ed
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 15 deletions.
diff --git a/packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml b/packaging/flavorgen/cloudprovider/csi/vsphere-csi-driver.yaml
@@ -193,6 +193,8 @@ apiVersion: apps/v1
 metadata:
   name: vsphere-csi-controller
   namespace: vmware-system-csi
+  labels:
+    component: "vsphere-csi"
 spec:
   replicas: 3
   strategy:
@@ -579,6 +581,8 @@ apiVersion: apps/v1
 metadata:
   name: vsphere-csi-node-windows
   namespace: vmware-system-csi
+  labels:
+    component: "vsphere-csi"
 spec:
   selector:
     matchLabels:

diff --git a/templates/cluster-template-external-loadbalancer.yaml b/templates/cluster-template-external-loadbalancer.yaml
@@ -588,6 +588,8 @@ data:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-controller
       namespace: vmware-system-csi
     spec:
@@ -957,6 +959,8 @@ data:
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-node-windows
       namespace: vmware-system-csi
     spec:

diff --git a/templates/cluster-template-ignition.yaml b/templates/cluster-template-ignition.yaml
@@ -792,6 +792,8 @@ data:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-controller
       namespace: vmware-system-csi
     spec:
@@ -1161,6 +1163,8 @@ data:
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-node-windows
       namespace: vmware-system-csi
     spec:

diff --git a/templates/cluster-template-node-ipam.yaml b/templates/cluster-template-node-ipam.yaml
@@ -713,6 +713,8 @@ data:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-controller
       namespace: vmware-system-csi
     spec:
@@ -1082,6 +1084,8 @@ data:
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-node-windows
       namespace: vmware-system-csi
     spec:

diff --git a/templates/cluster-template-topology.yaml b/templates/cluster-template-topology.yaml
@@ -487,6 +487,8 @@ data:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-controller
       namespace: vmware-system-csi
     spec:
@@ -856,6 +858,8 @@ data:
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-node-windows
       namespace: vmware-system-csi
     spec:

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -703,6 +703,8 @@ data:
     apiVersion: apps/v1
     kind: Deployment
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-controller
       namespace: vmware-system-csi
     spec:
@@ -1072,6 +1074,8 @@ data:
     apiVersion: apps/v1
     kind: DaemonSet
     metadata:
+      labels:
+        component: vsphere-csi
       name: vsphere-csi-node-windows
       namespace: vmware-system-csi
     spec:

diff --git a/test/e2e/log_collector.go b/test/e2e/log_collector.go
@@ -29,6 +29,7 @@ import (
 	"golang.org/x/crypto/ssh"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
+	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	kinderrors "sigs.k8s.io/kind/pkg/errors"
 )
@@ -154,3 +155,41 @@ func readPrivateKey() ([]byte, error) {
 
 	return os.ReadFile(filepath.Clean(privateKeyFilePath))
 }
+
+func watchVSphereComponentLogsFunc(ctx context.Context, artifactFolder string) func(managementClusterProxy framework.ClusterProxy, workloadClusterNamespace, workloadClusterName string) {
+	return func(managementClusterProxy framework.ClusterProxy, workloadClusterNamespace, workloadClusterName string) {
+		workloadClusterProxy := managementClusterProxy.GetWorkloadCluster(ctx, workloadClusterNamespace, workloadClusterName)
+		// CPI
+		framework.WatchDaemonSetLogsByLabelSelector(ctx, framework.WatchDaemonSetLogsByLabelSelectorInput{
+			GetLister: workloadClusterProxy.GetClient(),
+			Cache:     workloadClusterProxy.GetCache(ctx),
+			ClientSet: workloadClusterProxy.GetClientSet(),
+			Labels: map[string]string{
+				"component": "cloud-controller-manager",
+			},
+			LogPath: filepath.Join(artifactFolder, "clusters", workloadClusterName, "logs"),
+		})
+
+		// CSI Deployment
+		framework.WatchDeploymentLogsByLabelSelector(ctx, framework.WatchDeploymentLogsByLabelSelectorInput{
+			GetLister: workloadClusterProxy.GetClient(),
+			Cache:     workloadClusterProxy.GetCache(ctx),
+			ClientSet: workloadClusterProxy.GetClientSet(),
+			Labels: map[string]string{
+				"component": "vsphere-csi",
+			},
+			LogPath: filepath.Join(artifactFolder, "clusters", workloadClusterName, "logs"),
+		})
+
+		// CSI Daemonset
+		framework.WatchDaemonSetLogsByLabelSelector(ctx, framework.WatchDaemonSetLogsByLabelSelectorInput{
+			GetLister: workloadClusterProxy.GetClient(),
+			Cache:     workloadClusterProxy.GetCache(ctx),
+			ClientSet: workloadClusterProxy.GetClientSet(),
+			Labels: map[string]string{
+				"component": "vsphere-csi",
+			},
+			LogPath: filepath.Join(artifactFolder, "clusters", workloadClusterName, "logs"),
+		})
+	}
+}
diff --git a/test/e2e/quick_start_test.go b/test/e2e/quick_start_test.go
@@ -37,25 +37,27 @@ var _ = Describe("Cluster Creation using Cluster API quick-start test", func() {
 var _ = Describe("ClusterClass Creation using Cluster API quick-start test [PR-Blocking] [ClusterClass]", func() {
 	capi_e2e.QuickStartSpec(ctx, func() capi_e2e.QuickStartSpecInput {
 		return capi_e2e.QuickStartSpecInput{
-			E2EConfig:             e2eConfig,
-			ClusterctlConfigPath:  clusterctlConfigPath,
-			BootstrapClusterProxy: bootstrapClusterProxy,
-			ArtifactFolder:        artifactFolder,
-			SkipCleanup:           skipCleanup,
-			Flavor:                ptr.To("topology"),
+			E2EConfig:               e2eConfig,
+			ClusterctlConfigPath:    clusterctlConfigPath,
+			BootstrapClusterProxy:   bootstrapClusterProxy,
+			ArtifactFolder:          artifactFolder,
+			SkipCleanup:             skipCleanup,
+			Flavor:                  ptr.To("topology"),
+			PostMachinesProvisioned: watchVSphereComponentLogsFunc(ctx, artifactFolder),
 		}
 	})
 })
 
 var _ = Describe("Cluster creation with [Ignition] bootstrap [PR-Blocking]", func() {
 	capi_e2e.QuickStartSpec(ctx, func() capi_e2e.QuickStartSpecInput {
 		return capi_e2e.QuickStartSpecInput{
-			E2EConfig:             e2eConfig,
-			ClusterctlConfigPath:  clusterctlConfigPath,
-			BootstrapClusterProxy: bootstrapClusterProxy,
-			ArtifactFolder:        artifactFolder,
-			SkipCleanup:           skipCleanup,
-			Flavor:                ptr.To("ignition"),
+			E2EConfig:               e2eConfig,
+			ClusterctlConfigPath:    clusterctlConfigPath,
+			BootstrapClusterProxy:   bootstrapClusterProxy,
+			ArtifactFolder:          artifactFolder,
+			SkipCleanup:             skipCleanup,
+			Flavor:                  ptr.To("ignition"),
+			PostMachinesProvisioned: watchVSphereComponentLogsFunc(ctx, artifactFolder),
 		}
 	})
 })
diff --git a/test/go.mod b/test/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0
 
-replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.6.1-0.20240108181656-eb46d086f417
+replace sigs.k8s.io/cluster-api/test => sigs.k8s.io/cluster-api/test v1.6.1-0.20240112150242-70716332b487
 
 replace sigs.k8s.io/cluster-api-provider-vsphere => ../
 

diff --git a/test/go.sum b/test/go.sum
@@ -1115,8 +1115,8 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
 sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
-sigs.k8s.io/cluster-api/test v1.6.1-0.20240108181656-eb46d086f417 h1:aI5QL5q0eT20HyA36LQfpkTVu7jdM9ssmNzBnA+gRpo=
-sigs.k8s.io/cluster-api/test v1.6.1-0.20240108181656-eb46d086f417/go.mod h1:hsaaOsAftllhnRZ6l6izUvgGswlqO8Gm4EQS96+mnC0=
+sigs.k8s.io/cluster-api/test v1.6.1-0.20240112150242-70716332b487 h1:72l+q8XVnAtW74R0slvFDljpjjtK+PJwZYSPphTlNRg=
+sigs.k8s.io/cluster-api/test v1.6.1-0.20240112150242-70716332b487/go.mod h1:hsaaOsAftllhnRZ6l6izUvgGswlqO8Gm4EQS96+mnC0=
 sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
 sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=