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

add ALIBABA_CLOUD_CREDENTIALS_FILE env in deployment and daemonset installation (#2166)

Browse Source 
Signed-off-by: haoshuwei <haoshuwei24@gmail.com>
This commit is contained in:
Shuwei Hao
2020-01-07 06:56:23 +08:00
committed by Carlisia Campos
parent f43c1ad55e
commit c832e52905
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/install/daemonset.go
View File

@@ -172,6 +172,10 @@ func DaemonSet(namespace string, opts ...podTemplateOption) *appsv1.DaemonSet {
Name: "AZURE_CREDENTIALS_FILE",
Value: "/credentials/cloud",
},
{
Name: "ALIBABA_CLOUD_CREDENTIALS_FILE",
Value: "/credentials/cloud",
},
}...)
}

2
pkg/install/daemonset_test.go
View File

@@ -34,6 +34,6 @@ func TestDaemonSet(t *testing.T) {
assert.Equal(t, corev1.PullIfNotPresent, ds.Spec.Template.Spec.Containers[0].ImagePullPolicy)
ds = DaemonSet("velero", WithSecret(true))
assert.Equal(t, 6, len(ds.Spec.Template.Spec.Containers[0].Env))
assert.Equal(t, 7, len(ds.Spec.Template.Spec.Containers[0].Env))
assert.Equal(t, 3, len(ds.Spec.Template.Spec.Volumes))
}

4
pkg/install/deployment.go
View File

@@ -232,6 +232,10 @@ func Deployment(namespace string, opts ...podTemplateOption) *appsv1.Deployment
Name: "AZURE_CREDENTIALS_FILE",
Value: "/credentials/cloud",
},
{
Name: "ALIBABA_CLOUD_CREDENTIALS_FILE",
Value: "/credentials/cloud",
},
}...)
}

2
pkg/install/deployment_test.go
View File

@@ -43,7 +43,7 @@ func TestDeployment(t *testing.T) {
assert.Equal(t, corev1.PullIfNotPresent, deploy.Spec.Template.Spec.Containers[0].ImagePullPolicy)
deploy = Deployment("velero", WithSecret(true))
assert.Equal(t, 6, len(deploy.Spec.Template.Spec.Containers[0].Env))
assert.Equal(t, 7, len(deploy.Spec.Template.Spec.Containers[0].Env))
assert.Equal(t, 3, len(deploy.Spec.Template.Spec.Volumes))
deploy = Deployment("velero", WithDefaultResticMaintenanceFrequency(24*time.Hour))