Skip to content

Commit 58a3e9b

Browse files
committed
made changes according to pr suggestion by @reggie-k (thanks)
Signed-off-by: Noam Gal <noam.gal@octopus.com>
1 parent c6fec94 commit 58a3e9b

File tree

1 file changed

+26
-1
lines changed

1 file changed

+26
-1
lines changed

cmd/argocd/commands/admin/cluster.go

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/redis/go-redis/v9"
1515
log "github.com/sirupsen/logrus"
1616
"github.com/spf13/cobra"
17+
corev1 "k8s.io/api/core/v1"
1718
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1819
"k8s.io/client-go/kubernetes"
1920
"k8s.io/client-go/kubernetes/fake"
@@ -608,7 +609,31 @@ func NewGenClusterConfigCommand(pathOpts *clientcmd.PathOptions) *cobra.Command
608609
clientConfig := clientcmd.NewDefaultClientConfig(*cfgAccess, &overrides)
609610
conf, err := clientConfig.ClientConfig()
610611
errors.CheckError(err)
611-
kubeClientset := fake.NewClientset()
612+
// Seed a minimal in-memory Argo CD environment so settings retrieval succeeds
613+
argoCDCM := &corev1.ConfigMap{
614+
TypeMeta: metav1.TypeMeta{Kind: "ConfigMap", APIVersion: "v1"},
615+
ObjectMeta: metav1.ObjectMeta{
616+
Name: common.ArgoCDConfigMapName,
617+
Namespace: ArgoCDNamespace,
618+
Labels: map[string]string{
619+
"app.kubernetes.io/part-of": "argocd",
620+
},
621+
},
622+
}
623+
argoCDSecret := &corev1.Secret{
624+
TypeMeta: metav1.TypeMeta{Kind: "Secret", APIVersion: "v1"},
625+
ObjectMeta: metav1.ObjectMeta{
626+
Name: common.ArgoCDSecretName,
627+
Namespace: ArgoCDNamespace,
628+
Labels: map[string]string{
629+
"app.kubernetes.io/part-of": "argocd",
630+
},
631+
},
632+
Data: map[string][]byte{
633+
"server.secretkey": []byte("test"),
634+
},
635+
}
636+
kubeClientset := fake.NewClientset(argoCDCM, argoCDSecret)
612637

613638
var awsAuthConf *v1alpha1.AWSAuthConfig
614639
var execProviderConf *v1alpha1.ExecProviderConfig

0 commit comments

Comments
 (0)