Merged with main

nutanix-cloud-native · Nov 7, 2023 · f9adf48 · f9adf48
2 parents 33a611a + f246dec
commit f9adf48
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 # VERSION defines the project version for the bundle.
 # Update this value when you upgrade the version of your project.
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
-# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.7)
-# - use environment variables to overwrite this value (e.g export VERSION=0.0.7)
-VERSION ?= 0.0.7
+# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.8)
+# - use environment variables to overwrite this value (e.g export VERSION=0.0.8)
+VERSION ?= 0.5.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

diff --git a/api/v1alpha1/webhook_helpers.go b/api/v1alpha1/webhook_helpers.go
@@ -14,9 +14,9 @@ import (
 // Get specific implementation of the DBProvisionRequestAppender interface based on the provided databaseType
 func getDatabaseWebhookHandler(database *Database) DatabaseWebhookHandler {
 	if database.Spec.IsClone {
-		return &CloningHandler{}
+		return &CloningWebhookHandler{}
 	} else {
-		return &ProvisoningHandler{}
+		return &ProvisioningWebhookHandler{}
 	}
 }
 
@@ -30,13 +30,13 @@ type DatabaseWebhookHandler interface {
 
 // +kubebuilder:object:generate:=false
 // Implements webhook.Validator, webhook.Defaulter
-type CloningHandler struct{}
+type CloningWebhookHandler struct{}
 
 // +kubebuilder:object:generate:=false
 // Implements webhook.Validator, webhook.Defaulter
-type ProvisoningHandler struct{}
+type ProvisioningWebhookHandler struct{}
 
-func (v *CloningHandler) defaulter(spec *DatabaseSpec) {
+func (v *CloningWebhookHandler) defaulter(spec *DatabaseSpec) {
 	databaselog.Info("Entering defaulter for clone")
 
 	initializeObjects(spec)
@@ -50,7 +50,7 @@ func (v *CloningHandler) defaulter(spec *DatabaseSpec) {
 	databaselog.Info("Exiting defaulter for clone")
 }
 
-func (v *CloningHandler) validateCreate(spec *DatabaseSpec, errors *field.ErrorList, clonePath *field.Path) {
+func (v *CloningWebhookHandler) validateCreate(spec *DatabaseSpec, errors *field.ErrorList, clonePath *field.Path) {
 	databaselog.Info("Entering validateCreate for clone")
 
 	clone := spec.Clone
@@ -97,7 +97,7 @@ func (v *CloningHandler) validateCreate(spec *DatabaseSpec, errors *field.ErrorL
 	databaselog.Info("Exiting validateCreate for clone")
 }
 
-func (v *ProvisoningHandler) defaulter(spec *DatabaseSpec) {
+func (v *ProvisioningWebhookHandler) defaulter(spec *DatabaseSpec) {
 	databaselog.Info("Entering defaulter for provisioning")
 
 	initializeObjects(spec)
@@ -163,7 +163,7 @@ func (v *ProvisoningHandler) defaulter(spec *DatabaseSpec) {
 	databaselog.Info("Exiting defaulter for provisioning")
 }
 
-func (v *ProvisoningHandler) validateCreate(spec *DatabaseSpec, errors *field.ErrorList, instancePath *field.Path) {
+func (v *ProvisioningWebhookHandler) validateCreate(spec *DatabaseSpec, errors *field.ErrorList, instancePath *field.Path) {
 	databaselog.Info("Entering validateCreate for provisioning")
 
 	instance := spec.Instance

diff --git a/automation/tests/cloning/mongo-si_test/mongo_si_test.go b/automation/tests/cloning/mongo-si_test/mongo_si_test.go
@@ -1,4 +1,8 @@
+<<<<<<<< HEAD:automation/tests/cloning/mongo-si_test/mongo_si_test.go
 package mongo_cloning_si
+========
+package postgres_si_provisoning
+>>>>>>>> main:automation/tests/provisioning/pg-si_test/pg_si_test.go
 
 // Basic imports
 import (

diff --git a/automation/tests/provisioning/pg-si_test/config/database.yaml b/automation/tests/provisioning/pg-si_test/config/database.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   ndbRef: ndb-pg
   databaseInstance:
-    name:  db-pg-si41
+    Name: db-pg-si
     databaseNames:
       - database_one
       - database_two

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: ghcr.io/nutanix-cloud-native/ndb-operator/controller
-  newTag: v0.0.7
+  newTag: v0.5.0
diff --git a/ndb_api/clone_helpers.go b/ndb_api/clone_helpers.go
@@ -110,7 +110,7 @@ func GenerateCloningRequest(ctx context.Context, ndb_client *ndb_client.NDBClien
 func (a *MSSQLRequestAppender) appendCloningRequest(req *DatabaseCloneRequest, database DatabaseInterface, reqData map[string]interface{}) (*DatabaseCloneRequest, error) {
 	req.SSHPublicKey = reqData[common.NDB_PARAM_SSH_PUBLIC_KEY].(string)
 	vmName := req.Name
-	dbName := "DATABASE_NAME" // TODO
+	dbName := database.GetName()
 	dbPassword := reqData[common.NDB_PARAM_PASSWORD].(string)
 
 	// Default action arguments