Skip to content

Commit bce16e9

Browse files
authoredDec 16, 2024··
fix(appset): Fix appset generate in --core mode for cluster gen (#21170)
Signed-off-by: OpenGuidou <guillaume.doussin@gmail.com>
1 parent e878ad5 commit bce16e9

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed
 

‎cmd/argocd/commands/headless/headless.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import (
1414
log "github.com/sirupsen/logrus"
1515
"github.com/spf13/cobra"
1616
"github.com/spf13/pflag"
17-
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
17+
corev1 "k8s.io/api/core/v1"
18+
metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1819
"k8s.io/apimachinery/pkg/runtime"
1920
runtimeUtil "k8s.io/apimachinery/pkg/util/runtime"
2021
"k8s.io/client-go/dynamic"
@@ -128,7 +129,7 @@ func (c *forwardRepoClientset) NewRepoServerClient() (io.Closer, repoapiclient.R
128129
}
129130
repoServerName := c.repoServerName
130131
repoServererviceLabelSelector := common.LabelKeyComponentRepoServer + "=" + common.LabelValueComponentRepoServer
131-
repoServerServices, err := c.kubeClientset.CoreV1().Services(c.namespace).List(context.Background(), v1.ListOptions{LabelSelector: repoServererviceLabelSelector})
132+
repoServerServices, err := c.kubeClientset.CoreV1().Services(c.namespace).List(context.Background(), metaV1.ListOptions{LabelSelector: repoServererviceLabelSelector})
132133
if err != nil {
133134
c.err = err
134135
return
@@ -243,6 +244,10 @@ func MaybeStartLocalServer(ctx context.Context, clientOpts *apiclient.ClientOpti
243244
if err != nil {
244245
return fmt.Errorf("error adding argo resources to scheme: %w", err)
245246
}
247+
err = corev1.AddToScheme(scheme)
248+
if err != nil {
249+
return fmt.Errorf("error adding corev1 resources to scheme: %w", err)
250+
}
246251
controllerClientset, err := client.New(restConfig, client.Options{
247252
Scheme: scheme,
248253
})

0 commit comments

Comments
 (0)
Please sign in to comment.