-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Mattia Lavacca <[email protected]>
- Loading branch information
Showing
5 changed files
with
245 additions
and
6 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,229 @@ | ||
| package dataplane | ||
|
|
||
| import ( | ||
| "context" | ||
| "sort" | ||
| "testing" | ||
|
|
||
| "github.com/samber/lo" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/client-go/kubernetes/scheme" | ||
| "sigs.k8s.io/controller-runtime/pkg/client/fake" | ||
|
|
||
| operatorv1alpha1 "github.com/kong/gateway-operator/api/v1alpha1" | ||
| operatorv1beta1 "github.com/kong/gateway-operator/api/v1beta1" | ||
| dputils "github.com/kong/gateway-operator/internal/utils/dataplane" | ||
| "github.com/kong/gateway-operator/pkg/consts" | ||
| k8sutils "github.com/kong/gateway-operator/pkg/utils/kubernetes" | ||
|
|
||
| configurationv1alpha1 "github.com/kong/kubernetes-configuration/api/configuration/v1alpha1" | ||
| ) | ||
|
|
||
| func TestApplyDataPlaneKonnectExtension(t *testing.T) { | ||
| s := scheme.Scheme | ||
| require.NoError(t, operatorv1alpha1.AddToScheme(s)) | ||
| require.NoError(t, operatorv1beta1.AddToScheme(s)) | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| dataplane *operatorv1beta1.DataPlane | ||
| konnectExt *operatorv1alpha1.DataPlaneKonnectExtension | ||
| expectedError bool | ||
| }{ | ||
| { | ||
| name: "no extensions", | ||
| dataplane: &operatorv1beta1.DataPlane{ | ||
| Spec: operatorv1beta1.DataPlaneSpec{ | ||
| DataPlaneOptions: operatorv1beta1.DataPlaneOptions{ | ||
| Extensions: []operatorv1alpha1.ExtensionRef{}, | ||
| }, | ||
| }, | ||
| }, | ||
| expectedError: false, | ||
| }, | ||
| { | ||
| name: "Extension not found", | ||
| dataplane: &operatorv1beta1.DataPlane{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "default", | ||
| }, | ||
| Spec: operatorv1beta1.DataPlaneSpec{ | ||
| DataPlaneOptions: operatorv1beta1.DataPlaneOptions{ | ||
| Extensions: []operatorv1alpha1.ExtensionRef{ | ||
| { | ||
| Group: operatorv1alpha1.SchemeGroupVersion.Group, | ||
| Kind: "DataPlaneKonnectExtension", | ||
| NamespacedRef: operatorv1alpha1.NamespacedRef{ | ||
| Name: "konnect-ext", | ||
| }, | ||
| }, | ||
| }, | ||
| Deployment: operatorv1beta1.DataPlaneDeploymentOptions{ | ||
| DeploymentOptions: operatorv1beta1.DeploymentOptions{ | ||
| PodTemplateSpec: &corev1.PodTemplateSpec{}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| expectedError: true, | ||
| }, | ||
| { | ||
| name: "Extension properly referenced, no deployment Options set.", | ||
| dataplane: &operatorv1beta1.DataPlane{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "default", | ||
| }, | ||
| Spec: operatorv1beta1.DataPlaneSpec{ | ||
| DataPlaneOptions: operatorv1beta1.DataPlaneOptions{ | ||
| Extensions: []operatorv1alpha1.ExtensionRef{ | ||
| { | ||
| Group: operatorv1alpha1.SchemeGroupVersion.Group, | ||
| Kind: "DataPlaneKonnectExtension", | ||
| NamespacedRef: operatorv1alpha1.NamespacedRef{ | ||
| Name: "konnect-ext", | ||
| }, | ||
| }, | ||
| }, | ||
| Deployment: operatorv1beta1.DataPlaneDeploymentOptions{ | ||
| DeploymentOptions: operatorv1beta1.DeploymentOptions{ | ||
| PodTemplateSpec: &corev1.PodTemplateSpec{}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| konnectExt: &operatorv1alpha1.DataPlaneKonnectExtension{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "konnect-ext", | ||
| Namespace: "default", | ||
| }, | ||
| Spec: operatorv1alpha1.DataPlaneKonnectExtensionSpec{ | ||
| AuthConfiguration: operatorv1alpha1.KonnectControlPlaneAPIAuthConfiguration{ | ||
| ClusterCertificateSecretRef: operatorv1alpha1.ClusterCertificateSecretRef{ | ||
| Name: "cluster-cert-secret", | ||
| }, | ||
| }, | ||
| ControlPlaneRef: configurationv1alpha1.ControlPlaneRef{ | ||
| KonnectID: lo.ToPtr("konnect-id"), | ||
| }, | ||
| ControlPlaneRegion: "us-west", | ||
| ServerHostname: "konnect.example.com", | ||
| }, | ||
| }, | ||
| expectedError: false, | ||
| }, | ||
| { | ||
| name: "Extension properly referenced, with deployment Options set.", | ||
| dataplane: &operatorv1beta1.DataPlane{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Namespace: "default", | ||
| }, | ||
| Spec: operatorv1beta1.DataPlaneSpec{ | ||
| DataPlaneOptions: operatorv1beta1.DataPlaneOptions{ | ||
| Extensions: []operatorv1alpha1.ExtensionRef{ | ||
| { | ||
| Group: operatorv1alpha1.SchemeGroupVersion.Group, | ||
| Kind: "DataPlaneKonnectExtension", | ||
| NamespacedRef: operatorv1alpha1.NamespacedRef{ | ||
| Name: "konnect-ext", | ||
| }, | ||
| }, | ||
| }, | ||
| Deployment: operatorv1beta1.DataPlaneDeploymentOptions{ | ||
| DeploymentOptions: operatorv1beta1.DeploymentOptions{ | ||
| PodTemplateSpec: &corev1.PodTemplateSpec{ | ||
| Spec: corev1.PodSpec{ | ||
| Containers: []corev1.Container{ | ||
| { | ||
| Name: "proxy", | ||
| Env: []corev1.EnvVar{ | ||
| { | ||
| Name: "KONG_TEST", | ||
| Value: "test", | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| konnectExt: &operatorv1alpha1.DataPlaneKonnectExtension{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: "konnect-ext", | ||
| Namespace: "default", | ||
| }, | ||
| Spec: operatorv1alpha1.DataPlaneKonnectExtensionSpec{ | ||
| AuthConfiguration: operatorv1alpha1.KonnectControlPlaneAPIAuthConfiguration{ | ||
| ClusterCertificateSecretRef: operatorv1alpha1.ClusterCertificateSecretRef{ | ||
| Name: "cluster-cert-secret", | ||
| }, | ||
| }, | ||
| ControlPlaneRef: configurationv1alpha1.ControlPlaneRef{ | ||
| KonnectID: lo.ToPtr("konnect-id"), | ||
| }, | ||
| ControlPlaneRegion: "us-west", | ||
| ServerHostname: "konnect.example.com", | ||
| }, | ||
| }, | ||
| expectedError: false, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| objs := []runtime.Object{tt.dataplane} | ||
| if tt.konnectExt != nil { | ||
| objs = append(objs, tt.konnectExt) | ||
| } | ||
| cl := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(objs...).Build() | ||
|
|
||
| dataplane := tt.dataplane.DeepCopy() | ||
| err := applyDataPlaneKonnectExtension(context.Background(), cl, dataplane) | ||
| if tt.expectedError { | ||
| require.Error(t, err) | ||
| } else { | ||
| require.NoError(t, err) | ||
| } | ||
|
|
||
| requiredEnv := []corev1.EnvVar{} | ||
| if tt.dataplane.Spec.Deployment.PodTemplateSpec != nil { | ||
| if container := k8sutils.GetPodContainerByName(&tt.dataplane.Spec.Deployment.PodTemplateSpec.Spec, consts.DataPlaneProxyContainerName); container != nil { | ||
| requiredEnv = container.Env | ||
| } | ||
| } | ||
|
|
||
| if tt.konnectExt != nil { | ||
| requiredEnv = append(requiredEnv, getKongInKonnectEnvVars(*tt.konnectExt)...) | ||
| sort.Sort(k8sutils.SortableEnvVars(requiredEnv)) | ||
| assert.NotNil(t, dataplane.Spec.Deployment.PodTemplateSpec) | ||
| assert.Equal(t, requiredEnv, dataplane.Spec.Deployment.PodTemplateSpec.Spec.Containers[0].Env) | ||
| } | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func getKongInKonnectEnvVars(konnectExt operatorv1alpha1.DataPlaneKonnectExtension) []corev1.EnvVar { | ||
| envSet := []corev1.EnvVar{} | ||
| envMap := customizeKongInKonnectDefaults( | ||
| dputils.KongInKonnectDefaults, | ||
| *konnectExt.Spec.ControlPlaneRef.KonnectID, | ||
| konnectExt.Spec.ControlPlaneRegion, | ||
| konnectExt.Spec.ServerHostname, | ||
| ) | ||
| for k, v := range envMap { | ||
| envSet = append(envSet, corev1.EnvVar{ | ||
| Name: k, | ||
| Value: v, | ||
| }) | ||
| } | ||
| return envSet | ||
| } |