Skip to content

Commit 0333e94

Browse files
authored
Merge pull request kubernetes-sigs#9441 from killianmuldoon/pr-dump-all-pods
🌱 Dump all pods in e2e test clusters
2 parents ed091c1 + e561d45 commit 0333e94

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

docs/book/src/developer/providers/migrations/v1.5-to-v1.6.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ maintainers of providers and consumers of our Go API.
3434
### Other
3535
- `clusterctl move` can be blocked temporarily by a provider when an object to be moved is annotated with `clusterctl.cluster.x-k8s.io/block-move`.
3636
- `mdbook releaselink` has been changed to require a `repo` tag when used in markdown files for generating a book with `mdbook`.
37-
- `framework.DumpKubeSystemPodsForCluster` was renamed to `framework.DumpResourcesForCluster` to facilitate the gathering of additional workload cluster resources. Pods in `kube-system` and Nodes are gathered from workload clusters. `kube-system` Pod yaml available in `clusters/*/resources/Pod` and Node yaml is available in `clusters/*/resources/Node`.
37+
- `framework.DumpKubeSystemPodsForCluster` was renamed to `framework.DumpResourcesForCluster` to facilitate the gathering of additional workload cluster resources. Pods in all namespaces and Nodes are gathered from workload clusters. Pod yamls are available in `clusters/*/resources/Pod` and Node yaml is available in `clusters/*/resources/Node`.
3838

3939
### Suggested changes for providers
4040

test/e2e/common.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
. "github.com/onsi/ginkgo/v2"
2626
"github.com/onsi/gomega/types"
2727
corev1 "k8s.io/api/core/v1"
28-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2928
"k8s.io/apimachinery/pkg/runtime/schema"
3029
"k8s.io/klog/v2"
3130
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -81,9 +80,9 @@ func dumpSpecResourcesAndCleanup(ctx context.Context, specName string, clusterPr
8180
LogPath: filepath.Join(artifactFolder, "clusters", clusterProxy.GetName(), "resources"),
8281
})
8382

84-
// If the cluster still exists, dump kube-system pods and nodes of the workload cluster before deleting the cluster.
83+
// If the cluster still exists, dump pods and nodes of the workload cluster before deleting the cluster.
8584
if err := clusterProxy.GetClient().Get(ctx, client.ObjectKeyFromObject(cluster), &clusterv1.Cluster{}); err == nil {
86-
Byf("Dumping kube-system Pods and Nodes of Cluster %s", klog.KObj(cluster))
85+
Byf("Dumping Pods and Nodes of Cluster %s", klog.KObj(cluster))
8786
framework.DumpResourcesForCluster(ctx, framework.DumpResourcesForClusterInput{
8887
Lister: clusterProxy.GetWorkloadCluster(ctx, cluster.Namespace, cluster.Name).GetClient(),
8988
Cluster: cluster,
@@ -94,7 +93,6 @@ func dumpSpecResourcesAndCleanup(ctx context.Context, specName string, clusterPr
9493
Version: corev1.SchemeGroupVersion.Version,
9594
Kind: "Pod",
9695
},
97-
Namespace: metav1.NamespaceSystem,
9896
},
9997
{
10098
GVK: schema.GroupVersionKind{

0 commit comments

Comments
 (0)