Merge pull request #150 from raffaelespazzoli/fixes#137

fixes #137
redhat-cop · May 27, 2023 · d869dc2 · d869dc2
2 parents 3d8d95b + 46ad166
commit d869dc2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/config/local-development/vault-values.yaml b/config/local-development/vault-values.yaml
@@ -6,6 +6,7 @@ ui:
   enabled: true
 
 injector:
+  enabled: false
   image:
     repository: "registry.connect.redhat.com/hashicorp/vault-k8s"
     tag: "1.2.0-ubi"

diff --git a/controllers/vaultresourcecontroller/vaultengineresourcereconciler.go b/controllers/vaultresourcecontroller/vaultengineresourcereconciler.go
@@ -46,7 +46,7 @@ func (r *VaultEngineResource) manageCleanUpLogic(context context.Context, instan
 	// we delete this only if it has actually been created. We assume that if there was a successful reconcyle cycle the resource was created in Vault
 	if conditionAware, ok := instance.(apis.ConditionsAware); ok {
 		for _, condition := range conditionAware.GetConditions() {
-			if condition.Status == metav1.ConditionTrue && condition.Type == apis.ReconcileSuccess {
+			if condition.Status == metav1.ConditionTrue && condition.Type == ReconcileSuccessful {
 				err := r.vaultEngineEndpoint.DeleteIfExists(context)
 				if err != nil {
 					log.Error(err, "unable to delete vault resource", "instance", instance)

diff --git a/controllers/vaultresourcecontroller/vaultpkiengineresourcereconciler.go b/controllers/vaultresourcecontroller/vaultpkiengineresourcereconciler.go
@@ -45,7 +45,7 @@ func (r *VaultPKIEngineResource) manageCleanUpLogic(context context.Context, ins
 	log := log.FromContext(context)
 	if conditionAware, ok := instance.(apis.ConditionsAware); ok {
 		for _, condition := range conditionAware.GetConditions() {
-			if condition.Status == metav1.ConditionTrue && condition.Type == apis.ReconcileSuccess {
+			if condition.Status == metav1.ConditionTrue && condition.Type == ReconcileSuccessful {
 				log.Info("DeleteIfExists", "Try to: ", instance)
 				err := r.vaultPKIEngineEndpoint.DeleteIfExists(context)
 				if err != nil {

diff --git a/controllers/vaultresourcecontroller/vaultresourcereconciler.go b/controllers/vaultresourcecontroller/vaultresourcereconciler.go
@@ -75,7 +75,7 @@ func (r *VaultResource) manageCleanUpLogic(context context.Context, instance cli
 	log := log.FromContext(context)
 	if conditionAware, ok := instance.(apis.ConditionsAware); ok {
 		for _, condition := range conditionAware.GetConditions() {
-			if condition.Status == metav1.ConditionTrue && condition.Type == apis.ReconcileSuccess {
+			if condition.Status == metav1.ConditionTrue && condition.Type == ReconcileSuccessful {
 				err := r.vaultEndpoint.DeleteIfExists(context)
 				if err != nil {
 					log.Error(err, "unable to delete vault resource", "instance", instance)