mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-08 06:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8097 from Lyndon-Li/issue-fix-8032

Browse Source 
Issue 8032: make node agent configMap name configurable
This commit is contained in:
Shubham Pampattiwar
2024-08-19 14:49:43 -07:00
committed by GitHub
parent a6c543384b 8cf1749ae0
commit 86963bf229
7 changed files with 70 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/nodeagent/node_agent.go
View File

@@ -34,8 +34,7 @@ import (
const (
// daemonSet is the name of the Velero node agent daemonset.
daemonSet = "node-agent"
configName = "node-agent-config"
daemonSet = "node-agent"
)
var (
@@ -132,14 +131,10 @@ func GetPodSpec(ctx context.Context, kubeClient kubernetes.Interface, namespace
return &ds.Spec.Template.Spec, nil
}
func GetConfigs(ctx context.Context, namespace string, kubeClient kubernetes.Interface) (*Configs, error) {
func GetConfigs(ctx context.Context, namespace string, kubeClient kubernetes.Interface, configName string) (*Configs, error) {
cm, err := kubeClient.CoreV1().ConfigMaps(namespace).Get(ctx, configName, metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
return nil, nil
} else {
return nil, errors.Wrapf(err, "error to get node agent configs %s", configName)
}
return nil, errors.Wrapf(err, "error to get node agent configs %s", configName)
}
if cm.Data == nil {

6
pkg/nodeagent/node_agent_test.go
View File

@@ -254,10 +254,6 @@ func TestGetConfigs(t *testing.T) {
expectResult *Configs
expectErr string
}{
{
name: "cm is not found",
namespace: "fake-ns",
},
{
name: "cm get error",
namespace: "fake-ns",
@@ -318,7 +314,7 @@ func TestGetConfigs(t *testing.T) {
fakeKubeClient.Fake.PrependReactor(reactor.verb, reactor.resource, reactor.reactorFunc)
}
result, err := GetConfigs(context.TODO(), test.namespace, fakeKubeClient)
result, err := GetConfigs(context.TODO(), test.namespace, fakeKubeClient, "node-agent-config")
if test.expectErr == "" {
assert.NoError(t, err)