Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[envtest]Improve coverage #63

Merged
merged 8 commits into from
Sep 21, 2023
Merged

[envtest]Improve coverage #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0026669
[envtest]Assert all conditions initialized
gibizer Sep 14, 2023
36351d1
[envtest]Show that secret fields are not checked
gibizer Sep 14, 2023
4b78066
[envtest]Add coverage for the happy deployment path
gibizer Sep 14, 2023
4c09052
[envtest]Cover ServiceAccount, Role and RoleBinding creation
gibizer Sep 14, 2023
607881e
[envtest][refactor]Pull out name handling
gibizer Sep 14, 2023
335ae72
[envtest]Switch to generated PlacementAPI Name
gibizer Sep 14, 2023
cb82109
[envtest]Run test in random order
gibizer Sep 14, 2023
1f33842
[envtest]Test delete removing finalizers
gibizer Sep 14, 2023
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
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,7 @@ vet: gowork ## Run go vet against code.

.PHONY: test
test: manifests generate gowork fmt vet envtest ginkgo ## Run tests.
# TODO(gibi): enable --randomize-all and fix test failures
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" $(GINKGO) --trace --cover --coverpkg=../../pkg/placement,../../controllers,../../api/v1beta1 --coverprofile cover.out --covermode=atomic ${PROC_CMD} $(GINKGO_ARGS) ./tests/...
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" $(GINKGO) --trace --cover --coverpkg=../../pkg/placement,../../controllers,../../api/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all $(GINKGO_ARGS) ./tests/...

##@ Build

Expand Down
58 changes: 58 additions & 0 deletions tests/functional/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,64 @@ import (
placementv1 "github.com/openstack-k8s-operators/placement-operator/api/v1beta1"
)

type Names struct {
Namespace string
PlacementAPIName types.NamespacedName
ConfigMapName types.NamespacedName
DBSyncJobName types.NamespacedName
MariaDBDatabaseName types.NamespacedName
DeploymentName types.NamespacedName
PublicServiceName types.NamespacedName
InternalServiceName types.NamespacedName
KeystoneServiceName types.NamespacedName
KeystoneEndpointName types.NamespacedName
ServiceAccountName types.NamespacedName
RoleName types.NamespacedName
RoleBindingName types.NamespacedName
}

func CreateNames(placementAPIName types.NamespacedName) Names {
return Names{
Namespace: placementAPIName.Namespace,
PlacementAPIName: placementAPIName,
ConfigMapName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: placementAPIName.Name + "-config-data"},
// FIXME(gibi): the db sync job name should not be hardcoded
// but based on the name of the PlacementAPI CR
DBSyncJobName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement-db-sync"},
MariaDBDatabaseName: placementAPIName,
// FIXME(gibi): the deployment name should not be hardcoded
// but based on the name of the PlacementAPI CR
DeploymentName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement"},
PublicServiceName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement-public"},
InternalServiceName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement-internal"},
KeystoneServiceName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement"},
KeystoneEndpointName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement"},
ServiceAccountName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement-" + placementAPIName.Name},
RoleName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement-" + placementAPIName.Name + "-role"},
RoleBindingName: types.NamespacedName{
Namespace: placementAPIName.Namespace,
Name: "placement-" + placementAPIName.Name + "-rolebinding"},
}
}

func GetDefaultPlacementAPISpec() map[string]interface{} {
return map[string]interface{}{
"databaseInstance": "openstack",
Expand Down
Loading