Skip to content

Commit

Permalink
Add tests that covers creation of validation pod
Browse files Browse the repository at this point in the history
  • Loading branch information
@wpjunior
wpjunior committed May 15, 2024
1 parent 0971ae8 commit 04c6938
Show file tree
Hide file tree
Showing 2 changed files with 319 additions and 6 deletions.
10 changes: 4 additions & 6 deletions controllers/validation_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -51,7 +50,6 @@ func (r *RpaasValidationReconciler) Reconcile(ctx context.Context, req ctrl.Requ
}

if validation.Status.RevisionHash == validationHash && validation.Status.Valid != nil {
fmt.Println("job solved")
return reconcile.Result{}, nil
}

Expand Down Expand Up @@ -135,7 +133,7 @@ func (r *RpaasValidationReconciler) finishValidation(ctx context.Context, existi

if containerStatus.State.Terminated != nil {
if containerStatus.State.Terminated.ExitCode == 0 {
valid = pointer.Bool(true)
valid = ptr.To(true)
terminatedMessage = containerStatus.State.Terminated.Message
}
}
Expand All @@ -146,7 +144,7 @@ func (r *RpaasValidationReconciler) finishValidation(ctx context.Context, existi

if containerStatus.State.Terminated != nil {
if containerStatus.State.Terminated.ExitCode != 0 {
valid = pointer.Bool(false)
valid = ptr.To(false)
terminatedMessage = containerStatus.State.Terminated.Message
}
}
Expand Down Expand Up @@ -408,7 +406,7 @@ func newValidationPod(validationMergedWithFlavors *v1alpha1.RpaasValidation, val
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: f.ConfigMap.LocalObjectReference,
Optional: pointer.Bool(false),
Optional: ptr.To(false),
},
},
})
Expand Down Expand Up @@ -439,7 +437,7 @@ func newValidationPod(validationMergedWithFlavors *v1alpha1.RpaasValidation, val
LocalObjectReference: corev1.LocalObjectReference{
Name: configMap.Name,
},
Optional: pointer.Bool(false),
Optional: ptr.To(false),
},
},
})
Expand Down
315 changes: 315 additions & 0 deletions controllers/validation_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,23 @@
package controllers

import (
"context"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
nginxv1alpha1 "github.com/tsuru/nginx-operator/api/v1alpha1"
"github.com/tsuru/rpaas-operator/api/v1alpha1"

Check failure on line 14 in controllers/validation_controller_test.go

View workflow job for this annotation

GitHub Actions / test 

File is not `gci`-ed with --skip-generated -s standard -s default -s prefix(github.com/tsuru/rpaas-operator) (gci)
extensionsruntime "github.com/tsuru/rpaas-operator/pkg/runtime"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/ptr"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

Check failure on line 24 in controllers/validation_controller_test.go

View workflow job for this annotation

GitHub Actions / test 

File is not `gci`-ed with --skip-generated -s standard -s default -s prefix(github.com/tsuru/rpaas-operator) (gci)
)

func TestNewValidationPod(t *testing.T) {
Expand Down Expand Up @@ -251,3 +259,310 @@ func TestNewValidationPodFullFeatured(t *testing.T) {
},
}, pod)
}

func TestValidationControllerReconcicleSucceeded(t *testing.T) {
ctx := context.Background()
r := newRpaasValidationReconciler(
&v1alpha1.RpaasValidation{
ObjectMeta: metav1.ObjectMeta{
Name: "punk",
Namespace: "default",
Generation: 10,
},
Spec: v1alpha1.RpaasInstanceSpec{
PlanName: "default",
},
},
&v1alpha1.RpaasPlan{
ObjectMeta: metav1.ObjectMeta{
Name: "default",
Namespace: "default",
},
Spec: v1alpha1.RpaasPlanSpec{},
},
)

result, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "default", Name: "punk"}})
require.NoError(t, err)
assert.Equal(t, reconcile.Result{}, result)

existingPod := &corev1.Pod{}
err = r.Client.Get(ctx, client.ObjectKey{Namespace: "default", Name: "validation-punk"}, existingPod)
require.NoError(t, err)

assert.Equal(t, corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: "nginx-config",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: "validation-punk",
},
Optional: ptr.To(false),
},
},
},
},
Containers: []corev1.Container{
{
Name: "validation",
Command: []string{
"/bin/sh",
"-c",
"nginx -t 2> /dev/termination-log",
},
VolumeMounts: []corev1.VolumeMount{
{
Name: "nginx-config",
MountPath: "/etc/nginx/nginx.conf",
SubPath: "nginx.conf",
ReadOnly: true,
},
},
},
},

RestartPolicy: "Never",
}, existingPod.Spec)

existingPod.Status.Phase = corev1.PodSucceeded
existingPod.Status.ContainerStatuses = []corev1.ContainerStatus{
{
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
}

err = r.Client.Update(ctx, existingPod)
require.NoError(t, err)

_, err = r.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "default", Name: "punk"}})
require.NoError(t, err)

existing := &v1alpha1.RpaasValidation{}
err = r.Client.Get(ctx, client.ObjectKey{Namespace: "default", Name: "punk"}, existing)
require.NoError(t, err)

assert.Equal(t, v1alpha1.RpaasValidationStatus{
RevisionHash: "areskmeswpny2vmiz7sm2rrxvtlyhigbozfbkvqprcnnob57svha",
ObservedGeneration: 10,
Valid: ptr.To(true),
}, existing.Status)
}

func TestValidationControllerReconcicleFailed(t *testing.T) {
ctx := context.Background()
r := newRpaasValidationReconciler(
&v1alpha1.RpaasValidation{
ObjectMeta: metav1.ObjectMeta{
Name: "punk",
Namespace: "default",
Generation: 10,
},
Spec: v1alpha1.RpaasInstanceSpec{
PlanName: "default",
},
},
&v1alpha1.RpaasPlan{
ObjectMeta: metav1.ObjectMeta{
Name: "default",
Namespace: "default",
},
Spec: v1alpha1.RpaasPlanSpec{},
},
)

result, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "default", Name: "punk"}})
require.NoError(t, err)
assert.Equal(t, reconcile.Result{}, result)

existingPod := &corev1.Pod{}
err = r.Client.Get(ctx, client.ObjectKey{Namespace: "default", Name: "validation-punk"}, existingPod)
require.NoError(t, err)

assert.Equal(t, corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: "nginx-config",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: "validation-punk",
},
Optional: ptr.To(false),
},
},
},
},
Containers: []corev1.Container{
{
Name: "validation",
Command: []string{
"/bin/sh",
"-c",
"nginx -t 2> /dev/termination-log",
},
VolumeMounts: []corev1.VolumeMount{
{
Name: "nginx-config",
MountPath: "/etc/nginx/nginx.conf",
SubPath: "nginx.conf",
ReadOnly: true,
},
},
},
},

RestartPolicy: "Never",
}, existingPod.Spec)

existingPod.Status.Phase = corev1.PodFailed
existingPod.Status.ContainerStatuses = []corev1.ContainerStatus{
{
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 1,
Message: "some nginx error",
},
},
},
}

err = r.Client.Update(ctx, existingPod)
require.NoError(t, err)

_, err = r.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "default", Name: "punk"}})
require.NoError(t, err)

existing := &v1alpha1.RpaasValidation{}
err = r.Client.Get(ctx, client.ObjectKey{Namespace: "default", Name: "punk"}, existing)
require.NoError(t, err)

assert.Equal(t, v1alpha1.RpaasValidationStatus{
RevisionHash: "areskmeswpny2vmiz7sm2rrxvtlyhigbozfbkvqprcnnob57svha",
ObservedGeneration: 10,
Valid: ptr.To(false),
Error: "some nginx error",
}, existing.Status)

}

func TestValidationControllerReconcicleManyFlavors(t *testing.T) {
ctx := context.Background()
r := newRpaasValidationReconciler(
&v1alpha1.RpaasValidation{
ObjectMeta: metav1.ObjectMeta{
Name: "punk",
Namespace: "default",
Generation: 10,
},
Spec: v1alpha1.RpaasInstanceSpec{
PlanName: "default",
Flavors: []string{"banana", "chocolate"},
},
},
&v1alpha1.RpaasPlan{
ObjectMeta: metav1.ObjectMeta{
Name: "default",
Namespace: "default",
},
Spec: v1alpha1.RpaasPlanSpec{},
},

&v1alpha1.RpaasFlavor{
ObjectMeta: metav1.ObjectMeta{
Name: "banana",
Namespace: "default",
},
},

&v1alpha1.RpaasFlavor{
ObjectMeta: metav1.ObjectMeta{
Name: "chocolate",
Namespace: "default",
},
},
)

result, err := r.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "default", Name: "punk"}})
require.NoError(t, err)
assert.Equal(t, reconcile.Result{}, result)

existingPod := &corev1.Pod{}
err = r.Client.Get(ctx, client.ObjectKey{Namespace: "default", Name: "validation-punk"}, existingPod)
require.NoError(t, err)

assert.Equal(t, corev1.PodSpec{
Volumes: []corev1.Volume{
{
Name: "nginx-config",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
LocalObjectReference: corev1.LocalObjectReference{
Name: "validation-punk",
},
Optional: ptr.To(false),
},
},
},
},
Containers: []corev1.Container{
{
Name: "validation",
Command: []string{
"/bin/sh",
"-c",
"nginx -t 2> /dev/termination-log",
},
VolumeMounts: []corev1.VolumeMount{
{
Name: "nginx-config",
MountPath: "/etc/nginx/nginx.conf",
SubPath: "nginx.conf",
ReadOnly: true,
},
},
},
},

RestartPolicy: "Never",
}, existingPod.Spec)

existingPod.Status.Phase = corev1.PodSucceeded
existingPod.Status.ContainerStatuses = []corev1.ContainerStatus{
{
State: corev1.ContainerState{
Terminated: &corev1.ContainerStateTerminated{
ExitCode: 0,
},
},
},
}

err = r.Client.Update(ctx, existingPod)
require.NoError(t, err)

_, err = r.Reconcile(ctx, ctrl.Request{NamespacedName: types.NamespacedName{Namespace: "default", Name: "punk"}})
require.NoError(t, err)

existing := &v1alpha1.RpaasValidation{}
err = r.Client.Get(ctx, client.ObjectKey{Namespace: "default", Name: "punk"}, existing)
require.NoError(t, err)

assert.Equal(t, v1alpha1.RpaasValidationStatus{
RevisionHash: "53m2qsvzz6k4hqbabl2xngvpz52t3llgo2nnqwdcowceiay7f44a",
ObservedGeneration: 10,
Valid: ptr.To(true),
}, existing.Status)
}

func newRpaasValidationReconciler(objs ...runtime.Object) *RpaasValidationReconciler {
return &RpaasValidationReconciler{
Client: fake.NewClientBuilder().WithScheme(extensionsruntime.NewScheme()).WithRuntimeObjects(objs...).Build(),
Log: ctrl.Log,
}
}

0 comments on commit 04c6938

Please sign in to comment.