Trunk type: fixed finalizer issue + minor bugs

aldokimi · aldokimi · commit dacf6513c001 · 2026-01-08T16:06:05.000Z
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -36,7 +36,7 @@ jobs:
       with:
         enable_workaround_docker_io: 'false'
         branch: ${{ matrix.openstack_version }}
-        enabled_services: "openstack-cli-server"
+        enabled_services: "openstack-cli-server,neutron-trunk"
 
     - name: Deploy a Kind Cluster
       uses: helm/kind-action@92086f6be054225fa813e0a4b13787fc9088faab
diff --git a/Makefile b/Makefile
@@ -316,7 +316,7 @@ CONTROLLER_TOOLS_VERSION ?= v0.17.1
 ENVTEST_VERSION ?= release-0.22
 GOLANGCI_LINT_VERSION ?= v2.7.2
 KAL_VERSION ?= v0.0.0-20250924094418-502783c08f9d
-MOCKGEN_VERSION ?= v0.6.0
+MOCKGEN_VERSION ?= v0.5.0
 KUTTL_VERSION ?= v0.23.0
 GOVULNCHECK_VERSION ?= v1.1.4
 OPERATOR_SDK_VERSION ?= v1.41.1
diff --git a/internal/controllers/trunk/controller.go b/internal/controllers/trunk/controller.go
@@ -31,6 +31,7 @@ import (
 	"github.com/k-orc/openstack-resource-controller/v2/internal/scope"
 	"github.com/k-orc/openstack-resource-controller/v2/internal/util/credentials"
 	"github.com/k-orc/openstack-resource-controller/v2/internal/util/dependency"
+	orcstrings "github.com/k-orc/openstack-resource-controller/v2/internal/util/strings"
 	"github.com/k-orc/openstack-resource-controller/v2/pkg/predicates"
 )
 
@@ -115,7 +116,7 @@ var subportPortDependency = dependency.NewDeletionGuardDependency[*orcv1alpha1.T
 		}
 		return portRefs
 	},
-	finalizer, externalObjectFieldOwner,
+	orcstrings.GetFinalizerName("trunk-subport"), externalObjectFieldOwner,
 	dependency.OverrideDependencyName("subport_port"),
 )
 
diff --git a/internal/controllers/trunk/tests/trunk-dependency/00-create-resources-missing-deps.yaml b/internal/controllers/trunk/tests/trunk-dependency/00-create-resources-missing-deps.yaml
@@ -71,7 +71,7 @@ metadata:
   name: trunk-dependency-no-project
 spec:
   cloudCredentialsRef:
-    cloudName: openstack
+    cloudName: openstack-admin
     secretName: openstack-clouds
   managementPolicy: managed
   resource:
diff --git a/internal/controllers/trunk/tests/trunk-dependency/01-create-dependencies.yaml b/internal/controllers/trunk/tests/trunk-dependency/01-create-dependencies.yaml
@@ -25,7 +25,7 @@ metadata:
   name: trunk-dependency
 spec:
   cloudCredentialsRef:
-    cloudName: openstack
+    cloudName: openstack-admin
     secretName: openstack-clouds
   managementPolicy: managed
   resource:

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ import (`
`31`	`31`	`"github.com/k-orc/openstack-resource-controller/v2/internal/scope"`
`32`	`32`	`"github.com/k-orc/openstack-resource-controller/v2/internal/util/credentials"`
`33`	`33`	`"github.com/k-orc/openstack-resource-controller/v2/internal/util/dependency"`
	`34`	`+ orcstrings "github.com/k-orc/openstack-resource-controller/v2/internal/util/strings"`
`34`	`35`	`"github.com/k-orc/openstack-resource-controller/v2/pkg/predicates"`
`35`	`36`	`)`
`36`	`37`
`@@ -115,7 +116,7 @@ var subportPortDependency = dependency.NewDeletionGuardDependency[*orcv1alpha1.T`
`115`	`116`	`}`
`116`	`117`	`return portRefs`
`117`	`118`	`},`
`118`		`- finalizer, externalObjectFieldOwner,`
	`119`	`+ orcstrings.GetFinalizerName("trunk-subport"), externalObjectFieldOwner,`
`119`	`120`	`dependency.OverrideDependencyName("subport_port"),`
`120`	`121`	`)`
`121`	`122`