DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add test case for #257

Browse source
This commit is contained in:
seanson@users.noreply.github.com 2020-03-09 21:36:39 +11:00
parent ded79eace7
commit 3668cc251b
No known key found for this signature in database
GPG key ID: 356A1B69190BEB01
2 changed files with 76 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/argo-cd/Chart.yaml
View file

@ -2,7 +2,7 @@ apiVersion: v1
appVersion: "1.4.2"
description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
name: argo-cd
version: 1.8.7
version: 1.8.8
home: https://github.com/argoproj/argo-helm
icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
keywords:

75
charts/argo-cd/test/helm_test.go
View file

@ -506,9 +506,9 @@ func TestArgoCDVolumeMounts(t *testing.T) {
},
}
for _, test := range tests {
var deployment appsv1.Deployment
for _, test := range tests {
options := &helm.Options{
SetValues: test.SetValues,
KubectlOptions: k8s.NewKubectlOptions("", "", "default"),
@ -589,9 +589,9 @@ func TestArgoCDVolumes(t *testing.T) {
},
}
for _, test := range tests {
var deployment appsv1.Deployment
for _, test := range tests {
options := &helm.Options{
SetValues: test.SetValues,
KubectlOptions: k8s.NewKubectlOptions("", "", "default"),
@ -605,3 +605,74 @@ func TestArgoCDVolumes(t *testing.T) {
})
}
}
// https://github.com/argoproj/argo-helm/issues/238
func TestArgoCDLabelAnnotations(t *testing.T) {
t.Parallel()
helmChartPath, err := filepath.Abs("../")
releaseName := "argo-cd"
require.NoError(t, err)
tests := []struct {
Name string
DeploymentYAML []string
SetValues map[string]string
SetStrValues map[string]string
}{
{
Name: "Given volumeMount and an application controller deployment",
DeploymentYAML: []string{"templates/argocd-application-controller/deployment.yaml"},
SetValues: map[string]string{
"controller.podLabels.testLabel": "testLabel",
"controller.podAnnotation.testAnnotation": "testAnnotate",
},
},
{
Name: "Given volumeMount and a reposerver deployment",
DeploymentYAML: []string{"templates/argocd-repo-server/deployment.yaml"},
SetValues: map[string]string{
"repoServer.podLabels.testLabel": "testLabel",
"repoServer.podAnnotation.testAnnotation": "testAnnotate",
},
},
{
Name: "Given volumeMount and a server deployment",
DeploymentYAML: []string{"templates/argocd-server/deployment.yaml"},
SetValues: map[string]string{
"server.podLabels.testLabel": "testLabel",
"server.podAnnotation.testAnnotation": "testAnnotate",
},
},
{
Name: "Given volumeMount and a dex deployment",
DeploymentYAML: []string{"templates/dex/deployment.yaml"},
SetValues: map[string]string{
"dex.podLabels.testLabel": "testLabel",
"dex.podAnnotation.testAnnotation": "testAnnotate",
},
},
{
Name: "Given a volumeMount and a redis deployment",
DeploymentYAML: []string{"templates/redis/deployment.yaml"},
SetValues: map[string]string{
"redis.podLabels.testLabel": "testLabel",
"redis.podAnnotation.testAnnotation": "testAnnotate",
},
},
}
for _, test := range tests {
var deployment appsv1.Deployment
options := &helm.Options{
SetValues: test.SetValues,
KubectlOptions: k8s.NewKubectlOptions("", "", "default"),
}
Convey(test.Name, t, func() {
output := helm.RenderTemplate(t, options, helmChartPath, releaseName, test.DeploymentYAML)
helm.UnmarshalK8SYaml(t, output, &deployment)
So(deployment.Spec.Template.ObjectMeta.Labels["testLabel"], ShouldEqual, "testLabel")
// So(deploymentContainers[0].VolumeMounts[0].Name, ShouldEqual, "test")
})
}
}