Skip to content

[release/v25.1.x] pkg/kube: require namespace in Ctl.List #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisseto merged 1 commit into from
Oct 6, 2025
Merged

[release/v25.1.x] pkg/kube: require namespace in Ctl.List #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion acceptance/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ require (
github.com/redpanda-data/console/backend v0.0.0-20240303221210-05d5d9e85f20 // indirect
github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250407180246-dc814fb6b3b8 // indirect
github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250407180246-dc814fb6b3b8 // indirect
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20250813202210-1c00a87f10f7 // indirect
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20251002202632-d355ad0b3ce5 // indirect
github.com/redpanda-data/redpanda-operator/gotohelm v1.1.0 // indirect
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
Expand Down
4 changes: 2 additions & 2 deletions acceptance/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,8 +732,8 @@ github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250407180246-
github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250407180246-dc814fb6b3b8/go.mod h1:Sof2HY8U+RLesHJInGLoqhUMzN8iN8gUHXALbROsew8=
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.1.0 h1:6jvBn+Xr1+62BEFSHoKxayRM/Xt9hp6O5nhnE368ge4=
github.com/redpanda-data/redpanda-operator/charts/console/v3 v3.1.0/go.mod h1:y/8tR/cBC11uDPvjosxT8DAxnuSlPWtEzVYeCAqa4K4=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20250813202210-1c00a87f10f7 h1:D7ME2mDh8/e14VEAj0cIZQfVgyuluHz8Nw9yhZbcKVo=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20250813202210-1c00a87f10f7/go.mod h1:D8MfzGr+oPWOUNnDEezKSJyHRKvDpGb6NZS0bJdQnds=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20251002202632-d355ad0b3ce5 h1:ufNv+fxroH5WgVhw7346XmZg/lLj0rncnz+qbTRWHNM=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20251002202632-d355ad0b3ce5/go.mod h1:D8MfzGr+oPWOUNnDEezKSJyHRKvDpGb6NZS0bJdQnds=
github.com/redpanda-data/redpanda-operator/gotohelm v1.1.0 h1:IV2Ic66JDKPtCnNU4Kn1naJlzZmhl0izRj17qgTCo20=
github.com/redpanda-data/redpanda-operator/gotohelm v1.1.0/go.mod h1:usCpPzzzhgtPrRTiUQOzFqGmukce8U0SrzEeX2ONDFE=
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6 h1:SbcvWTYFEbH5+NQOl1To5jppEa8RCK1HAkRNfhdUGLg=
Expand Down
6 changes: 2 additions & 4 deletions charts/console/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ func NewClient(ctx context.Context, kubeCtl *kube.Ctl, dot *helmette.Dot) (*Clie
}

func (c *Client) getConsolePod(ctx context.Context) (*corev1.Pod, error) {
deploys, err := kube.List[appsv1.DeploymentList](ctx, c.Ctl,
k8sclient.InNamespace(c.Release.Namespace),
)
deploys, err := kube.List[appsv1.DeploymentList](ctx, c.Ctl, c.Release.Namespace)
if err != nil {
return nil, err
}
Expand All @@ -92,7 +90,7 @@ func (c *Client) getConsolePod(ctx context.Context) (*corev1.Pod, error) {
}

pods, err := kube.List[corev1.PodList](ctx, c.Ctl,
k8sclient.InNamespace(deployment.Namespace),
deployment.Namespace,
k8sclient.MatchingLabels(deployment.Spec.Selector.MatchLabels))
if err != nil {
return nil, err
Expand Down
4 changes: 2 additions & 2 deletions charts/redpanda/chart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func TestIntegrationChart(t *testing.T) {
}),
})

pods, err := kube.List[corev1.PodList](ctx, env.Ctl(), client.MatchingLabels{
pods, err := kube.List[corev1.PodList](ctx, env.Ctl(), release.Namespace, client.MatchingLabels{
"app.kubernetes.io/instance": release.Name,
"app.kubernetes.io/component": release.Chart + "-statefulset",
})
Expand Down Expand Up @@ -430,7 +430,7 @@ func TestIntegrationChart(t *testing.T) {
}),
})

pods, err := kube.List[corev1.PodList](ctx, env.Ctl(), client.MatchingLabels{
pods, err := kube.List[corev1.PodList](ctx, env.Ctl(), release.Namespace, client.MatchingLabels{
"app.kubernetes.io/instance": release.Name,
"app.kubernetes.io/component": release.Chart + "-statefulset",
})
Expand Down
5 changes: 2 additions & 3 deletions charts/redpanda/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/twmb/franz-go/pkg/sasl/scram"
"github.com/twmb/franz-go/pkg/sr"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/redpanda-data/redpanda-operator/charts/redpanda/v25"
Expand Down Expand Up @@ -496,9 +495,9 @@ func srvLookup(dot *helmette.Dot, dialer DialContextFunc, service string) ([]*ne
// Querying for k8s-app=kube-dns is a generally accepted / safe
// way of finding the kube DNS. We could alternatively find the
// kube-dns service and use its label selector.
pods, err := kube.List[corev1.PodList](ctx, ctl, client.MatchingLabels{
pods, err := kube.List[corev1.PodList](ctx, ctl, kube.NamespaceSystem, client.MatchingLabels{
"k8s-app": "kube-dns",
}, client.InNamespace(metav1.NamespaceSystem))
})
if err != nil {
return nil, err
}
Expand Down
4 changes: 2 additions & 2 deletions gen/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,8 +468,8 @@ github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-202504071802
github.com/redpanda-data/redpanda-operator/charts/connectors v0.0.0-20250407180246-dc814fb6b3b8/go.mod h1:o6FEj/SPoAxl6Rn1X9+XO1tlzSl2V64vAiBDgHntfVc=
github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250407180246-dc814fb6b3b8 h1:HIkLbEDKeCALHFytZdHfeWYo/9JMa1yh4QlsIlhlsB8=
github.com/redpanda-data/redpanda-operator/charts/console v0.0.0-20250407180246-dc814fb6b3b8/go.mod h1:Sof2HY8U+RLesHJInGLoqhUMzN8iN8gUHXALbROsew8=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20250813202210-1c00a87f10f7 h1:D7ME2mDh8/e14VEAj0cIZQfVgyuluHz8Nw9yhZbcKVo=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20250813202210-1c00a87f10f7/go.mod h1:D8MfzGr+oPWOUNnDEezKSJyHRKvDpGb6NZS0bJdQnds=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20251002202632-d355ad0b3ce5 h1:ufNv+fxroH5WgVhw7346XmZg/lLj0rncnz+qbTRWHNM=
github.com/redpanda-data/redpanda-operator/charts/redpanda/v5 v5.10.5-0.20251002202632-d355ad0b3ce5/go.mod h1:D8MfzGr+oPWOUNnDEezKSJyHRKvDpGb6NZS0bJdQnds=
github.com/redpanda-data/redpanda-operator/gotohelm v1.1.0 h1:IV2Ic66JDKPtCnNU4Kn1naJlzZmhl0izRj17qgTCo20=
github.com/redpanda-data/redpanda-operator/gotohelm v1.1.0/go.mod h1:usCpPzzzhgtPrRTiUQOzFqGmukce8U0SrzEeX2ONDFE=
github.com/redpanda-data/redpanda/src/go/rpk v0.0.0-20250716004441-6e1647296ad6 h1:SbcvWTYFEbH5+NQOl1To5jppEa8RCK1HAkRNfhdUGLg=
Expand Down
Loading