Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #74 from bharath-b-rh/cfe-878
CFE-878: Add userLabels in Infrastructure to driver args list
- Loading branch information
Showing
147 changed files
with
16,513 additions
and
677 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| package operator | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| appsv1 "k8s.io/api/apps/v1" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/equality" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
|
|
||
| v1 "github.com/openshift/api/config/v1" | ||
| fakeconfig "github.com/openshift/client-go/config/clientset/versioned/fake" | ||
| configinformers "github.com/openshift/client-go/config/informers/externalversions" | ||
| ) | ||
|
|
||
| func TestWithCustomLabels(t *testing.T) { | ||
|
|
||
| infraObj := &v1.Infrastructure{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "cluster", | ||
| }, | ||
| Status: v1.InfrastructureStatus{ | ||
| InfrastructureName: "test-vbc3g", | ||
| PlatformStatus: &v1.PlatformStatus{ | ||
| GCP: &v1.GCPPlatformStatus{ | ||
| ProjectID: "test", | ||
| Region: "test", | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| tmplDeployObj := &appsv1.Deployment{ | ||
| Spec: appsv1.DeploymentSpec{ | ||
| Template: corev1.PodTemplateSpec{ | ||
| Spec: corev1.PodSpec{ | ||
| Containers: []corev1.Container{ | ||
| { | ||
| Name: "csi-driver", | ||
| Image: "example.io/example-csi-driver", | ||
| Args: []string{ | ||
| "--endpoint=$(CSI_ENDPOINT)", | ||
| "--logtostderr", | ||
| "--v=2", | ||
| }, | ||
| Env: []corev1.EnvVar{ | ||
| { | ||
| Name: "GOOGLE_APPLICATION_CREDENTIALS", | ||
| Value: "/etc/cloud-sa/service_account.json", | ||
| }, | ||
| { | ||
| Name: "CSI_ENDPOINT", | ||
| Value: "unix:///var/lib/csi/sockets/pluginproxy/csi.sock", | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| Name: "test-driver", | ||
| Image: "example.io/example-test-driver", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| labels []v1.GCPResourceLabel | ||
| expArgList string | ||
| createInfraCR bool | ||
| wantErr bool | ||
| }{ | ||
| { | ||
| name: "labels not configured", | ||
| labels: []v1.GCPResourceLabel{}, | ||
| expArgList: fmt.Sprintf("--extra-labels=%s", fmt.Sprintf(ocpDefaultLabelFmt, infraObj.Status.InfrastructureName)), | ||
| createInfraCR: true, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "labels configured", | ||
| labels: []v1.GCPResourceLabel{ | ||
| { | ||
| Key: "key1", | ||
| Value: "value1", | ||
| }, | ||
| { | ||
| Key: "key2", | ||
| Value: "value2", | ||
| }, | ||
| { | ||
| Key: "key3", | ||
| Value: "value3", | ||
| }, | ||
| }, | ||
| expArgList: fmt.Sprintf("--extra-labels=key1=value1,key2=value2,"+ | ||
| "key3=value3,%s", fmt.Sprintf(ocpDefaultLabelFmt, infraObj.Status.InfrastructureName)), | ||
| createInfraCR: true, | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "Infrastructure CR does not exist", | ||
| labels: []v1.GCPResourceLabel{}, | ||
| expArgList: "", | ||
| createInfraCR: false, | ||
| wantErr: true, | ||
| }, | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| t.Run(test.name, func(t *testing.T) { | ||
| objs := make([]runtime.Object, 0) | ||
| if test.createInfraCR { | ||
| infraObj.Status.PlatformStatus.GCP.ResourceLabels = test.labels | ||
| objs = append(objs, infraObj) | ||
| } | ||
| configClient := fakeconfig.NewSimpleClientset(objs...) | ||
| configInformerFactory := configinformers.NewSharedInformerFactory(configClient, 0) | ||
| if test.createInfraCR { | ||
| configInformerFactory.Config().V1().Infrastructures().Informer().GetIndexer().Add(infraObj) | ||
| } | ||
|
|
||
| deployment := tmplDeployObj.DeepCopy() | ||
| updDeployment := tmplDeployObj.DeepCopy() | ||
| if test.expArgList != "" { | ||
| updDeployment.Spec.Template.Spec.Containers[0].Args = append( | ||
| updDeployment.Spec.Template.Spec.Containers[0].Args, | ||
| test.expArgList, | ||
| ) | ||
| } | ||
|
|
||
| err := withCustomLabels(configInformerFactory.Config().V1().Infrastructures().Lister())(nil, deployment) | ||
| if (err != nil) != test.wantErr { | ||
| t.Errorf("unexpected error: %v", err) | ||
| } | ||
| if !equality.Semantic.DeepEqual(deployment, updDeployment) { | ||
| t.Errorf("unexpected deployment want: %+v got: %+v", updDeployment, deployment) | ||
| } | ||
| }) | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
...b.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.