Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions internal/controller/v2/reconcile_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -1869,6 +1869,21 @@ func runMigrations(ctx context.Context, client ctrlClient.Client, wandb *apiv2.W
version := wandb.Spec.Wandb.Version

if wandb.Status.Wandb.Migration.Ready && wandb.Status.Wandb.Migration.Version == version {
for name, _ := range manifest.Migrations {
jobName := fmt.Sprintf("%s-%s", wandb.Name, name)
job := &batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: jobName,
Namespace: wandb.Namespace,
},
}
propagation := metav1.DeletePropagationBackground
deleteOptions := &ctrlClient.DeleteOptions{PropagationPolicy: &propagation}
err := client.Delete(ctx, job, deleteOptions)
if err != nil {
return ctrl.Result{}, fmt.Errorf("failed to delete migration job %s: %v", jobName, err)
}
}
return ctrl.Result{}, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/utils/gvk.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func IsRegistered(scheme *runtime.Scheme, obj runtime.Object) bool {
if err != nil || len(gvks) == 0 {
return false
}
return IsServerResource(fmt.Sprintf("%s.%s/%s", gvks[0].Kind, gvks[0].Group, gvks[0].Kind))
return IsServerResource(fmt.Sprintf("%s.%s/%s", gvks[0].Kind, gvks[0].Group, gvks[0].Version))
}

func AddServerResource(resource string) {
Expand Down
32 changes: 32 additions & 0 deletions pkg/utils/gvk_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package utils

import (
"testing"

"k8s.io/apimachinery/pkg/runtime"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
)

func TestIsRegisteredUsesKindGroupVersion(t *testing.T) {
scheme := runtime.NewScheme()
if err := gatewayv1.Install(scheme); err != nil {
t.Fatalf("install gateway api scheme: %v", err)
}

t.Run("returns true when server resource key uses version", func(t *testing.T) {
serverResources = map[string]bool{}
AddServerResource("HTTPRoute.gateway.networking.k8s.io/v1")

if !IsRegistered(scheme, &gatewayv1.HTTPRoute{}) {
t.Fatalf("expected HTTPRoute to be registered")
}
})

t.Run("returns false when server resource key is missing", func(t *testing.T) {
serverResources = map[string]bool{}

if IsRegistered(scheme, &gatewayv1.HTTPRoute{}) {
t.Fatalf("expected HTTPRoute to be unregistered")
}
})
}
Loading